diff options
| author |   Jose Lausuch <jose.lausuch@ericsson.com> | 2017-06-21 08:38:05 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-06-21 08:38:05 +0000 |
| commit | 333179c16b724465f655de27c3c4dc0af44419f2 (patch) | |
| tree | cbe347dd9d42ce1228dd02b51b8e6d6fca1fe6cb /docker | |
| parent | 51899de7927bbf6be76639508ae2970046add625 (diff) | |
| parent | 739a151179af2fd69c8bca107f917811a4a3f6b4 (diff) | |
Merge "Change barometer module to load"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile | 5 | ||||
| -rw-r--r-- | docker/Dockerfile.aarch64 | 5 | ||||
| -rw-r--r-- | docker/thirdparty-requirements.txt | 1 |
3 files changed, 7 insertions, 4 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index d18c6c97d..80864ed9c 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -79,11 +79,12 @@ RUN mkdir -p ${FUNCTEST_REPO_DIR} \ RUN git config --global http.sslVerify false +COPY thirdparty-requirements.txt thirdparty-requirements.txt RUN pip install \ 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/barometer@$BRANCH#egg=baro_tests \ - git+https://gerrit.opnfv.org/gerrit/snaps@$BRANCH#egg=snaps + git+https://gerrit.opnfv.org/gerrit/snaps@$BRANCH#egg=snaps \ + -r thirdparty-requirements.txt # Hook required by hardcoded paths in Functest RUN ln -s /usr/local/lib/python2.7/dist-packages/functest ${FUNCTEST_REPO_DIR}/functest diff --git a/docker/Dockerfile.aarch64 b/docker/Dockerfile.aarch64 index eea475a8f..4fbfeac44 100644 --- a/docker/Dockerfile.aarch64 +++ b/docker/Dockerfile.aarch64 @@ -78,11 +78,12 @@ RUN mkdir -p ${FUNCTEST_REPO_DIR} \ RUN git config --global http.sslVerify false +COPY thirdparty-requirements.txt thirdparty-requirements.txt RUN pip install \ 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/barometer@$BRANCH#egg=baro_tests \ - git+https://gerrit.opnfv.org/gerrit/snaps@$BRANCH#egg=snaps + git+https://gerrit.opnfv.org/gerrit/snaps@$BRANCH#egg=snaps \ + -r thirdparty-requirements.txt # Hook required by hardcoded paths in Functest RUN ln -s /usr/local/lib/python2.7/dist-packages/functest ${FUNCTEST_REPO_DIR}/functest diff --git a/docker/thirdparty-requirements.txt b/docker/thirdparty-requirements.txt new file mode 100644 index 000000000..51d21f2df --- /dev/null +++ b/docker/thirdparty-requirements.txt @@ -0,0 +1 @@ +git+https://gerrit.opnfv.org/gerrit/barometer#egg=baro_tests |