commit dfb534c1f2f2f9bcec30a2b056195e0ba067a63d
Author: Lingxian Kong <anlin.kong@gmail.com>
Date:   Tue Oct 20 02:53:55 2020 +1300

    Use victoria branch for CI and image build
    
    Change-Id: I8fb00ae6c0c2a400f78b97b9d0bfbf53ac297d5b

diff --git a/.zuul.yaml b/.zuul.yaml
index 9a31764..d5dbb1f 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -33,10 +33,10 @@
       jobs:
         - publish-trove-guest-image-ubuntu-bionic:
             branches:
-              - master
+              - stable/victoria
         - publish-trove-guest-image-ubuntu-bionic-dev:
             branches:
-              - master
+              - stable/victoria
 
 - job:
     name: trove-devstack-base
@@ -354,7 +354,7 @@
       guest_os: ubuntu
       guest_os_release: bionic
       guest_username: ubuntu
-      branch: master
+      branch: victoria
       dev_mode: false
       image_suffix: ""
 
@@ -368,6 +368,6 @@
       guest_os: ubuntu
       guest_os_release: bionic
       guest_username: ubuntu
-      branch: master
+      branch: victoria
       dev_mode: true
       image_suffix: "-dev"
diff --git a/devstack/settings b/devstack/settings
index 541d0f7..bb49155 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -4,7 +4,7 @@
 # Set up default directories
 TROVE_DIR=${TROVE_DIR:-${DEST}/trove}
 TROVE_REPO=${TROVE_REPO:-${GIT_BASE}/openstack/trove.git}
-TROVE_BRANCH=${TROVE_BRANCH:-master}
+TROVE_BRANCH=${TROVE_BRANCH:-stable/victoria}
 
 TROVE_CLIENT_DIR=${TROVE_CLIENT_DIR:-${TROVECLIENT_DIR:-${DEST}/python-troveclient}}
 TROVE_CLIENT_REPO=${TROVE_CLIENT_REPO:-${TROVECLIENT_REPO:-${GIT_BASE}/openstack/python-troveclient.git}}
diff --git a/integration/scripts/files/elements/guest-agent/source-repository-guest-agent b/integration/scripts/files/elements/guest-agent/source-repository-guest-agent
index 9860bac..51cc7a3 100644
--- a/integration/scripts/files/elements/guest-agent/source-repository-guest-agent
+++ b/integration/scripts/files/elements/guest-agent/source-repository-guest-agent
@@ -1,3 +1,3 @@
 # This is used for source-based builds
-guest-agent git /opt/guest-agent https://opendev.org/openstack/trove master
-upper-constraints file /opt/upper-constraints.txt https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt
+guest-agent git /opt/guest-agent https://opendev.org/openstack/trove stable/victoria
+upper-constraints file /opt/upper-constraints.txt https://releases.openstack.org/constraints/upper/victoria
diff --git a/integration/scripts/trovestack b/integration/scripts/trovestack
index 3f65f5d..ebde4f4 100755
--- a/integration/scripts/trovestack
+++ b/integration/scripts/trovestack
@@ -723,7 +723,7 @@ function cmd_test_init() {
 
     exclaim "Re-installing python-troveclient from git"
     pip3 uninstall -y python-troveclient
-    pip3 install -U git+https://opendev.org/openstack/python-troveclient@master#egg=python-troveclient
+    pip3 install -U git+https://opendev.org/openstack/python-troveclient@stable/victoria#egg=python-troveclient
 }
 
 # Build trove guest image
diff --git a/integration/scripts/trovestack.rc b/integration/scripts/trovestack.rc
index eaf7455..fe54626 100644
--- a/integration/scripts/trovestack.rc
+++ b/integration/scripts/trovestack.rc
@@ -59,7 +59,7 @@ GIT_OPENSTACK=${GIT_OPENSTACK:-${GIT_BASE}/openstack}
 DEVSTACK_REPO=${DEVSTACK_REPO:-${GIT_BASE}/openstack-dev/devstack.git}
 TROVE_REPO=${TROVE_REPO:-${GIT_OPENSTACK}/trove.git}
 TROVE_DIR=${TROVE_DIR:-${PATH_TROVE}}
-TROVE_BRANCH=${TROVE_BRANCH:-master}
+TROVE_BRANCH=${TROVE_BRANCH:-stable/victoria}
 TROVE_CLIENT_REPO=${TROVE_CLIENT_REPO:-${TROVECLIENT_REPO:-${GIT_OPENSTACK}/python-troveclient.git}}
 TROVE_CLIENT_DIR=${TROVE_CLIENT_DIR:-${TROVECLIENT_DIR:-${PATH_PYTHON_TROVECLIENT}}}
 TROVE_CLIENT_BRANCH=${TROVE_CLIENT_BRANCH:-${TROVECLIENT_BRANCH:-master}}