diff options
author | Tim Smith <tsmith84@gmail.com> | 2020-05-21 15:54:23 -0700 |
---|---|---|
committer | Tim Smith <tsmith84@gmail.com> | 2020-05-21 15:54:23 -0700 |
commit | 95e99f3fb6b1fdb16827f398a174ee4987909ed1 (patch) | |
tree | 656487c9ae0f9dbcc03b592f26208af7a1f87543 | |
parent | 1972e2a6b4ffa771d17a1da31e041f82d5139eff (diff) | |
download | chef-95e99f3fb6b1fdb16827f398a174ee4987909ed1.tar.gz |
More expeditor config updates
Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r-- | .expeditor/verify.pipeline.yml | 111 |
1 files changed, 43 insertions, 68 deletions
diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml index 3b217670bd..14a3d7196d 100644 --- a/.expeditor/verify.pipeline.yml +++ b/.expeditor/verify.pipeline.yml @@ -1,13 +1,13 @@ --- - expeditor: - cached_folders: - - vendor - defaults: - buildkite: - retry: - automatic: - limit: 1 - timeout_in_minutes: 30 +expeditor: + cached_folders: + - vendor + defaults: + buildkite: + retry: + automatic: + limit: 1 + timeout_in_minutes: 30 steps: @@ -251,26 +251,22 @@ steps: # EXTERNAL GEM TESTING ######################################################################### -- label: "Test chef-sugar gem :ruby: 2.6" +- label: "chef-sugar gem :ruby: 2.6" commands: - /workdir/scripts/bk_tests/bk_container_prep.sh - bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package docgen - bundle exec tasks/bin/run_external_test chef/chef-sugar master rake expeditor: - cached_folders: - - vendor executor: docker: image: rubydistros/ubuntu-18.04:2.6 -- label: "Test chef-zero gem :ruby: 2.6" +- label: "chef-zero gem :ruby: 2.6" commands: - /workdir/scripts/bk_tests/bk_container_prep.sh - bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package docgen - bundle exec tasks/bin/run_external_test chef/chef-zero master rake pedant expeditor: - cached_folders: - - vendor executor: docker: image: rubydistros/ubuntu-18.04:2.6 @@ -278,43 +274,37 @@ steps: - PEDANT_OPTS=--skip-oc_id - CHEF_FS=true -- label: "Test cheffish gem :ruby: 2.6" +- label: "cheffish gem :ruby: 2.6" commands: - /workdir/scripts/bk_tests/bk_container_prep.sh - bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package docgen - bundle exec tasks/bin/run_external_test chef/cheffish master rake spec expeditor: - cached_folders: - - vendor executor: docker: image: rubydistros/ubuntu-18.04:2.6 -- label: "Test chefspec gem :ruby: 2.6" +- label: "chefspec gem :ruby: 2.6" commands: - /workdir/scripts/bk_tests/bk_container_prep.sh - bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package docgen - bundle exec tasks/bin/run_external_test chefspec/chefspec master rake expeditor: - cached_folders: - - vendor executor: docker: image: rubydistros/ubuntu-18.04:2.6 -- label: "Test knife-windows gem :ruby: 2.6" +- label: "knife-windows gem :ruby: 2.6" commands: - /workdir/scripts/bk_tests/bk_container_prep.sh - bundle install --jobs=3 --retry=3 --path=vendor/bundle --without omnibus_package docgen - bundle exec tasks/bin/run_external_test chef/knife-windows master rake spec expeditor: - cached_folders: - - vendor executor: docker: image: rubydistros/ubuntu-18.04:2.6 -- label: "Test berkshelf gem :ruby: 2.6" +- label: "berkshelf gem :ruby: 2.6" commands: - /workdir/scripts/bk_tests/bk_container_prep.sh - apt-get update -y @@ -331,11 +321,11 @@ steps: # START TEST KITCHEN ONLY ######################################################################### -- label: "Kitchen Tests :amazon: 2" +- label: "Kitchen: Amazon Linux 201X" commands: - scripts/bk_tests/bk_linux_exec.sh - cd kitchen-tests - - ~/.asdf/shims/bundle exec kitchen test end-to-end-amazonlinux-2 + - /opt/omnibus-toolchain/bin/bundle exec kitchen test end-to-end-amazonlinux artifact_paths: - $PWD/.kitchen/logs/kitchen.log env: @@ -346,11 +336,11 @@ steps: privileged: true single-use: true -- label: "Kitchen Tests :amazon: 201X" +- label: "Kitchen: Amazon Linux 2" commands: - scripts/bk_tests/bk_linux_exec.sh - cd kitchen-tests - - ~/.asdf/shims/bundle exec kitchen test end-to-end-amazonlinux-2 + - /opt/omnibus-toolchain/bin/bundle exec kitchen test end-to-end-amazonlinux-2 artifact_paths: - $PWD/.kitchen/logs/kitchen.log env: @@ -361,11 +351,11 @@ steps: privileged: true single-use: true -- label: "Kitchen Tests Ubuntu: 16.04" +- label: "Kitchen: Ubuntu 16.04" commands: - scripts/bk_tests/bk_linux_exec.sh - cd kitchen-tests - - ~/.asdf/shims/bundle exec kitchen test end-to-end-ubuntu-1604 + - /opt/omnibus-toolchain/bin/bundle exec kitchen test end-to-end-ubuntu-1604 artifact_paths: - $PWD/.kitchen/logs/kitchen.log env: @@ -377,26 +367,11 @@ steps: privileged: true single-use: true -- label: "Kitchen Tests Ubuntu: 18.04" - commands: - - scripts/bk_tests/bk_linux_exec.sh - - cd kitchen-tests - - ~/.asdf/shims/bundle exec kitchen test end-to-end-ubuntu-1804 - artifact_paths: - - $PWD/.kitchen/logs/kitchen.log - env: - KITCHEN_YAML: kitchen.yml - expeditor: - executor: - linux: - privileged: true - single-use: true - -- label: "Kitchen Tests Ubuntu: 20.04" +- label: "Kitchen: Ubuntu 18.04" commands: - scripts/bk_tests/bk_linux_exec.sh - cd kitchen-tests - - ~/.asdf/shims/bundle exec kitchen test end-to-end-ubuntu-2004 + - /opt/omnibus-toolchain/bin/bundle exec kitchen test end-to-end-ubuntu-1804 artifact_paths: - $PWD/.kitchen/logs/kitchen.log env: @@ -407,11 +382,11 @@ steps: privileged: true single-use: true -- label: "Kitchen Tests Debian: 8" +- label: "Kitchen: Ubuntu 20.04" commands: - scripts/bk_tests/bk_linux_exec.sh - cd kitchen-tests - - ~/.asdf/shims/bundle exec kitchen test end-to-end-debian-8 + - /opt/omnibus-toolchain/bin/bundle exec kitchen test end-to-end-ubuntu-2004 artifact_paths: - $PWD/.kitchen/logs/kitchen.log env: @@ -422,11 +397,11 @@ steps: privileged: true single-use: true -- label: "Kitchen Tests Debian: 9" +- label: "Kitchen: Debian 8" commands: - scripts/bk_tests/bk_linux_exec.sh - cd kitchen-tests - - ~/.asdf/shims/bundle exec kitchen test end-to-end-debian-9 + - /opt/omnibus-toolchain/bin/bundle exec kitchen test end-to-end-debian-8 artifact_paths: - $PWD/.kitchen/logs/kitchen.log env: @@ -437,11 +412,11 @@ steps: privileged: true single-use: true -- label: "Kitchen Tests Debian: 10" +- label: "Kitchen: Debian 9" commands: - scripts/bk_tests/bk_linux_exec.sh - cd kitchen-tests - - ~/.asdf/shims/bundle exec kitchen test end-to-end-debian-10 + - /opt/omnibus-toolchain/bin/bundle exec kitchen test end-to-end-debian-9 artifact_paths: - $PWD/.kitchen/logs/kitchen.log env: @@ -452,11 +427,11 @@ steps: privileged: true single-use: true -- label: "Kitchen Tests CentOS: 6" +- label: "Kitchen: Debian 10" commands: - scripts/bk_tests/bk_linux_exec.sh - cd kitchen-tests - - ~/.asdf/shims/bundle exec kitchen test end-to-end-centos-6 + - /opt/omnibus-toolchain/bin/bundle exec kitchen test end-to-end-debian-10 artifact_paths: - $PWD/.kitchen/logs/kitchen.log env: @@ -467,11 +442,11 @@ steps: privileged: true single-use: true -- label: "Kitchen Tests CentOS: 7" +- label: "Kitchen: CentOS 6" commands: - scripts/bk_tests/bk_linux_exec.sh - cd kitchen-tests - - ~/.asdf/shims/bundle exec kitchen test end-to-end-centos-7 + - /opt/omnibus-toolchain/bin/bundle exec kitchen test end-to-end-centos-6 artifact_paths: - $PWD/.kitchen/logs/kitchen.log env: @@ -482,11 +457,11 @@ steps: privileged: true single-use: true -- label: "Kitchen Tests CentOS: 8" +- label: "Kitchen: CentOS 7" commands: - scripts/bk_tests/bk_linux_exec.sh - cd kitchen-tests - - ~/.asdf/shims/bundle exec kitchen test end-to-end-centos-8 + - /opt/omnibus-toolchain/bin/bundle exec kitchen test end-to-end-centos-7 artifact_paths: - $PWD/.kitchen/logs/kitchen.log env: @@ -497,11 +472,11 @@ steps: privileged: true single-use: true -- label: "Kitchen Tests Oracle Linux: 6" +- label: "Kitchen: CentOS 8" commands: - scripts/bk_tests/bk_linux_exec.sh - cd kitchen-tests - - ~/.asdf/shims/bundle exec kitchen test end-to-end-oraclelinux-6 + - /opt/omnibus-toolchain/bin/bundle exec kitchen test end-to-end-centos-8 artifact_paths: - $PWD/.kitchen/logs/kitchen.log env: @@ -512,11 +487,11 @@ steps: privileged: true single-use: true -- label: "Kitchen Tests Oracle Linux: 7" +- label: "Kitchen: Oracle Linux 7" commands: - scripts/bk_tests/bk_linux_exec.sh - cd kitchen-tests - - ~/.asdf/shims/bundle exec kitchen test end-to-end-oraclelinux-7 + - /opt/omnibus-toolchain/bin/bundle exec kitchen test end-to-end-oraclelinux-7 artifact_paths: - $PWD/.kitchen/logs/kitchen.log env: @@ -527,11 +502,11 @@ steps: privileged: true single-use: true -- label: "Kitchen Tests Fedora: latest" +- label: "Kitchen: Fedora latest" commands: - scripts/bk_tests/bk_linux_exec.sh - cd kitchen-tests - - ~/.asdf/shims/bundle exec kitchen test end-to-end-fedora-latest + - /opt/omnibus-toolchain/bin/bundle exec kitchen test end-to-end-fedora-latest artifact_paths: - $PWD/.kitchen/logs/kitchen.log env: @@ -542,11 +517,11 @@ steps: privileged: true single-use: true -- label: "Kitchen Tests openSUSE Leap: 15" +- label: "Kitchen: openSUSE Leap: 15" commands: - scripts/bk_tests/bk_linux_exec.sh - cd kitchen-tests - - ~/.asdf/shims/bundle exec kitchen test end-to-end-opensuse-leap-15 + - /opt/omnibus-toolchain/bin/bundle exec kitchen test end-to-end-opensuse-leap-15 artifact_paths: - $PWD/.kitchen/logs/kitchen.log env: |