From 43c038ddf45d5343f23cc0dbdd39c1eb8890f073 Mon Sep 17 00:00:00 2001 From: MatthewLi Date: Thu, 14 Apr 2016 02:24:48 -0400 Subject: [PATCH] bugfix: docker ci workflow bugfix Change-Id: I1215c6ecc9642bb2e4d433276fc3f6941e775e0b Signed-off-by: MatthewLi --- ci/docker/Dockerfile | 6 +++--- run_tests.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ci/docker/Dockerfile b/ci/docker/Dockerfile index a8f7e389..375ceba6 100644 --- a/ci/docker/Dockerfile +++ b/ci/docker/Dockerfile @@ -38,7 +38,7 @@ RUN apt-get -y autoremove && \ RUN mkdir -p ${REPOS_DIR} RUN git config --global http.sslVerify false -# TODO fix code clone handler -#RUN git clone https://gerrit.opnfv.org/gerrit/bottlenecks ${BOTTLENECKS_REPO_DIR} -#RUN git clone https://gerrit.opnfv.org/gerrit/releng ${RELENG_REPO_DIR} +RUN git clone https://gerrit.opnfv.org/gerrit/bottlenecks ${BOTTLENECKS_REPO_DIR} +RUN git clone https://gerrit.opnfv.org/gerrit/releng ${RELENG_REPO_DIR} +COPY ../../run_tests.sh /usr/local/bin/ diff --git a/run_tests.sh b/run_tests.sh index e6e90846..1171b7ce 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -79,7 +79,7 @@ function run_test(){ #adjust config parameters, different test suite has different methods, take rubbos as an example #run test case, different test suite has different methods file={$BASEDIR}/testsuites/rubbos/testcase_cfg/{$i}.yaml - python ${BOTTLENECK_TOP_DIR}/testsuites/rubbos/run_rubbos.py -c $file + python /home/opnfv/bottlenecks/testsuites/rubbos/run_rubbos.py -c $file done ;; "vstf") -- 2.16.6