Update tags and branches to Xena

Change-Id: I14b36aee77848067aa45a2bfdba5fa224c230980
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

diff --git a/docker/benchmarking/Dockerfile b/docker/benchmarking/Dockerfile
index 3b240ad..eabf35f 100644 (file)
--- a/docker/benchmarking/Dockerfile
+++ b/docker/benchmarking/Dockerfile
@@ -1,7 +1,7 @@
 FROM opnfv/functest-core:xena
 
 ARG VMTP_TAG=34a82c9f3598ec7f5d8de0a6d5139b92931db4cc
-ARG NEUTRON_TAG=master
+ARG NEUTRON_TAG=stable/xena
 
 RUN apk --no-cache add --update libxml2 libxslt && \
     apk --no-cache add --virtual .build-deps --update \

diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index d955920..53794d0 100644 (file)
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -1,7 +1,7 @@
 FROM alpine:3.14
 
-ARG BRANCH=master
-ARG OPENSTACK_TAG=master
+ARG BRANCH=stable/xena
+ARG OPENSTACK_TAG=stable/xena
 
 COPY Switch-to-threading.Thread-for-Rally-tasks.patch /tmp/Switch-to-threading.Thread-for-Rally-tasks.patch
 COPY Create-new-server-in-test_create_backup.patch /tmp/Create-new-server-in-test_create_backup.patch

diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile
index 1fc5c98..f79b10e 100644 (file)
--- a/docker/smoke/Dockerfile
+++ b/docker/smoke/Dockerfile
@@ -1,19 +1,19 @@
 FROM opnfv/functest-core:xena
 
-ARG PATROLE_TAG=master
-ARG NEUTRON_TEMPEST_TAG=master
-ARG CINDER_TEMPEST_TAG=master
-ARG KEYSTONE_TEMPEST_TAG=master
-ARG NEUTRON_TAG=master
-ARG GLANCE_TAG=master
-ARG NOVA_TAG=master
-ARG KEYSTONE_TAG=master
-ARG CINDER_TAG=master
-ARG BARBICAN_TAG=master
-ARG OCTAVIA_TAG=master
-ARG HEAT_TEMPEST_TAG=master
-ARG TELEMETRY_TEMPEST_TAG=master
-ARG CYBORG_TEMPEST_TAG=master
+ARG PATROLE_TAG=0.13.0
+ARG NEUTRON_TEMPEST_TAG=1.7.0
+ARG CINDER_TEMPEST_TAG=1.5.0
+ARG KEYSTONE_TEMPEST_TAG=0.8.0
+ARG NEUTRON_TAG=stable/xena
+ARG GLANCE_TAG=stable/xena
+ARG NOVA_TAG=stable/xena
+ARG KEYSTONE_TAG=stable/xena
+ARG CINDER_TAG=stable/xena
+ARG BARBICAN_TAG=1.5.0
+ARG OCTAVIA_TAG=1.8.1
+ARG HEAT_TEMPEST_TAG=1.4.0
+ARG TELEMETRY_TEMPEST_TAG=1.5.0
+ARG CYBORG_TEMPEST_TAG=1.3.0
 
 RUN apk --no-cache add --update libxml2 libxslt && \
     apk --no-cache add --virtual .build-deps --update \

diff --git a/upper-constraints.txt b/upper-constraints.txt
index f95b966..0e09ac9 100644 (file)
--- a/upper-constraints.txt
+++ b/upper-constraints.txt
@@ -9,10 +9,10 @@ xtesting===0.91.0
 git+https://github.com/PyCQA/bandit@3d0824676974e7e2e9635c10bc4f12e261f1dbdf#egg=bandit
 bandit===1.1.0
 ruamel.yaml.jinja2==0.2.2
--e git+https://opendev.org/openstack/tempest#egg=tempest
--e git+https://opendev.org/openstack/rally.git#egg=rally
-git+https://opendev.org/openstack/rally-openstack.git#egg=rally-openstack
-git+https://github.com/xrally/xrally-kubernetes.git#egg=xrally-kubernetes
+-e git+https://opendev.org/openstack/tempest@29.0.0#egg=tempest
+-e git+https://opendev.org/openstack/rally.git@3.3.0#egg=rally
+git+https://opendev.org/openstack/rally-openstack.git@2.1.0#egg=rally-openstack
+git+https://github.com/xrally/xrally-kubernetes.git@2ffa85af2bff3438b6b23034b6ec6ee1de481090#egg=xrally-kubernetes
 pylint===2.9.6
 flake8===3.7.9
 nose===1.3.7