openstack
/
tripleo-ci
Code Issues Proposed changes

Don't use delorean-ci repo for upgrade deployment 

The initial deploy uses UPGRADE_RELEASE branch, which is the previous
release, not the branch under test.  This means, because Depends-On
and ZUUL_REFS aren't branch-aware, that we can only test packages for
the current branch, and we have to disable delorean-ci to avoid pulling
in e.g master puppet-tripleo on a newton deployment due to
Depends-On.

Change-Id: I8222da355fa7a7134b695a45d815caa640b8029b
This commit is contained in:
Steven Hardy 2017-03-03 14:58:01 +00:00
parent 32e1bb6789
commit f86cfc2a0d
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
scripts/deploy.sh
View File

@ -311,6 +311,16 @@ 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
@ -400,6 +410,16 @@ if [ -f ~/overcloudrc ]; then
fi
if [ "$OVERCLOUD_MAJOR_UPGRADE" == 1 ] ; then
# Re-enable the delorean-ci repo, as ZUUL_REFS,
# and thus the contents of delorean-ci may contain packages
# we want to test for the current branch on upgrade
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=0/enabled=1/\" /etc/yum.repos.d/delorean-ci.repo
done
fi
source ~/stackrc
# Set deploy args for stable deployment:
# We have to use the backward compatible