summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2018-12-16 09:32:41 +0100
committerCédric Ollivier <cedric.ollivier@orange.com>2018-12-16 18:10:21 +0100
commite0b8365a0d2a14324e3b582e6afe36e429e73080 (patch)
treef37fd68bfe6603f2b566373d8f5ea1968d63335b
parentb21dede23cb7577497fb7adf2775a77c45a37e36 (diff)
Fix NEUTRON_RALLY_TAG in smoke
It also fixes rally task name in config. Change-Id: I4f6fbbef814a5b45aeb3b6152878421fc6e998bc Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 58df8ab5544a5bfff43dc6c4a2546194299a7734)
-rw-r--r--docker/smoke/Dockerfile2
-rw-r--r--functest/opnfv_tests/openstack/rally/rally_jobs.yaml2
2 files changed, 2 insertions, 2 deletions
diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile
index 2f729c646..0c0b56160 100644
--- a/docker/smoke/Dockerfile
+++ b/docker/smoke/Dockerfile
@@ -6,7 +6,7 @@ ARG REFSTACK_TARGET=2018.02
ARG PATROLE_TAG=0.3.0
ARG NEUTRON_TAG=0.2.0
ARG BARBICAN_TAG=0.1.0
-ARG NEUTRON_RALLY_TAG=master
+ARG NEUTRON_RALLY_TAG=$OPENSTACK_TAG
RUN apk --no-cache add --virtual .build-deps --update \
python-dev build-base linux-headers libffi-dev \
diff --git a/functest/opnfv_tests/openstack/rally/rally_jobs.yaml b/functest/opnfv_tests/openstack/rally/rally_jobs.yaml
index 2092fb4cf..d9aa94c51 100644
--- a/functest/opnfv_tests/openstack/rally/rally_jobs.yaml
+++ b/functest/opnfv_tests/openstack/rally/rally_jobs.yaml
@@ -1,3 +1,3 @@
---
neutron:
- task: task-neutron.yaml
+ task: neutron-neutron.yaml