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)

diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile
index 2f729c6..0c0b561 100644 (file)
--- 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 2092fb4..d9aa94c 100644 (file)
--- 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