diff options
| author | Tim Smith <tsmith@chef.io> | 2019-06-08 22:12:52 -0700 |
|---|---|---|
| committer | Tim Smith <tsmith@chef.io> | 2019-06-08 22:19:28 -0700 |
| commit | 136971c5975251d7cb5b060dcacd2565bd7eab26 (patch) | |
| tree | 3e68bce3030515eed9724e5c72da54cbf3d24ba3 | |
| parent | 404c18b448bf5491a32b7c7e0c6c42bc83fee037 (diff) | |
| download | chef-136971c5975251d7cb5b060dcacd2565bd7eab26.tar.gz | |
Don't install net-tools on opensuse
Signed-off-by: Tim Smith <tsmith@chef.io>
| -rw-r--r-- | .expeditor/verify.pipeline.yml | 1 | ||||
| -rwxr-xr-x | scripts/bk_tests/bk_container_prep.sh | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml index 8c1201788b..3a9bbb0257 100644 --- a/.expeditor/verify.pipeline.yml +++ b/.expeditor/verify.pipeline.yml @@ -116,7 +116,6 @@ steps: - label: "Functional Specs openSUSE :ruby: 2.6" commands: - /workdir/scripts/bk_tests/bk_container_prep.sh - - yum install -y cron mk2fs util-linux - cd /workdir; bundle install --jobs=3 --retry=3 --without omnibus_package docgen ruby_prof - bundle exec rake spec:functional expeditor: diff --git a/scripts/bk_tests/bk_container_prep.sh b/scripts/bk_tests/bk_container_prep.sh index 4e5a4eb435..1c30d9f354 100755 --- a/scripts/bk_tests/bk_container_prep.sh +++ b/scripts/bk_tests/bk_container_prep.sh @@ -5,7 +5,7 @@ if [ -f /etc/debian_version ]; then apt-get update -y && apt-get install -y net-tools iproute2 mkdir -p /etc/network/interfaces.d touch /etc/network/interfaces -else +elif [ -f /etc/redhat-release ]; then yum install -y net-tools fi |