From fc1c230b3dfddf6a1092cca761202083c5cec444 Mon Sep 17 00:00:00 2001 From: Tulio Casagrande Date: Fri, 17 Feb 2017 16:50:53 -0200 Subject: [#907] Add chromedriver to vagrant for functional tests with @anikarni --- provisioning/modules/pixelated/manifests/source.pp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'provisioning/modules/pixelated/manifests') diff --git a/provisioning/modules/pixelated/manifests/source.pp b/provisioning/modules/pixelated/manifests/source.pp index 7dc3358f..4da0669f 100644 --- a/provisioning/modules/pixelated/manifests/source.pp +++ b/provisioning/modules/pixelated/manifests/source.pp @@ -13,7 +13,10 @@ class pixelated::source { 'libsqlcipher-dev', 'libfontconfig1', 'build-essential', - 'ruby-compass']: + 'ruby-compass', + 'xvfb', + 'xauth', + 'chromedriver']: ensure => latest } -- cgit v1.2.3 From bda7f564c73096b40f7a85e6ae50d90c4b8d3519 Mon Sep 17 00:00:00 2001 From: varac Date: Mon, 27 Feb 2017 15:09:06 +0100 Subject: Remove things already present in LEAP/jessie box --- provisioning/modules/pixelated/manifests/apt.pp | 30 ------------------------- 1 file changed, 30 deletions(-) (limited to 'provisioning/modules/pixelated/manifests') diff --git a/provisioning/modules/pixelated/manifests/apt.pp b/provisioning/modules/pixelated/manifests/apt.pp index cf9cda66..2bba6969 100644 --- a/provisioning/modules/pixelated/manifests/apt.pp +++ b/provisioning/modules/pixelated/manifests/apt.pp @@ -7,13 +7,6 @@ class pixelated::apt { ensure => installed } - # jessie backports - file { '/etc/apt/sources.list.d/jessie-backports.list': - source => 'puppet:///modules/pixelated/apt/jessie-backports.list', - owner => 'root', - notify => Exec['apt_get_update'], - } - # pixelated repo file { '/etc/apt/sources.list.d/pixelated.list': source => 'puppet:///modules/pixelated/apt/pixelated.list', @@ -34,29 +27,6 @@ class pixelated::apt { notify => Exec['apt_get_update'], } - # leap repo - file { '/etc/apt/sources.list.d/leap.list': - content => 'deb http://deb.leap.se/0.9 jessie main', - owner => 'root', - require => Exec['add_leap_key'], - notify => Exec['apt_get_update'], - } - file { '/tmp/0x1E34A1828E20790_leap_archive_key': - source => 'puppet:///modules/pixelated/0x1E34A1828E20790_leap_archive_key', - notify => Exec['add_leap_key'] - } - exec{'add_leap_key': - command => '/usr/bin/apt-key add /tmp/0x1E34A1828E20790_leap_archive_key', - refreshonly => true, - require => File['/tmp/0x1E34A1828E20790_leap_archive_key'], - notify => Exec['apt_get_update'], - } - - package { 'leap-keyring': - ensure => latest, - require => Exec['apt_get_update'] - } - # nodejs latest repo file { '/etc/apt/sources.list.d/noderesource.list': content => -- cgit v1.2.3 From 90b0a5f4dd1ed78a3b0dc0b5fb3d75bf8d3d5fd1 Mon Sep 17 00:00:00 2001 From: varac Date: Mon, 27 Feb 2017 15:59:24 +0100 Subject: Remove old spt keys --- provisioning/modules/pixelated/manifests/apt.pp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'provisioning/modules/pixelated/manifests') diff --git a/provisioning/modules/pixelated/manifests/apt.pp b/provisioning/modules/pixelated/manifests/apt.pp index 2bba6969..bf924b97 100644 --- a/provisioning/modules/pixelated/manifests/apt.pp +++ b/provisioning/modules/pixelated/manifests/apt.pp @@ -15,15 +15,9 @@ class pixelated::apt { notify => Exec['apt_get_update'], } - file { '/tmp/0x287A1542472DC0E3_packages@pixelated-project.org.asc': - source => 'puppet:///modules/pixelated/0x287A1542472DC0E3_packages@pixelated-project.org.asc', - notify => Exec['add_pixelated_key'] - } - exec{'add_pixelated_key': - command => '/usr/bin/apt-key add /tmp/0x287A1542472DC0E3_packages@pixelated-project.org.asc', + command => '/usr/bin/apt-key adv --keyserver pool.sks-keyservers.net --recv-keys F4C220FCD74F4DF45DD78FC0287A1542472DC0E3' refreshonly => true, - require => File['/tmp/0x287A1542472DC0E3_packages@pixelated-project.org.asc'], notify => Exec['apt_get_update'], } -- cgit v1.2.3 From 40a9a74309e02bff27433796cc8a8dfb29018b10 Mon Sep 17 00:00:00 2001 From: varac Date: Mon, 27 Feb 2017 16:12:13 +0100 Subject: Fix fetching of pixelated apt key --- provisioning/modules/pixelated/manifests/apt.pp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'provisioning/modules/pixelated/manifests') diff --git a/provisioning/modules/pixelated/manifests/apt.pp b/provisioning/modules/pixelated/manifests/apt.pp index bf924b97..caf96065 100644 --- a/provisioning/modules/pixelated/manifests/apt.pp +++ b/provisioning/modules/pixelated/manifests/apt.pp @@ -16,9 +16,9 @@ class pixelated::apt { } exec{'add_pixelated_key': - command => '/usr/bin/apt-key adv --keyserver pool.sks-keyservers.net --recv-keys F4C220FCD74F4DF45DD78FC0287A1542472DC0E3' - refreshonly => true, - notify => Exec['apt_get_update'], + command => '/usr/bin/apt-key adv --keyserver pool.sks-keyservers.net --recv-keys F4C220FCD74F4DF45DD78FC0287A1542472DC0E3', + unless => '/usr/bin/apt-key finger 2>&1 | grep -q "F4C2 20FC D74F 4DF4 5DD7 8FC0 287A 1542 472D C0E3"', + notify => Exec['apt_get_update'], } # nodejs latest repo @@ -30,7 +30,8 @@ class pixelated::apt { } exec{'add_nodesource_key': command => '/usr/bin/curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -', - notify => Exec['apt_get_update'] + unless => '/usr/bin/apt-key finger 2>&1 | grep -q "9FD3 B784 BC1C 6FC3 1A8A 0A1C 1655 A0AB 6857 6280"', + notify => Exec['apt_get_update'] } file { '/etc/apt/preferences.d/nodejs': content => -- cgit v1.2.3