diff options
| author | Tim Smith <tsmith@chef.io> | 2020-12-29 12:00:18 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-29 12:00:18 -0800 |
| commit | 4bebeb28240c1d472d11282d0c30563f3b993ca5 (patch) | |
| tree | 79c347c0f3ff0567234bf6e2fdc3316a92ea94ef | |
| parent | 4fc0a6dd099ceea4e0e37502b719941a090c23bb (diff) | |
| parent | b5615f6b06ebf3481c4b7e0f6bc48347a657d342 (diff) | |
| download | chef-4bebeb28240c1d472d11282d0c30563f3b993ca5.tar.gz | |
Merge pull request #10790 from chef/21.04_testing
Signed-off-by: Tim Smith <tsmith@chef.io>
| -rw-r--r-- | .expeditor/verify.pipeline.yml | 4 | ||||
| -rw-r--r-- | kitchen-tests/kitchen.yml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml index 23b0eaef81..56c1ec7016 100644 --- a/.expeditor/verify.pipeline.yml +++ b/.expeditor/verify.pipeline.yml @@ -409,11 +409,11 @@ steps: privileged: true single-use: true -- label: "Kitchen: Ubuntu 20.10" +- label: "Kitchen: Ubuntu 21.04" commands: - .expeditor/scripts/bk_linux_exec.sh - cd kitchen-tests - - /opt/omnibus-toolchain/bin/bundle exec kitchen test end-to-end-ubuntu-2010 + - /opt/omnibus-toolchain/bin/bundle exec kitchen test end-to-end-ubuntu-2104 artifact_paths: - $PWD/.kitchen/logs/kitchen.log env: diff --git a/kitchen-tests/kitchen.yml b/kitchen-tests/kitchen.yml index ce263413be..d3be98dfc4 100644 --- a/kitchen-tests/kitchen.yml +++ b/kitchen-tests/kitchen.yml @@ -123,9 +123,9 @@ platforms: - RUN /usr/bin/apt-get update - RUN /usr/bin/apt-get install ifupdown -y # we need this for /etc/network/interfaces & ifconfig resource testing -- name: ubuntu-20.10 +- name: ubuntu-21.04 driver: - image: dokken/ubuntu-20.10 + image: dokken/ubuntu-21.04 pid_one_command: /bin/systemd intermediate_instructions: - RUN /usr/bin/apt-get update |