aboutsummaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorCedric Ollivier <cedric.ollivier@orange.com>2017-09-13 14:02:19 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-09-13 14:02:19 +0000
commit3e2c8edac0af2523bc941e2c7d7c55b040c4aeed (patch)
treee2fd75074fcc947221904e03a467c7730197f4d1 /docker
parent116068e0f781d14507de05268ae5e232bc558f24 (diff)
parentb05c2f9b12d360b751792946e91a3e00e7782279 (diff)
Merge "Remove thirdparty-requirements.txt in smoke"
Diffstat (limited to 'docker')
-rw-r--r--docker/restapi/hooks/post_checkout6
-rw-r--r--docker/smoke/Dockerfile8
-rw-r--r--docker/smoke/thirdparty-requirements.txt1
3 files changed, 7 insertions, 8 deletions
diff --git a/docker/restapi/hooks/post_checkout b/docker/restapi/hooks/post_checkout
new file mode 100644
index 000000000..20a6d4b95
--- /dev/null
+++ b/docker/restapi/hooks/post_checkout
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+from="${DOCKER_REPO%/*}/functest-core"
+sed -i "s|^FROM.*$|FROM ${from}|" Dockerfile
+
+exit $?
diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile
index abf1714b4..fe2f91917 100644
--- a/docker/smoke/Dockerfile
+++ b/docker/smoke/Dockerfile
@@ -6,7 +6,6 @@ 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 && \
@@ -17,17 +16,12 @@ RUN apk --no-cache add --virtual .build-deps --update \
-chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG \
-chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
-e/src/refstack-client && \
- pip install --no-cache-dir --src /src \
- -chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG \
- -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
- -rthirdparty-requirements.txt && \
git clone --depth 1 https://git.opendaylight.org/gerrit/p/integration/test.git /src/odl_test && \
(cd src/odl_test && git checkout -b $ODL_TAG) && \
git clone --depth 1 -b $FDS_TAG https://gerrit.opnfv.org/gerrit/fds /src/fds && \
ln -s /src/tempest /src/refstack-client/.tempest && \
virtualenv --system-site-packages /src/tempest/.venv && \
- rm -r thirdparty-requirements.txt /src/refstack-client/.git /src/odl_test/.git \
- /src/fds/.git && \
+ rm -r /src/refstack-client/.git /src/odl_test/.git /src/fds/.git && \
apk del .build-deps
COPY testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml
CMD ["bash","-c","prepare_env start && run_tests -t all"]
diff --git a/docker/smoke/thirdparty-requirements.txt b/docker/smoke/thirdparty-requirements.txt
deleted file mode 100644
index b298601b7..000000000
--- a/docker/smoke/thirdparty-requirements.txt
+++ /dev/null
@@ -1 +0,0 @@
-refstack-client