summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTulio Casagrande <tuliocasagrande@gmail.com>2017-06-06 15:22:40 -0300
committerGitHub <noreply@github.com>2017-06-06 15:22:40 -0300
commitdc786018170f02c34301b152dc8941473f07ab09 (patch)
tree838e3d0839e9a6f27c17c348d71388d555d55724
parent42d478f1b43324bab3f11b662a1082445bacca0f (diff)
parent528fe698da03dd751d6516cbbd5f520c4506957e (diff)
Merge pull request #1080 from pixelated/chromedriver
Ship our local version of google-chrome and chromedriver
-rw-r--r--Makefile3
-rw-r--r--provisioning/modules/chromedriver/manifests/init.pp38
-rw-r--r--provisioning/modules/pixelated/manifests/source.pp4
3 files changed, 40 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 899b6c80..1c8e8172 100644
--- a/Makefile
+++ b/Makefile
@@ -79,13 +79,11 @@ integration_tests_py:
functional_tests: clean requirements install
@. $(VIRTUALENV)/bin/activate;\
- export PATH=$(PATH):/usr/lib/chromium/;\
cd service;\
xvfb-run --server-args="-screen 0 1280x1024x24" behave --tags ~@wip --tags ~@smoke test/functional/features
smoke_tests: clean install
@. $(VIRTUALENV)/bin/activate;\
- export PATH=$(PATH):/usr/lib/chromium/;\
cd service;\
xvfb-run --server-args="-screen 0 1280x1024x24" behave --tags ~@wip --tags @smoke test/functional/features -k -D host=$(provider)
@@ -96,7 +94,6 @@ functional_tests_ci: clean requirements install
functional_tests_wip:
@. $(VIRTUALENV)/bin/activate;\
- export PATH=$(PATH):/usr/lib/chromium/;\
cd service;\
xvfb-run --server-args="-screen 0 1280x1024x24" behave --tags @wip test/functional/features
diff --git a/provisioning/modules/chromedriver/manifests/init.pp b/provisioning/modules/chromedriver/manifests/init.pp
new file mode 100644
index 00000000..709d8aa1
--- /dev/null
+++ b/provisioning/modules/chromedriver/manifests/init.pp
@@ -0,0 +1,38 @@
+# install chromedriver for functional tests
+# we ship our local copy of chromedriver
+# because latest versions are getting recurring errors on
+# test/functional/features/login.feature#Then I should see the fancy interstitial
+
+class chromedriver (
+ $release = '1.0_beta1',
+ $chromedriver = 'chromedriver_2.27_linux64.zip',
+ $google_chrome = 'google-chrome-stable_54.0.2840.100-1_amd64.deb',
+) {
+
+ exec { 'fetch_chromedriver':
+ command => "/usr/bin/wget https://github.com/pixelated/pixelated-user-agent/releases/download/${release}/${chromedriver}",
+ cwd => '/var/tmp',
+ creates => "/var/tmp/${chromedriver}",
+ }
+
+ exec { 'fetch_google_chrome':
+ command => "/usr/bin/wget https://github.com/pixelated/pixelated-user-agent/releases/download/${release}/${google_chrome}",
+ cwd => '/var/tmp',
+ creates => "/var/tmp/${google_chrome}",
+ }
+
+ exec { 'unpack_chromedriver':
+ command => "/usr/bin/unzip ${chromedriver} -d /usr/local/bin/",
+ cwd => '/var/tmp/',
+ creates => '/usr/local/bin/chromedriver',
+ require => [ Exec['fetch_chromedriver'] ],
+ }
+
+ exec { 'install_google_chrome':
+ command => "/usr/bin/dpkg -i ${google_chrome} || /usr/bin/apt-get -y -f install",
+ cwd => '/var/tmp/',
+ unless => '/usr/bin/dpkg -l google-chrome-stable > /dev/null 2>&1',
+ require => [ Exec['fetch_google_chrome'], Exec['apt_get_update'] ],
+ }
+
+}
diff --git a/provisioning/modules/pixelated/manifests/source.pp b/provisioning/modules/pixelated/manifests/source.pp
index de4ade1e..691a3fbc 100644
--- a/provisioning/modules/pixelated/manifests/source.pp
+++ b/provisioning/modules/pixelated/manifests/source.pp
@@ -1,5 +1,6 @@
# install requirements for setting up the useragent from source
class pixelated::source {
+ include chromedriver
package { [
'git',
@@ -15,14 +16,13 @@ class pixelated::source {
'ruby-compass',
'xvfb',
'xauth',
- 'chromedriver',
'phantomjs'
]:
ensure => latest
}
package { ['sass', 'compass']:
- ensure => latest,
+ ensure => latest,
provider => 'gem',
}