diff options
| author |   Jose Lausuch <jose.lausuch@ericsson.com> | 2017-06-26 09:15:40 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-06-26 09:15:40 +0000 |
| commit | e6ba4064cee974284a9ae623ba9de9a40877c59d (patch) | |
| tree | b41ab15d4a388ee591223146dc31118a246f7933 /docker | |
| parent | 48db3a575a737f957706f58ebdfc1851c3226b63 (diff) | |
| parent | a2c7b1e88d3bf600e3fe015b2d42cc4dcfa595de (diff) | |
Merge "Take OpenStack's constraints into account"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile | 5 | ||||
| -rw-r--r-- | docker/Dockerfile.aarch64 | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 029ab077..4c03a697 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -29,6 +29,7 @@ ARG FUNCTEST_RESULTS_DIR=${FUNCTEST_BASE_DIR}/results ARG FUNCTEST_REPO_DIR=${REPOS_DIR}/functest ARG FUNCTEST_TEST_DIR=${FUNCTEST_REPO_DIR}/functest/opnfv_tests ARG REPOS_VNFS_DIR=${REPOS_DIR}/vnfs +ARG PIP_OPTS=-chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?stable/ocata # Environment variables ENV HOME /home/opnfv @@ -77,7 +78,7 @@ RUN mkdir -p ${FUNCTEST_REPO_DIR} \ RUN git config --global http.sslVerify false COPY thirdparty-requirements.txt thirdparty-requirements.txt -RUN pip install \ +RUN pip install ${PIP_OPTS} \ git+https://gerrit.opnfv.org/gerrit/functest@$BRANCH#egg=functest \ git+https://gerrit.opnfv.org/gerrit/releng@$BRANCH#egg=opnfv\&subdirectory=modules \ git+https://gerrit.opnfv.org/gerrit/snaps@$BRANCH#egg=snaps \ @@ -132,7 +133,7 @@ RUN curl -L https://get.rvm.io | bash -s stable # SFC integration RUN /bin/bash -c ". ${REPOS_DIR}/sfc/sfc/tests/functest/setup_scripts/tacker_client_install.sh" -RUN cd ${REPOS_DIR}/sfc && pip install -e . +RUN cd ${REPOS_DIR}/sfc && pip install ${PIP_OPTS} -e . # refstack-client integration RUN wget -q https://raw.githubusercontent.com/openstack/refstack-client/master/setup_env \ diff --git a/docker/Dockerfile.aarch64 b/docker/Dockerfile.aarch64 index 084f9350..1d47aa42 100644 --- a/docker/Dockerfile.aarch64 +++ b/docker/Dockerfile.aarch64 @@ -28,6 +28,7 @@ ARG FUNCTEST_RESULTS_DIR=${FUNCTEST_BASE_DIR}/results ARG FUNCTEST_REPO_DIR=${REPOS_DIR}/functest ARG FUNCTEST_TEST_DIR=${FUNCTEST_REPO_DIR}/functest/opnfv_tests ARG REPOS_VNFS_DIR=${REPOS_DIR}/vnfs +ARG PIP_OPTS=-chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?stable/ocata # Environment variables ENV HOME /home/opnfv @@ -76,7 +77,7 @@ RUN mkdir -p ${FUNCTEST_REPO_DIR} \ RUN git config --global http.sslVerify false COPY thirdparty-requirements.txt thirdparty-requirements.txt -RUN pip install \ +RUN pip install ${PIP_OPTS} \ git+https://gerrit.opnfv.org/gerrit/functest@$BRANCH#egg=functest \ git+https://gerrit.opnfv.org/gerrit/releng@$BRANCH#egg=opnfv\&subdirectory=modules \ git+https://gerrit.opnfv.org/gerrit/snaps@$BRANCH#egg=snaps \ @@ -124,7 +125,7 @@ RUN curl -L https://get.rvm.io | bash -s stable # SFC integration RUN /bin/bash -c ". ${REPOS_DIR}/sfc/sfc/tests/functest/setup_scripts/tacker_client_install.sh" -RUN cd ${REPOS_DIR}/sfc && pip install -e . +RUN cd ${REPOS_DIR}/sfc && pip install ${PIP_OPTS} -e . # refstack-client integration RUN wget -q https://raw.githubusercontent.com/openstack/refstack-client/master/setup_env \ |