openstack/tripleo-ci
Code Issues Proposed changes

Merge "Disable delorean-ci earlier for multinode upgrades"

Browse Source
This commit is contained in:
Jenkins 2017-03-07 18:56:26 +00:00 committed by Gerrit Code Review
commit 94cb5026cf
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/deploy.sh
View File

@ -306,16 +306,6 @@ if [ "$MULTINODE" = "1" ]; then
fi
echo_vars_to_deploy_env
$TRIPLEO_ROOT/$UPGRADE_RELEASE/usr/share/openstack-tripleo-heat-templates/deployed-server/scripts/get-occ-config.sh 2>&1 | sudo dd of=/var/log/deployed-server-os-collect-config.log &
# Disable the delorean-ci repo for the initial overcloud deploy, as
# ZUUL_REFS, and thus the contents of delorean-ci can only reference
# patches for the current branch, not UPGRADE_RELEASE
if [ -s /etc/nodepool/sub_nodes ]; then
for ip in $(cat /etc/nodepool/sub_nodes); do
ssh $SSH_OPTIONS -tt -i /etc/nodepool/id_rsa $ip \
sudo sed -i -e \"s/enabled=1/enabled=0/\" /etc/yum.repos.d/delorean-ci.repo
done
fi
else
/usr/share/openstack-tripleo-heat-templates/deployed-server/scripts/get-occ-config.sh 2>&1 | sudo dd of=/var/log/deployed-server-os-collect-config.log &
fi

10
toci_instack_osinfra.sh
View File

@ -115,6 +115,16 @@ if [ -s /etc/nodepool/sub_nodes ]; then
# Update the local deploy.env only so that the undercloud will install
# at the current $STABLE_RELEASE
echo_vars_to_deploy_env
# Disable the delorean-ci repo for the initial overcloud deploy, as
# ZUUL_REFS, and thus the contents of delorean-ci can only reference
# patches for the current branch, not UPGRADE_RELEASE
if [ -s /etc/nodepool/sub_nodes ]; then
for ip in $(cat /etc/nodepool/sub_nodes); do
ssh $SSH_OPTIONS -tt -i /etc/nodepool/id_rsa $ip \
sudo sed -i -e \"s/enabled=1/enabled=0/\" /etc/yum.repos.d/delorean-ci.repo
done
fi
fi
$TRIPLEO_ROOT/tripleo-ci/scripts/tripleo.sh --multinode-setup