Merge pull request #1105 from pmcmaw/test

Helen · web-flow · commit 3dce162eeac9 · 2018-07-31T17:10:47.000+01:00
(PUP-9008) - Temporary workaround for Puppet `upstart` Bug
diff --git a/.travis.yml b/.travis.yml
@@ -31,7 +31,7 @@ matrix:
     -
       bundler_args: 
       dist: trusty
-      env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_set=docker/ubuntu-14.04 BEAKER_TESTMODE=apply
+      env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_set=docker/ubuntu-14.04 BEAKER_TESTMODE=apply BEAKER_PUPPET_AGENT_VERSION=5.5.2
       rvm: 2.4.4
       script: bundle exec rake beaker
       services: docker

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ matrix:`
`31`	`31`	`-`
`32`	`32`	`bundler_args:`
`33`	`33`	`dist: trusty`
`34`		`- env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_set=docker/ubuntu-14.04 BEAKER_TESTMODE=apply`
	`34`	`+ env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_set=docker/ubuntu-14.04 BEAKER_TESTMODE=apply BEAKER_PUPPET_AGENT_VERSION=5.5.2`
`35`	`35`	`rvm: 2.4.4`
`36`	`36`	`script: bundle exec rake beaker`
`37`	`37`	`services: docker`