Skip to content

Commit

Permalink
Add bits to support stable/queens
Browse files Browse the repository at this point in the history
Add missing bits to support stable/queens branch in TripleO;
Some adjustments might be done later but this is a first iteration.

Change-Id: I4a369389fbecf6890a75ffaaf695f391cd6b7e2d
Closes-Bug: #1750311
  • Loading branch information
karelyatin committed Feb 20, 2018
1 parent 3c93795 commit 5bf07a2
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 6 deletions.
6 changes: 4 additions & 2 deletions scripts/deploy.sh
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions scripts/mirror-server/mirror-server.pp
Expand Up @@ -59,6 +59,11 @@
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",
Expand Down
2 changes: 1 addition & 1 deletion scripts/oooq_common_functions.sh
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion scripts/tripleo.sh
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion toci_gate_test-oooq.sh
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion toci_gate_test-orig.sh
Expand Up @@ -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
Expand Down

0 comments on commit 5bf07a2

Please sign in to comment.