aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorgan Richomme <morgan.richomme@orange.com>2016-08-16 12:06:45 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-08-16 12:06:45 +0000
commit1a4e6fb7fa6e336fc94c3e44c50cce7aa7863d2f (patch)
treec47841c5e1f4c172dc9e23f8fc0f2fa2b5fd83d9
parent814aac022a70d80a03845c659581b35786abc888 (diff)
parent3caa379e03ccb1890190aa688dad75ddef33ddad (diff)
Merge "Repoint security_scanning to its own repository"
-rwxr-xr-xci/exec_test.sh2
-rw-r--r--docker/Dockerfile1
2 files changed, 2 insertions, 1 deletions
diff --git a/ci/exec_test.sh b/ci/exec_test.sh
index 3c807da7b..db9c7a07e 100755
--- a/ci/exec_test.sh
+++ b/ci/exec_test.sh
@@ -140,7 +140,7 @@ function run_test(){
"security_scan")
echo "Sourcing Credentials ${FUNCTEST_CONF_DIR}/stackrc for undercloud .."
source ${FUNCTEST_CONF_DIR}/stackrc
- python ${FUNCTEST_REPO_DIR}/testcases/security_scan/security_scan.py --config ${FUNCTEST_REPO_DIR}/testcases/security_scan/config.ini
+ python ${repos_dir}/securityscanning/security_scan.py --config ${repos_dir}/securityscanning/config.ini
;;
"copper")
python ${FUNCTEST_REPO_DIR}/testcases/features/copper.py
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 04ebf2c6d..23221f23e 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -86,6 +86,7 @@ RUN git clone https://gerrit.opnfv.org/gerrit/sdnvpn ${repos_dir}/sdnvpn
RUN git clone https://github.com/openstack/kingbird.git ${repos_dir}/kingbird
RUN git clone https://gerrit.opnfv.org/gerrit/domino ${repos_dir}/domino
RUN git clone https://gerrit.opnfv.org/gerrit/parser ${repos_dir}/parser
+RUN git clone https://gerrit.opnfv.org/gerrit/securityscanning ${repos_dir}/securityscanning
RUN pip install -r ${repos_dir}/functest/docker/requirements.pip
RUN pip install -r ${repos_dir}/rally/requirements.txt