diff --git a/deploy-guide/source/conf.py b/deploy-guide/source/conf.py index 18cef1f02c..4331b496c6 100644 --- a/deploy-guide/source/conf.py +++ b/deploy-guide/source/conf.py @@ -296,8 +296,8 @@ pdf_documents = [ latest_tag = os.popen('git describe --abbrev=0 --tags').read().strip('\n') -previous_release_branch_name='pike' -current_release_branch_name='queens' +previous_release_branch_name='queens' +current_release_branch_name='rocky' # Var specifically for using in URLs; differs because it might be 'draft' # on master for deploy guide deploy_branch_link_name = current_release_branch_name diff --git a/scripts/gate-check-commit.sh b/scripts/gate-check-commit.sh index 194e26e3aa..73a6700359 100755 --- a/scripts/gate-check-commit.sh +++ b/scripts/gate-check-commit.sh @@ -53,7 +53,7 @@ export ACTION=${2:-"deploy"} # Set the source branch for upgrade tests # Be sure to change this whenever a new stable branch # is created. The checkout must always be N-1. -export UPGRADE_SOURCE_BRANCH=${UPGRADE_SOURCE_BRANCH:-'stable/pike'} +export UPGRADE_SOURCE_BRANCH=${UPGRADE_SOURCE_BRANCH:-'stable/queens'} ## Change branch for Upgrades ------------------------------------------------ # If the action is to upgrade, then store the current SHA, diff --git a/tests/tests-repo-clone.sh b/tests/tests-repo-clone.sh index 3e4ffd66de..5ad509c5bb 100755 --- a/tests/tests-repo-clone.sh +++ b/tests/tests-repo-clone.sh @@ -110,7 +110,7 @@ fi # tests repo are not supported. if [[ "${CLONE_UPGRADE_TESTS}" == "yes" ]]; then if [[ ! -d "${WORKING_DIR}/tests/common/previous" ]]; then - git clone -b stable/pike \ + git clone -b stable/queens \ https://git.openstack.org/openstack/openstack-ansible-tests \ ${WORKING_DIR}/tests/common/previous fi