summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvalentin boucher <valentin.boucher@orange.com>2017-05-22 13:08:51 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-05-22 13:08:51 +0000
commit84bd5c62dd21300e96979217dee1e31d75c439ca (patch)
treebfa1d179f08aca9a5f74e846ed38203314bbf578
parentefbe74c4cc1b6b6982e9e13950319f690541d6a3 (diff)
parent3ca4ed03be7930a370e9fb895c24aac635811b3b (diff)
Merge "Install releng via requirements.txt"
-rw-r--r--docker/Dockerfile5
-rw-r--r--docker/Dockerfile.aarch645
-rw-r--r--requirements.txt1
-rwxr-xr-xrun_unit_tests.sh6
4 files changed, 1 insertions, 16 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 202eb5cb3..4a570b5dd 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -29,7 +29,6 @@ ARG FUNCTEST_IMAGES_DIR=${FUNCTEST_BASE_DIR}/images
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 RELENG_MODULE_DIR=${REPOS_DIR}/releng/modules
ARG REPOS_VNFS_DIR=${REPOS_DIR}/vnfs
# Environment variables
@@ -94,7 +93,6 @@ RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/barometer ${R
RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/sfc ${REPOS_DIR}/sfc
RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/snaps ${REPOS_DIR}/snaps
RUN git clone --depth 1 https://gerrit.opnfv.org/gerrit/securityscanning ${REPOS_DIR}/securityscanning
-RUN git clone --depth 1 https://gerrit.opnfv.org/gerrit/releng ${REPOS_DIR}/releng
RUN git clone --depth 1 https://gerrit.opnfv.org/gerrit/opera ${REPOS_DIR}/opera
# OpenStack repositories
@@ -117,9 +115,6 @@ RUN cd ${FUNCTEST_REPO_DIR} \
&& pip install -r requirements.txt \
&& pip install -e .
-RUN cd ${RELENG_MODULE_DIR} \
- && pip install -e .
-
RUN cd ${REPOS_DIR}/barometer \
&& pip install .
diff --git a/docker/Dockerfile.aarch64 b/docker/Dockerfile.aarch64
index b03c6d978..e323cb18a 100644
--- a/docker/Dockerfile.aarch64
+++ b/docker/Dockerfile.aarch64
@@ -28,7 +28,6 @@ ARG FUNCTEST_IMAGES_DIR=${FUNCTEST_BASE_DIR}/images
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 RELENG_MODULE_DIR=${REPOS_DIR}/releng/modules
ARG REPOS_VNFS_DIR=${REPOS_DIR}/vnfs
# Environment variables
@@ -90,7 +89,6 @@ RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/promise ${REP
RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/sfc ${REPOS_DIR}/sfc
RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/snaps ${REPOS_DIR}/snaps
RUN git clone --depth 1 https://gerrit.opnfv.org/gerrit/securityscanning ${REPOS_DIR}/securityscanning
-RUN git clone --depth 1 https://gerrit.opnfv.org/gerrit/releng ${REPOS_DIR}/releng
RUN git clone --depth 1 https://gerrit.opnfv.org/gerrit/opera ${REPOS_DIR}/opera
# OpenStack repositories
@@ -112,9 +110,6 @@ RUN cd ${FUNCTEST_REPO_DIR} \
&& pip install -r requirements.txt \
&& pip install -e .
-RUN cd ${RELENG_MODULE_DIR} \
- && pip install -e .
-
RUN find ${FUNCTEST_REPO_DIR} -name "*.py" \
-not -path "*tests/unit*" \
-not -path "*functest_venv*" \
diff --git a/requirements.txt b/requirements.txt
index 65b369799..7b8af6575 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -37,3 +37,4 @@ mock==1.3.0
iniparse==0.4
PrettyTable>=0.7.1,<0.8 # BSD
six>=1.9.0 # MIT
+git+https://gerrit.opnfv.org/gerrit/releng#egg=opnfv&subdirectory=modules
diff --git a/run_unit_tests.sh b/run_unit_tests.sh
index c4973ab65..3eb2cda8d 100755
--- a/run_unit_tests.sh
+++ b/run_unit_tests.sh
@@ -27,12 +27,6 @@ pip install -r $WORKSPACE/requirements.txt
pip install -r $WORKSPACE/test-requirements.txt
pip install $WORKSPACE
-#install releng
-rm -rf releng-unittests
-git clone --depth 1 https://gerrit.opnfv.org/gerrit/releng releng-unittests
-pip install releng-unittests/modules/
-rm -fr releng-unittests
-
nosetests --with-xunit \
--with-coverage \
--cover-tests \