Install releng via requirements.txt

It should work in all branches if the right requirements.txt is
selected.

Change-Id: I9c46cd52496528835a92e371320debf92117b4fa
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 202eb5c..4a570b5 100644 (file)
--- 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 b03c6d9..e323cb1 100644 (file)
--- 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 65b3697..7b8af65 100644 (file)
--- 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 c4973ab..3eb2cda 100755 (executable)
--- 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 \