openstack
/
tripleo-ci
Code Issues Proposed changes

Merge "Remove temporary hotfix"

This commit is contained in:
Jenkins 2016-12-01 22:09:41 +00:00 committed by Gerrit Code Review
parent b8e605b11a 460210b5f8
commit 9dd5c90411
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/bootstrap-overcloud-full.sh
View File

@ -11,8 +11,8 @@ if [ -f "$TRIPLEO_ROOT/tripleo-ci/deploy.env" ]; then
source $TRIPLEO_ROOT/tripleo-ci/deploy.env
fi
# Temporary fix for https://bugs.launchpad.net/tripleo/+bug/1606685
sudo yum erase -y epel-release nodejs nodejs-devel nodejs-packaging || :
# Ensure epel-release is not installed
sudo yum erase -y epel-release || :
# Copied from toci_gate_test.sh...need to apply this fix on subnodes as well
# TODO(pabelanger): Why is python-requests installed from pip?

4
toci_gate_test.sh
View File

@ -242,8 +242,8 @@ set -m
# This comes from epel, so we need to install it before removing that repo
sudo yum install -y moreutils
# Temporary fix for https://bugs.launchpad.net/tripleo/+bug/1606685
sudo yum erase -y epel-release nodejs nodejs-devel nodejs-packaging || :
# Ensure epel-release is not installed
sudo yum erase -y epel-release || :
source $TRIPLEO_ROOT/tripleo-ci/scripts/metrics.bash
start_metric "tripleo.testenv.wait.seconds"