aboutsummaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorJose Lausuch <jose.lausuch@ericsson.com>2017-06-13 11:26:52 +0800
committerCédric Ollivier <cedric.ollivier@orange.com>2017-06-20 16:02:51 +0200
commit739a151179af2fd69c8bca107f917811a4a3f6b4 (patch)
tree38c3ed716905ca30c863ee987b012d34e0f25da8 /docker
parent997a42438f2253aa9fe640c1cbdd8ea461901948 (diff)
Change barometer module to load
As [1] is merged, the way to call the barometer test case is different as it is hosted in Barometer repo instead of Functest. The former files are also simply removed too. baro-tests is no longer a requirement. It is installed as any third party project. [1] https://gerrit.opnfv.org/gerrit/#/c/35927/ Co-Authored-By: Cédric Ollivier <cedric.ollivier@orange.com> Change-Id: Iea56b48fa781600eb3a6ac74662ea8a29f556f99 Signed-off-by: Jose Lausuch <jose.lausuch@ericsson.com> Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'docker')
-rw-r--r--docker/Dockerfile5
-rw-r--r--docker/Dockerfile.aarch645
-rw-r--r--docker/thirdparty-requirements.txt1
3 files changed, 7 insertions, 4 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index d18c6c97..80864ed9 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 eea475a8..4fbfeac4 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 00000000..51d21f2d
--- /dev/null
+++ b/docker/thirdparty-requirements.txt
@@ -0,0 +1 @@
+git+https://gerrit.opnfv.org/gerrit/barometer#egg=baro_tests