Use git commit id for refstack-client

Functest should be based on fixed versions of projects which are out
of OPNFV. It selects the last git commit as refstack-client hasn't
defined any tag or branch.

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

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 072ea1d..6e5161c 100644 (file)
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -17,6 +17,7 @@ ARG RALLY_TAG=stable/0.9
 ARG ODL_TAG=35e415b6873b39d72775c88a337e92dac26012e2
 ARG OPENSTACK_TAG=stable/ocata
 ARG VIMS_TAG=stable
+ARG REFSTACK_TAG=4e187b07672dd1c41cb7c94658f1c91edebf53a2
 ARG REPOS_DIR=/home/opnfv/repos
 ARG FUNCTEST_BASE_DIR=/home/opnfv/functest
 ARG FUNCTEST_CONF_DIR=${FUNCTEST_BASE_DIR}/conf
@@ -82,6 +83,7 @@ RUN wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/uppe
     git clone --depth 1 https://github.com/openstack/rally.git -b $RALLY_TAG /src/rally && \
     update-requirements -s --source /src/openstack-requirements /src/rally && \
     git clone --depth 1 https://github.com/openstack/refstack-client.git /src/refstack-client && \
+    (cd src/refstack-client && git checkout -b $REFSTACK_TAG) && \
     update-requirements -s --source /src/openstack-requirements /src/refstack-client && \
     pip install --src /src -cupper-constraints.txt \
         -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \

diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile
index 3e73d19..abf1714 100644 (file)
--- a/docker/smoke/Dockerfile
+++ b/docker/smoke/Dockerfile
@@ -4,12 +4,14 @@ ARG BRANCH=master
 ARG OPENSTACK_TAG=stable/ocata
 ARG ODL_TAG=35e415b6873b39d72775c88a337e92dac26012e2
 ARG FDS_TAG=master
+ARG REFSTACK_TAG=4e187b07672dd1c41cb7c94658f1c91edebf53a2
 
 COPY thirdparty-requirements.txt thirdparty-requirements.txt
 RUN apk --no-cache add --virtual .build-deps --update \
         python-dev build-base linux-headers libffi-dev \
         openssl-dev libjpeg-turbo-dev git && \
     git clone --depth 1 https://github.com/openstack/refstack-client.git /src/refstack-client && \
+    (cd src/refstack-client && git checkout -b $REFSTACK_TAG) && \
     update-requirements -s --source /src/openstack-requirements /src/refstack-client/ && \
     pip install --no-cache-dir --src /src \
         -chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG \