diff options
| author |   Morgan Richomme <morgan.richomme@orange.com> | 2017-09-08 09:27:06 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-09-08 09:27:06 +0000 |
| commit | 90f7a7de0d911c6c8cc472add5f7cde163bf148e (patch) | |
| tree | 986ec80a37daa3010ec6def2bcc562844208be63 /docker | |
| parent | 3241868d79a4b9f951e920bcfcdbd877c1235cb5 (diff) | |
| parent | 0b1d19224daf2278869b973990b5508280a3812b (diff) | |
Merge "Use git commit id for refstack-client"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/smoke/Dockerfile | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 072ea1da9..6e5161c34 100644 --- 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 3e73d195b..abf1714b4 100644 --- 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 \ |