summaryrefslogtreecommitdiff
path: root/omnibus
diff options
context:
space:
mode:
authorJeremiah Snapp <jeremiah@chef.io>2019-08-08 14:22:23 -0400
committerJeremiah Snapp <jeremiah@chef.io>2019-08-08 14:38:29 -0400
commitbf252d92cb60fd22e16bcd5e367bbf594148e11a (patch)
tree6d8983288d152e19f03b40c2fa0e6aa91a1c59f5 /omnibus
parent0f73a283fea26dc44d5e59b4a8b3ba36066db875 (diff)
downloadchef-bf252d92cb60fd22e16bcd5e367bbf594148e11a.tar.gz
Revert the zypper test failures fix
We don't need this fix anymore. Updating the test systems resolved the issue. Signed-off-by: Jeremiah Snapp <jeremiah@chef.io>
Diffstat (limited to 'omnibus')
-rw-r--r--omnibus/omnibus-test.sh12
1 files changed, 0 insertions, 12 deletions
diff --git a/omnibus/omnibus-test.sh b/omnibus/omnibus-test.sh
index 2c03787add..69a4f0a5ef 100644
--- a/omnibus/omnibus-test.sh
+++ b/omnibus/omnibus-test.sh
@@ -152,18 +152,6 @@ elif [[ -d /usr/local/etc/sudoers.d ]]; then
sudo chmod 440 "/usr/local/etc/sudoers.d/$(id -un)-preserve_path"
fi
-# Remove the ec2 cloud zypper repos before running functional tests
-if [[ ! $(grep s390 /etc/SuSE-release) ]] > /dev/null 2>&1; then # Don't delete repos on s390x
- if [[ $(grep -i suse /etc/SuSE-release /etc/os-release) ]] > /dev/null 2>&1; then
- echo "Removing zypper repos for Amazon SLES nodes"
- sleep 5 # Allow some time for repo setup to complete
- for i in $(zypper lr |grep -v "Alias" |awk -F "|" '{print $2}'); do
- sudo zypper rr $i
- done
- sudo rm /usr/lib/zypp/plugins/services/* || true
- fi
-fi
-
cd "$chef_gem"
sudo -E bundle install
sudo -E bundle exec rspec -r rspec_junit_formatter -f RspecJunitFormatter -o test.xml -f documentation spec/functional