(PDK-1501) Fix acceptance stages in Travis CI

Previously the Travis CI file was brought under PDK control, however the
sync.yml did not contain the stage settings for the Litmus jobs which meant
that they did not run.  This commit fixes that error and runs PDK Update again

diff --git a/.sync.yml b/.sync.yml
index 07599062d35aa637a3d4009510845783d285e958..bfbdd04f11ba4edb16287ea7e65274d60203ba67 100644 (file)
--- a/.sync.yml
+++ b/.sync.yml
@@ -23,6 +23,7 @@
       - bundle exec rake litmus:acceptance:parallel
       services: docker
       sudo: required
+      stage: acceptance
     -
       bundler_args:
       dist: trusty
@@ -37,6 +38,7 @@
       - bundle exec rake litmus:acceptance:parallel
       services: docker
       sudo: required
+      stage: acceptance
     -
       bundler_args:
       dist: trusty
@@ -51,6 +53,7 @@
       - bundle exec rake litmus:acceptance:parallel
       services: docker
       sudo: required
+      stage: acceptance
 
 appveyor.yml:
   delete: true

diff --git a/.travis.yml b/.travis.yml
index bdb5e4a916749953703f5c5fe8387e1d2e4bb7c0..5fe6952c0b5b73416a7d6da997e3eeafe4804180 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -45,6 +45,7 @@ matrix:
       rvm: 2.5.3
       script: ["bundle exec rake litmus:acceptance:parallel"]
       services: docker
+      stage: acceptance
       sudo: required
     -
       before_script: ["bundle exec rake 'litmus:provision_list[waffle_deb]'", "bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='*'", "bundle exec rake 'litmus:install_agent[puppet6]'", "bundle exec rake litmus:install_module"]
@@ -54,6 +55,7 @@ matrix:
       rvm: 2.5.3
       script: ["bundle exec rake litmus:acceptance:parallel"]
       services: docker
+      stage: acceptance
       sudo: required
     -
       before_script: ["bundle exec rake 'litmus:provision_list[waffle_deb]'", "bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='*'", "bundle exec rake 'litmus:install_agent[puppet5]'", "bundle exec rake litmus:install_module"]
@@ -63,6 +65,7 @@ matrix:
       rvm: 2.5.3
       script: ["bundle exec rake litmus:acceptance:parallel"]
       services: docker
+      stage: acceptance
       sudo: required
 branches:
   only: