summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2019-05-03 13:59:37 -0700
committerTim Smith <tsmith@chef.io>2019-05-03 14:03:19 -0700
commit20dd5bfea4d75c5cb3f675568a7db41bd5de48d8 (patch)
tree000a39f27c22f8491282c610ab2089f375c55a93
parent58db2c3f47e86d539d21f9365adb135726719e38 (diff)
downloadchef-fix_opensuse42.tar.gz
Switch Travis testing to the new opensuse-42 imagefix_opensuse42
The old image isn't being generated anymore and is based off an unmaintained docker container from the opensuse project. Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--.travis.yml6
-rw-r--r--kitchen-tests/kitchen.yml7
2 files changed, 5 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml
index 18a12e654d..ce04c5f6c8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -276,7 +276,7 @@ matrix:
- sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
- cd kitchen-tests
script:
- - bundle exec kitchen test end-to-end-opensuse-leap
+ - bundle exec kitchen test end-to-end-opensuse-leap-42
after_failure:
- cat .kitchen/logs/kitchen.log
env:
@@ -330,7 +330,7 @@ matrix:
- sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
- cd kitchen-tests
script:
- - bundle exec kitchen test rspec-opensuse-leap
+ - bundle exec kitchen test rspec-opensuse-leap-42
after_failure:
- cat .kitchen/logs/kitchen.log
env:
@@ -348,7 +348,7 @@ matrix:
- sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
- cd kitchen-tests
script:
- - bundle exec kitchen test rspec-opensuse-leap
+ - bundle exec kitchen test rspec-opensuse-leap-42
after_failure:
- cat .kitchen/logs/kitchen.log
env:
diff --git a/kitchen-tests/kitchen.yml b/kitchen-tests/kitchen.yml
index 5fe3b8540f..a9372eccd9 100644
--- a/kitchen-tests/kitchen.yml
+++ b/kitchen-tests/kitchen.yml
@@ -95,13 +95,10 @@ platforms:
intermediate_instructions:
- RUN /usr/bin/apt-get update
-- name: opensuse-leap
+- name: opensuse-leap-42
driver:
- image: dokken/opensuse-leap
+ 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
suites:
- name: end-to-end