aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2020-10-04 15:30:54 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2020-10-04 15:40:32 +0200
commit09cfe358894d888b8ca2f512805d9d7c1d44177a (patch)
tree4f7cfdf7b72e6994064cb324ec3c96c60b4fe708
parent4a7792033f637124604839dc788a9e50ef7c6b7e (diff)
Set Rally and Tempest plugin versions
Change-Id: I26016de521694971327d85919ae2f5b0498f9192 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
-rw-r--r--docker/benchmarking/Dockerfile4
-rw-r--r--docker/core/Dockerfile2
-rw-r--r--docker/healthcheck/Dockerfile2
-rw-r--r--docker/smoke/Dockerfile28
-rw-r--r--upper-constraints.txt8
5 files changed, 22 insertions, 22 deletions
diff --git a/docker/benchmarking/Dockerfile b/docker/benchmarking/Dockerfile
index 401cea020..94669a709 100644
--- a/docker/benchmarking/Dockerfile
+++ b/docker/benchmarking/Dockerfile
@@ -1,7 +1,7 @@
FROM opnfv/functest-core:leguer
-ARG VMTP_TAG=master
-ARG NEUTRON_TAG=master
+ARG VMTP_TAG=34a82c9f3598ec7f5d8de0a6d5139b92931db4cc
+ARG NEUTRON_TAG=stable/victoria
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 80be9ee3d..2605897d1 100644
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -1,6 +1,6 @@
FROM alpine:3.12
-ARG BRANCH=master
+ARG BRANCH=stable/leguer
ARG OPENSTACK_TAG=master
COPY Switch-to-threading.Thread-for-Rally-tasks.patch /tmp/Switch-to-threading.Thread-for-Rally-tasks.patch
diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile
index f146d530f..6bd74f001 100644
--- a/docker/healthcheck/Dockerfile
+++ b/docker/healthcheck/Dockerfile
@@ -1,7 +1,7 @@
FROM opnfv/functest-core:leguer
ARG ODL_TAG=89b88a0a23561f0bda62338b394ec41655679b2d
-ARG TEMPEST_HORIZON_TAG=master
+ARG TEMPEST_HORIZON_TAG=1.1.0
COPY thirdparty-requirements.txt thirdparty-requirements.txt
RUN apk --no-cache add --virtual .build-deps --update \
diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile
index 294fa9b6a..931994c47 100644
--- a/docker/smoke/Dockerfile
+++ b/docker/smoke/Dockerfile
@@ -1,19 +1,19 @@
FROM opnfv/functest-core:leguer
-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.10.0
+ARG NEUTRON_TEMPEST_TAG=1.2.0
+ARG CINDER_TEMPEST_TAG=1.1.0
+ARG KEYSTONE_TEMPEST_TAG=0.5.0
+ARG NEUTRON_TAG=stable/victoria
+ARG GLANCE_TAG=stable/victoria
+ARG NOVA_TAG=stable/victoria
+ARG KEYSTONE_TAG=stable/victoria
+ARG CINDER_TAG=stable/victoria
+ARG BARBICAN_TAG=1.1.0
+ARG OCTAVIA_TAG=1.5.0
+ARG HEAT_TEMPEST_TAG=1.1.0
+ARG TELEMETRY_TEMPEST_TAG=1.1.0
+ARG CYBORG_TEMPEST_TAG=1.1.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 420d93ba0..52689c039 100644
--- a/upper-constraints.txt
+++ b/upper-constraints.txt
@@ -19,10 +19,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@25.0.0#egg=tempest
+-e git+https://opendev.org/openstack/rally.git@3.1.0#egg=rally
+git+https://opendev.org/openstack/rally-openstack.git@2.0.0#egg=rally-openstack
+git+https://github.com/xrally/xrally-kubernetes.git@e4c605fa0ae0cae63ce5ac19ce8516f0bdd5e868#egg=xrally-kubernetes
pylint===1.9.5;python_version=='2.7'
pylint===2.4.4;python_version=='3.8'
flake8===3.7.9