diff options
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/exec_test.sh | 13 | ||||
| -rw-r--r-- | ci/testcases.yaml | 31 | ||||
| -rw-r--r-- | ci/tier_handler.py | 13 |
3 files changed, 31 insertions, 26 deletions
diff --git a/ci/exec_test.sh b/ci/exec_test.sh index 0bb8389d..29163971 100755 --- a/ci/exec_test.sh +++ b/ci/exec_test.sh @@ -83,7 +83,10 @@ function run_test(){ ${FUNCTEST_REPO_DIR}/testcases/Controllers/ODL/start_tests.sh # push results to the DB in case of CI - if [[ -n "$DEPLOY_SCENARIO" && "$DEPLOY_SCENARIO" != "none" ]]; then + if [[ "$report" == "-r" && + -n "$DEPLOY_SCENARIO" && "$DEPLOY_SCENARIO" != "none" && + -n "$INSTALLER_TYPE" && "$INSTALLER_TYPE" != "none" ]] && + env | grep NODE_NAME > /dev/null; then odl_logs="/home/opnfv/functest/results/odl/logs/2" odl_path="${FUNCTEST_REPO_DIR}/testcases/Controllers/ODL/" node_name=$(env | grep NODE_NAME | cut -f2 -d'=') @@ -126,7 +129,13 @@ function run_test(){ python ${FUNCTEST_REPO_DIR}/testcases/features/doctor.py ;; "ovno") - ${repos_dir}/ovno/Testcases/RunTests.sh + # suite under rewritting for colorado + # no need to run anything until refactoring done + # ${repos_dir}/ovno/Testcases/RunTests.sh + ;; + "security_scan") + # To be enabled once verified manually + # python ${FUNCTEST_REPO_DIR}/Testcases/security_scan/security_scan.py --config config.ini ;; *) echo "The test case '${test_name}' does not exist." diff --git a/ci/testcases.yaml b/ci/testcases.yaml index 663dc2aa..4cbc00ad 100644 --- a/ci/testcases.yaml +++ b/ci/testcases.yaml @@ -63,16 +63,6 @@ tiers: installer: '' scenario: '' - #- - # name: security_groups - # description: >- - # This test case verifies the functionality of the OpenStack - # security groups and that the port rules created are - # fullfilled. - # dependencies: - # installer: '' - # scenario: '' - - name: sdn_suites order: 2 @@ -142,12 +132,20 @@ tiers: installer: '(fuel)|(apex)' scenario: 'bgpvpn' + - + name: security_scan + description: >- + Simple security Scan + dependencies: + installer: 'apex' + scenario: '' + - - name: tempest + name: openstack order: 4 ci_loop: 'weekly' description : >- - This test case runs the full set of the OpenStack Tempest suite. + Extensive testing of OpenStack API. testcases: - name: tempest_full_parallel @@ -159,13 +157,6 @@ tiers: installer: '' scenario: '' - - - name: rally - order: 5 - ci_loop: 'weekly' - description : >- - Rally suite from the OpenStack community. - testcases: - name: rally_full description: >- @@ -177,7 +168,7 @@ tiers: - name: vnf - order: 6 + order: 5 ci_loop: 'weekly' description : >- Collection of VNF test cases. diff --git a/ci/tier_handler.py b/ci/tier_handler.py index 03db4a91..b1ef52d8 100644 --- a/ci/tier_handler.py +++ b/ci/tier_handler.py @@ -109,10 +109,15 @@ class TestCase: def is_compatible(self, ci_installer, ci_scenario): try: - return not (re.search(self.dependency.get_installer(), - ci_installer) is None or - re.search(self.dependency.get_scenario(), - ci_scenario) is None) + if ci_installer is not None: + if re.search(self.dependency.get_installer(), + ci_installer) is None: + return False + if ci_scenario is not None: + if re.search(self.dependency.get_scenario(), + ci_scenario) is None: + return False + return not (ci_scenario is None and ci_installer is None) except TypeError: return False |