Merge "Add bits to support stable/queens"
This commit is contained in:
commit
5fa75fc352
@ -577,9 +577,11 @@ fi
|
||||
if [ "$UNDERCLOUD_MAJOR_UPGRADE" == 1 ] ; then
|
||||
# Reset or unset STABLE_RELEASE so that we upgrade to the next major
|
||||
# version
|
||||
if [ "$STABLE_RELEASE" = "pike" ]; then
|
||||
# TODO: switch STABLE_RELEASE to queens when released
|
||||
if [ "$STABLE_RELEASE" = "queens" ]; then
|
||||
# TODO: switch STABLE_RELEASE to rocky when released
|
||||
export STABLE_RELEASE=""
|
||||
elif [ "$STABLE_RELEASE" = "pike" ]; then
|
||||
export STABLE_RELEASE="queens"
|
||||
elif [ "$STABLE_RELEASE" = "ocata" ]; then
|
||||
export STABLE_RELEASE="pike"
|
||||
elif [ "$STABLE_RELEASE" = "mitaka" ]; then
|
||||
|
@ -59,6 +59,11 @@ cron {"mirror-images-master":
|
||||
hour => "2",
|
||||
minute => "0"
|
||||
}
|
||||
cron {"mirror-images-queens":
|
||||
command => "timeout 60m /opt/stack/tripleo-ci/scripts/mirror-server/mirror-images.sh queens | tee /var/log/images_update-queens.log",
|
||||
hour => "2",
|
||||
minute => "0"
|
||||
}
|
||||
cron {"mirror-images-pike":
|
||||
command => "timeout 60m /opt/stack/tripleo-ci/scripts/mirror-server/mirror-images.sh pike | tee /var/log/images_update-pike.log",
|
||||
hour => "2",
|
||||
|
@ -5,7 +5,7 @@ function previous_release_from {
|
||||
case "$RELEASE" in
|
||||
''|master)
|
||||
# NOTE: we need to update this when we cut a stable branch
|
||||
echo "pike"
|
||||
echo "queens"
|
||||
;;
|
||||
queens)
|
||||
echo "pike"
|
||||
|
@ -499,7 +499,7 @@ function delorean_build {
|
||||
GITHASH=$(git rev-parse HEAD)
|
||||
|
||||
# Set the branches delorean reads to the same git hash as PROJ has left for us
|
||||
for BRANCH in master origin/master stable/mitaka origin/stable/mitaka stable/newton origin/stable/newton stable/ocata origin/stable/ocata stable/pike origin/stable/pike; do
|
||||
for BRANCH in master origin/master stable/mitaka origin/stable/mitaka stable/newton origin/stable/newton stable/ocata origin/stable/ocata stable/pike origin/stable/pike stable/queens origin/stable/queens; do
|
||||
git checkout -b $BRANCH || git checkout $BRANCH
|
||||
git reset --hard $GITHASH
|
||||
done
|
||||
|
@ -260,7 +260,7 @@ else
|
||||
# multinode bootstrap script
|
||||
export DO_BOOTSTRAP_SUBNODES=${DO_BOOTSTRAP_SUBNODES:-1}
|
||||
export BOOTSTRAP_SUBNODES_MINIMAL=0
|
||||
if [[ -z $STABLE_RELEASE || "$STABLE_RELEASE" = "ocata" || "$STABLE_RELEASE" = "pike" ]]; then
|
||||
if [[ -z $STABLE_RELEASE || "$STABLE_RELEASE" != "newton" ]]; then
|
||||
BOOTSTRAP_SUBNODES_MINIMAL=1
|
||||
fi
|
||||
echo_vars_to_deploy_env_oooq
|
||||
|
@ -197,7 +197,9 @@ for JOB_TYPE_PART in $(sed 's/-/ /g' <<< "${TOCI_JOBTYPE:-}") ; do
|
||||
if [ $TOCI_JOBTYPE == 'undercloud-upgrades' ] ; then
|
||||
# We want to start by installing an Undercloud
|
||||
# from the previous stable release.
|
||||
if [ "$STABLE_RELEASE" = "pike" ]; then
|
||||
if [ "$STABLE_RELEASE" = "queens" ]; then
|
||||
STABLE_RELEASE=pike
|
||||
elif [ "$STABLE_RELEASE" = "pike" ]; then
|
||||
STABLE_RELEASE=ocata
|
||||
elif [ "$STABLE_RELEASE" = "ocata" ]; then
|
||||
STABLE_RELEASE=newton
|
||||
|
Loading…
Reference in New Issue
Block a user