summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2020-10-26 14:54:35 -0700
committerGitHub <noreply@github.com>2020-10-26 14:54:35 -0700
commit4e3cc4e8fbeca3495107949d53459c75775cf8ec (patch)
tree2f14f50efc3a70550d99d3a0a8bbc7b4d2d1e993
parent566630269bfbde6b4cc276120a0a58e5bdb31cd5 (diff)
parentebd0a2f162cbefe06368531cbf3dcc37012b27b2 (diff)
downloadchef-4e3cc4e8fbeca3495107949d53459c75775cf8ec.tar.gz
Merge pull request #10553 from chef/ubuntu_2010
Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--.expeditor/verify.pipeline.yml15
-rw-r--r--kitchen-tests/kitchen.yml8
2 files changed, 23 insertions, 0 deletions
diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml
index f719a64c3f..257f16721d 100644
--- a/.expeditor/verify.pipeline.yml
+++ b/.expeditor/verify.pipeline.yml
@@ -436,6 +436,21 @@ steps:
privileged: true
single-use: true
+- label: "Kitchen: Ubuntu 20.10"
+ commands:
+ - scripts/bk_tests/bk_linux_exec.sh
+ - cd kitchen-tests
+ - /opt/omnibus-toolchain/bin/bundle exec kitchen test end-to-end-ubuntu-2010
+ artifact_paths:
+ - $PWD/.kitchen/logs/kitchen.log
+ env:
+ KITCHEN_YAML: kitchen.yml
+ expeditor:
+ executor:
+ linux:
+ privileged: true
+ single-use: true
+
- label: "Kitchen: Debian 9"
commands:
- scripts/bk_tests/bk_linux_exec.sh
diff --git a/kitchen-tests/kitchen.yml b/kitchen-tests/kitchen.yml
index 2c132ee3cf..1e15ada006 100644
--- a/kitchen-tests/kitchen.yml
+++ b/kitchen-tests/kitchen.yml
@@ -136,6 +136,14 @@ 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
+ driver:
+ image: dokken/ubuntu-20.10
+ pid_one_command: /bin/systemd
+ intermediate_instructions:
+ - 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: opensuse-leap-15
driver:
image: dokken/opensuse-leap-15