From: Glenn Sarti Date: Tue, 5 Nov 2019 05:25:11 +0000 (+0800) Subject: (PDK-1501) Fix acceptance stages in Travis CI X-Git-Tag: v2.2.0~10^2 X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=f2016f80ec821bcd611368df55899f876fe0ec56;p=puppet-modules%2Fpuppetlabs-firewall.git (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 0759906..bfbdd04 100644 --- 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 bdb5e4a..5fe6952 100644 --- 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: