diff options
| author |   Morgan Richomme <morgan.richomme@orange.com> | 2017-02-10 18:23:32 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-02-10 18:23:32 +0000 |
| commit | 8eef71278d06f2fd91b99e6be19069ba077c2d29 (patch) | |
| tree | 796cea6dac7ba35a8ebac5d6cf5d6eb494599cf6 /functest/ci | |
| parent | 8d949aff05d479c9dc037419fc54e24382904bf3 (diff) | |
| parent | eec76fd8961e92330da2e68e55ee3341b1475beb (diff) | |
Merge "Logic to trigger Security Scan project"
Diffstat (limited to 'functest/ci')
| -rwxr-xr-x | functest/ci/config_functest.yaml | 1 | ||||
| -rwxr-xr-x | functest/ci/exec_test.sh | 5 | ||||
| -rwxr-xr-x | functest/ci/testcases.yaml | 5 |
3 files changed, 5 insertions, 6 deletions
diff --git a/functest/ci/config_functest.yaml b/functest/ci/config_functest.yaml index f6cb14cb..6a10e382 100755 --- a/functest/ci/config_functest.yaml +++ b/functest/ci/config_functest.yaml @@ -27,6 +27,7 @@ general: repo_parser: /home/opnfv/repos/parser repo_domino: /home/opnfv/repos/domino repo_snaps: /home/opnfv/repos/snaps + repo_securityscan: /home/opnfv/repos/securityscanning functest: /home/opnfv/functest functest_test: /home/opnfv/repos/functest/functest/opnfv_tests results: /home/opnfv/functest/results diff --git a/functest/ci/exec_test.sh b/functest/ci/exec_test.sh index 5d286500..aa0cfaf7 100755 --- a/functest/ci/exec_test.sh +++ b/functest/ci/exec_test.sh @@ -105,11 +105,6 @@ function run_test(){ # no need to run anything until refactoring done # ${REPOS_DIR}/ovno/Testcases/RunTests.sh ;; - "security_scan") - echo "Sourcing Credentials ${FUNCTEST_CONF_DIR}/stackrc for undercloud .." - source ${FUNCTEST_CONF_DIR}/stackrc - python ${FUNCTEST_TEST_DIR}/security_scan/security_scan.py --config ${FUNCTEST_TEST_DIR}/security_scan/config.ini - ;; *) echo "The test case '${test_name}' does not exist." exit 1 diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml index fc3bd6b7..6007f972 100755 --- a/functest/ci/testcases.yaml +++ b/functest/ci/testcases.yaml @@ -239,10 +239,13 @@ tiers: criteria: 'status == "PASS"' blocking: false description: >- - Simple security Scan + Simple Security Scan dependencies: installer: 'apex' scenario: '^((?!fdio).)*$' + run: + module: 'functest.opnfv_tests.features.security_scan' + class: 'SecurityScan' # - # name: copper # criteria: 'status == "PASS"' |