Change settings for stable/zed

Change-Id: If6ae91bea5594195d8c8dc7fe2a2500ec96d71d4

9 files changed, 22 insertions, 23 deletions

diff --git a/bindep.txt b/bindep.txt
index fd3425bb..6c244790 100644
--- a/bindep.txt
+++ b/bindep.txt
@@ -19,12 +19,10 @@ postgresql
 postgresql-client [platform:dpkg]
 postgresql-devel [platform:rpm test]
 postgresql-server [platform:rpm]
-python-dev [platform:dpkg test]
-python-devel [platform:rpm test]
-python3-all [platform:dpkg !platform:ubuntu-precise]
-python3-all-dev [platform:dpkg !platform:ubuntu-precise]
-python3-devel [platform:fedora]
-python34-devel [platform:centos]
+python3-all [platform:dpkg]
+python3-all-dev [platform:dpkg]
+python3 [platform:rpm test]
+python3-devel [platform:rpm test]
 sqlite-devel [platform:rpm test]
 libpcre3-dev [platform:dpkg test]
 pcre-devel [platform:rpm test]
diff --git a/devstack/settings b/devstack/settings
index 7395a463..623fa653 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -4,19 +4,19 @@
 # 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/zed}
 
 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}}
-TROVE_CLIENT_BRANCH=${TROVE_CLIENT_BRANCH:-${TROVECLIENT_BRANCH:-master}}
+TROVE_CLIENT_BRANCH=${TROVE_CLIENT_BRANCH:-${TROVECLIENT_BRANCH:-stable/zed}}
 
 TROVE_DASHBOARD_DIR=${TROVE_DASHBOARD_DIR:-${DEST}/trove-dashboard}
 TROVE_DASHBOARD_REPO=${TROVE_DASHBOARD_REPO:-${GIT_BASE}/openstack/trove-dashboard.git}
-TROVE_DASHBOARD_BRANCH=${TROVE_DASHBOARD_BRANCH:-master}
+TROVE_DASHBOARD_BRANCH=${TROVE_DASHBOARD_BRANCH:-stable/zed}
 
 TRIPLEO_IMAGES_DIR=${TRIPLEO_IMAGES_DIR:-${DEST}/tripleo-image-elements}
 TRIPLEO_IMAGES_REPO=${TRIPLEO_IMAGES_REPO:-${GIT_BASE}/openstack/tripleo-image-elements.git}
-TRIPLEO_IMAGES_BRANCH=${TRIPLEO_IMAGES_BRANCH:-master}
+TRIPLEO_IMAGES_BRANCH=${TRIPLEO_IMAGES_BRANCH:-stable/zed}
 
 # Set up configuration directory and files
 TROVE_CONF_DIR=${TROVE_CONF_DIR:-/etc/trove}
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 9860bac6..67508d94 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/zed
+upper-constraints file /opt/upper-constraints.txt https://releases.openstack.org/constraints/upper/zed
diff --git a/integration/scripts/trovestack b/integration/scripts/trovestack
index 886581ec..92a921f5 100755
--- a/integration/scripts/trovestack
+++ b/integration/scripts/trovestack
@@ -724,7 +724,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/zed#egg=python-troveclient
 }
 
 # Build trove guest image
diff --git a/integration/scripts/trovestack.rc b/integration/scripts/trovestack.rc
index eaf74550..15e79654 100644
--- a/integration/scripts/trovestack.rc
+++ b/integration/scripts/trovestack.rc
@@ -59,13 +59,13 @@ 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/zed}
 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}}
+TROVE_CLIENT_BRANCH=${TROVE_CLIENT_BRANCH:-${TROVECLIENT_BRANCH:-stable/zed}}
 TROVE_DASHBOARD_REPO=${TROVE_DASHBOARD_REPO:-${TROVEDASHBOARD_REPO:-${GIT_OPENSTACK}/trove-dashboard.git}}
 TROVE_DASHBOARD_DIR=${TROVE_DASHBOARD_DIR:-${TROVEDASHBOARD_DIR:-${PATH_TROVE_DASHBOARD}}}
-TROVE_DASHBOARD_BRANCH=${TROVE_DASHBOARD_BRANCH:-${TROVEDASHBOARD_BRANCH:-master}}
+TROVE_DASHBOARD_BRANCH=${TROVE_DASHBOARD_BRANCH:-${TROVEDASHBOARD_BRANCH:-stable/zed}}
 # Trove specific networking options
 TROVE_PRIVATE_NETWORK_NAME=private
 TROVE_PRIVATE_SUBNET_NAME=private-subnet
diff --git a/trove/common/cfg.py b/trove/common/cfg.py
index 54dc4961..c2c955c5 100644
--- a/trove/common/cfg.py
+++ b/trove/common/cfg.py
@@ -1454,7 +1454,7 @@ rpcapi_cap_opts = [
         'taskmanager', default='latest',
         help='Set a version cap for messages sent to taskmanager services'),
     cfg.StrOpt(
-        'guestagent', default='latest',
+        'guestagent', default='zed',
         help='Set a version cap for messages sent to guestagent services'),
     cfg.StrOpt(
         'conductor', default='latest',
diff --git a/trove/guestagent/api.py b/trove/guestagent/api.py
index fc146100..a0f6513a 100644
--- a/trove/guestagent/api.py
+++ b/trove/guestagent/api.py
@@ -60,6 +60,7 @@ class API(object):
         'newton': '1.0',
         'ussuri': '1.0',
         'victoria': '1.1',
+        'zed': '1.1',
 
         'latest': API_LATEST_VERSION
     }
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 845eb7a7..ab86cf7d 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -426,7 +426,7 @@
       guest_os: ubuntu
       guest_os_release: focal
       guest_username: ubuntu
-      branch: master
+      branch: zed
       dev_mode: false
       image_suffix: ""
 
@@ -446,7 +446,7 @@
       guest_os: ubuntu
       guest_os_release: focal
       guest_username: ubuntu
-      branch: master
+      branch: zed
       dev_mode: false
       image_suffix: ""
 
@@ -460,7 +460,7 @@
       guest_os: ubuntu
       guest_os_release: focal
       guest_username: ubuntu
-      branch: master
+      branch: zed
       dev_mode: false
       image_suffix: ""
 
@@ -474,6 +474,6 @@
       guest_os: ubuntu
       guest_os_release: focal
       guest_username: ubuntu
-      branch: master
+      branch: zed
       dev_mode: true
       image_suffix: "-dev"
diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index 32e5aa1e..6a3bffb2 100644
--- a/zuul.d/projects.yaml
+++ b/zuul.d/projects.yaml
@@ -1,5 +1,6 @@
-
+---
 - project:
+    queue: trove
     templates:
       - check-requirements
       - openstack-cover-jobs
@@ -27,7 +28,6 @@
         - trove-functional-mysql:
             voting: false
     gate:
-      queue: trove
       jobs:
         - trove-tempest:
             voting: false