diff options
author | Tim Smith <tsmith84@gmail.com> | 2019-12-02 10:10:06 -0800 |
---|---|---|
committer | Tim Smith <tsmith84@gmail.com> | 2019-12-02 10:10:06 -0800 |
commit | 71fe7e7d3759862d3067f19bdc9d60be29a94287 (patch) | |
tree | 1524304b000c1d677d0ac27c3910358526058cd2 | |
parent | 7ac995eb112e5fa7a4db2850402597e0044b1f90 (diff) | |
download | chef-71fe7e7d3759862d3067f19bdc9d60be29a94287.tar.gz |
More kitchen test updates
Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r-- | kitchen-tests/Berksfile | 1 | ||||
-rw-r--r-- | kitchen-tests/kitchen.yml | 23 |
2 files changed, 9 insertions, 15 deletions
diff --git a/kitchen-tests/Berksfile b/kitchen-tests/Berksfile index d699452ebe..50e09ebf3b 100644 --- a/kitchen-tests/Berksfile +++ b/kitchen-tests/Berksfile @@ -1,4 +1,3 @@ source "https://supermarket.chef.io" cookbook "end_to_end", path: "cookbooks/end_to_end" -cookbook "rspec", path: "cookbooks/rspec" diff --git a/kitchen-tests/kitchen.yml b/kitchen-tests/kitchen.yml index b94b3067ea..abb85ff783 100644 --- a/kitchen-tests/kitchen.yml +++ b/kitchen-tests/kitchen.yml @@ -83,6 +83,14 @@ platforms: - RUN yum -y install e2fsprogs - RUN sed -i -e "s/Defaults.*requiretty.*/Defaults !requiretty/g" /etc/sudoers +- name: centos-8 + driver: + image: dokken/centos-8 + pid_one_command: /usr/lib/systemd/systemd + intermediate_instructions: + - RUN yum -y install e2fsprogs + - RUN sed -i -e "s/Defaults.*requiretty.*/Defaults !requiretty/g" /etc/sudoers + - name: oraclelinux-6 driver: image: dokken/oraclelinux-6 @@ -104,6 +112,7 @@ platforms: pid_one_command: /usr/lib/systemd/systemd intermediate_instructions: - RUN yum -y install e2fsprogs + - RUN yum -y reinstall systemd - RUN sed -i -e "s/Defaults.*requiretty.*/Defaults !requiretty/g" /etc/sudoers - name: fedora-latest @@ -127,14 +136,6 @@ platforms: intermediate_instructions: - RUN /usr/bin/apt-get update -- name: opensuse-leap-42 - driver: - image: dokken/opensuse-leap-42 - pid_one_command: /bin/systemd - intermediate_instructions: - - RUN /usr/bin/zypper --non-interactive update - - RUN /usr/bin/zypper --non-interactive install cron - - name: opensuse-leap-15 driver: image: dokken/opensuse-leap-15 @@ -147,9 +148,3 @@ suites: - name: end-to-end run_list: - recipe[end_to_end::default] - - name: rspec - run_list: - - recipe[rspec] - lifecycle: - post_converge: - - remote: /usr/local/bin/run-chef-rspec |