From 6c5994705d65d15ef9b4c5b20566b896e710bae3 Mon Sep 17 00:00:00 2001
From: =?utf8?q?C=C3=A9dric=20Ollivier?= <cedric.ollivier@orange.com>
Date: Fri, 13 Apr 2018 10:37:29 +0200
Subject: [PATCH] Switch to stestr
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit
It also updates rally and installs rally-openstack.
It completes the update to OpenStack Queens.
Change-Id: Iabf436ac6e7facfa21a3d7c8a3dfaffa9142da98
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---
docker/components/Dockerfile | 6 +++---
docker/features/Dockerfile | 6 +++---
docker/parser/Dockerfile | 2 --
docker/smoke/Dockerfile | 6 +++---
functest/opnfv_tests/openstack/tempest/tempest.py | 2 +-
functest/tests/unit/openstack/tempest/test_tempest.py | 2 +-
upper-constraints.txt | 1 +
7 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/docker/components/Dockerfile b/docker/components/Dockerfile
index 71a81541e..356c5d594 100644
--- a/docker/components/Dockerfile
+++ b/docker/components/Dockerfile
@@ -2,8 +2,8 @@ FROM opnfv/functest-core
ARG BRANCH=master
ARG OPENSTACK_TAG=stable/queens
-ARG RALLY_TAG=stable/0.10
-ARG OS_FAULTS_TAG=0.1.16
+ARG RALLY_TAG=0.11.2
+ARG OS_FAULTS_TAG=0.1.17
RUN apk --no-cache add --virtual .build-deps --update \
python-dev build-base linux-headers libffi-dev \
@@ -20,7 +20,7 @@ RUN apk --no-cache add --virtual .build-deps --update \
update-requirements -s --source /src/openstack-requirements /src/rally/ && \
pip install --no-cache-dir --src /src -cupper-constraints.txt \
-chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
- tempest /src/os-faults && \
+ tempest rally-openstack /src/os-faults && \
pip install --no-cache-dir --src /src -cupper-constraints.txt \
-chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
/src/rally && \
diff --git a/docker/features/Dockerfile b/docker/features/Dockerfile
index c53099cce..68469382b 100644
--- a/docker/features/Dockerfile
+++ b/docker/features/Dockerfile
@@ -3,8 +3,8 @@ FROM opnfv/functest-core
ARG BRANCH=master
ARG OPENSTACK_TAG=stable/queens
ARG FDS_TAG=master
-ARG RALLY_TAG=stable/0.10
-ARG OS_FAULTS_TAG=0.1.16
+ARG RALLY_TAG=0.11.2
+ARG OS_FAULTS_TAG=0.1.17
COPY thirdparty-requirements.txt thirdparty-requirements.txt
RUN apk --no-cache add --update python3 sshpass && \
@@ -26,7 +26,7 @@ RUN apk --no-cache add --update python3 sshpass && \
update-requirements -s --source /src/openstack-requirements /src/rally/ && \
pip install --no-cache-dir --src /src -cupper-constraints.txt \
-chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
- tempest /src/os-faults && \
+ tempest rally-openstack /src/os-faults && \
pip install --no-cache-dir --src /src -cupper-constraints.txt \
-chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
/src/rally -rthirdparty-requirements.txt && \
diff --git a/docker/parser/Dockerfile b/docker/parser/Dockerfile
index a86716626..fe21bb54c 100644
--- a/docker/parser/Dockerfile
+++ b/docker/parser/Dockerfile
@@ -2,8 +2,6 @@ FROM opnfv/functest-core
ARG BRANCH=master
ARG OPENSTACK_TAG=stable/queens
-ARG RALLY_TAG=stable/0.10
-ARG OS_FAULTS_TAG=0.1.16
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 7eb9eb292..252f10172 100644
--- a/docker/smoke/Dockerfile
+++ b/docker/smoke/Dockerfile
@@ -3,8 +3,8 @@ FROM opnfv/functest-core
ARG BRANCH=master
ARG OPENSTACK_TAG=stable/queens
ARG ODL_TAG=85448c9d97b89989488e675b29b38ac42d8674e4
-ARG RALLY_TAG=stable/0.10
-ARG OS_FAULTS_TAG=0.1.16
+ARG RALLY_TAG=0.11.2
+ARG OS_FAULTS_TAG=0.1.17
ARG REFSTACK_TARGET=2017.09
ARG PATROLE_TAG=0.2.0
@@ -27,7 +27,7 @@ RUN apk --no-cache add --virtual .build-deps --update \
update-requirements -s --source /src/openstack-requirements /src/patrole/ && \
pip install --no-cache-dir --src /src -cupper-constraints.txt \
-chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
- tempest /src/os-faults && \
+ tempest rally-openstack /src/os-faults && \
pip install --no-cache-dir --src /src -cupper-constraints.txt \
-chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
/src/rally /src/patrole -rthirdparty-requirements.txt && \
diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py
index 74ddbd981..4660439d9 100644
--- a/functest/opnfv_tests/openstack/tempest/tempest.py
+++ b/functest/opnfv_tests/openstack/tempest/tempest.py
@@ -114,7 +114,7 @@ class TempestCommon(testcase.TestCase):
testr_mode = r"'^tempest\.'"
else:
testr_mode = self.mode
- cmd = "(cd {0}; testr list-tests {1} >{2} 2>/dev/null)".format(
+ cmd = "(cd {0}; stestr list {1} >{2} 2>/dev/null)".format(
self.verifier_repo_dir, testr_mode, self.list)
output = subprocess.check_output(cmd, shell=True)
LOGGER.info("%s\n%s", cmd, output)
diff --git a/functest/tests/unit/openstack/tempest/test_tempest.py b/functest/tests/unit/openstack/tempest/test_tempest.py
index e2c4c975b..5328b0650 100644
--- a/functest/tests/unit/openstack/tempest/test_tempest.py
+++ b/functest/tests/unit/openstack/tempest/test_tempest.py
@@ -82,7 +82,7 @@ class OSTempestTesting(unittest.TestCase):
else:
testr_mode = self.tempestcommon.mode
verifier_repo_dir = 'test_verifier_repo_dir'
- cmd = "(cd {0}; testr list-tests {1} >{2} 2>/dev/null)".format(
+ cmd = "(cd {0}; stestr list {1} >{2} 2>/dev/null)".format(
verifier_repo_dir, testr_mode, self.tempestcommon.list)
self.tempestcommon.generate_test_list()
mock_exec.assert_called_once_with(cmd, shell=True)
diff --git a/upper-constraints.txt b/upper-constraints.txt
index 48a4e22f5..e2b7ee702 100644
--- a/upper-constraints.txt
+++ b/upper-constraints.txt
@@ -22,3 +22,4 @@ flasgger===0.6.6
xtesting===0.40.0
networking-bgpvpn===8.0.0
sphinx-opnfv-theme===0.1.1
+rally-openstack===1.0.0
--
2.16.6