diff options
Diffstat (limited to 'ci')
| -rw-r--r-- | ci/config_functest.yaml | 1 | ||||
| -rw-r--r-- | ci/config_patch.yaml | 1 | ||||
| -rwxr-xr-x | ci/exec_test.sh | 19 | ||||
| -rw-r--r-- | ci/testcases.yaml | 23 |
4 files changed, 22 insertions, 22 deletions
diff --git a/ci/config_functest.yaml b/ci/config_functest.yaml index 8e45b1d27..afa6ff1f6 100644 --- a/ci/config_functest.yaml +++ b/ci/config_functest.yaml @@ -50,6 +50,7 @@ general: healthcheck: disk_image: /home/opnfv/functest/data/cirros-0.3.4-x86_64-disk.img + disk_format: qcow2 vping: ping_timeout: 200 diff --git a/ci/config_patch.yaml b/ci/config_patch.yaml index 467a83ca0..4994d49d1 100644 --- a/ci/config_patch.yaml +++ b/ci/config_patch.yaml @@ -7,3 +7,4 @@ lxd: healthcheck: disk_image: /home/opnfv/functest/data/cirros-0.3.4-x86_64-lxc.tar.gz + disk_format: raw
\ No newline at end of file diff --git a/ci/exec_test.sh b/ci/exec_test.sh index 9951c0973..98d54f205 100755 --- a/ci/exec_test.sh +++ b/ci/exec_test.sh @@ -36,8 +36,8 @@ if [[ "${CI_DEBUG,,}" == "true" ]];then debug="--debug" fi -FUNCTEST_REPO_DIR=${repos_dir}/functest/ -FUNCTEST_CONF_DIR=/home/opnfv/functest/conf/ +FUNCTEST_REPO_DIR=${repos_dir}/functest +FUNCTEST_CONF_DIR=/home/opnfv/functest/conf function odl_tests(){ @@ -130,7 +130,7 @@ function run_test(){ sleep 10 # to let the instances terminate ;; "doctor") - python ${FUNCTEST_REPO_DIR}/testcases/features/doctor.py + python ${FUNCTEST_REPO_DIR}/testcases/features/doctor.py $report ;; "ovno") # suite under rewritting for colorado @@ -140,23 +140,22 @@ 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 + python ${FUNCTEST_REPO_DIR}/testcases/features/copper.py $report ;; "moon") - # TODO put the link to Moon script to be run (if test runnable) here - ${repos_dir}/moon/tests/run_tests.sh + python ${repos_dir}/moon/tests/run_tests.py $report ;; "multisite") python ${FUNCTEST_REPO_DIR}/testcases/OpenStack/tempest/gen_tempest_conf.py python ${FUNCTEST_REPO_DIR}/testcases/OpenStack/tempest/run_tempest.py \ - $clean_flag -s -m feature_multisite $report + $clean_flag -s -m feature_multisite $report \ -c ${FUNCTEST_REPO_DIR}/testcases/OpenStack/tempest/tempest_multisite.conf ;; "domino") - python ${FUNCTEST_REPO_DIR}/testcases/features/domino.py + python ${FUNCTEST_REPO_DIR}/testcases/features/domino.py $report ;; "odl-sfc") bash ${FUNCTEST_REPO_DIR}/testcases/features/sfc/server_presetup_CI.bash @@ -170,7 +169,7 @@ function run_test(){ exit $ret_val fi source ${FUNCTEST_REPO_DIR}/testcases/features/sfc/tackerc - python ${FUNCTEST_REPO_DIR}/testcases/features/sfc/sfc.py + python ${FUNCTEST_REPO_DIR}/testcases/features/sfc/sfc.py $report ;; "parser") python ${FUNCTEST_REPO_DIR}/testcases/vnf/vRNC/parser.py $report diff --git a/ci/testcases.yaml b/ci/testcases.yaml index 47d544b96..11056708d 100644 --- a/ci/testcases.yaml +++ b/ci/testcases.yaml @@ -47,7 +47,7 @@ tiers: 2) Connectivity between 2 instances over a private network. dependencies: installer: '' - scenario: '' + scenario: '^((?!lxd).)*$' - name: tempest_smoke_serial @@ -173,7 +173,7 @@ tiers: scenario: '(odl)*(moon)' - name: multisite - criteria: 'status == "PASS"' + criteria: 'success_rate == 100%' blocking: false description: >- Test suite from kingbird @@ -207,7 +207,15 @@ tiers: dependencies: installer: '' scenario: 'onos-sfc' - + - + name: parser + criteria: 'ret == 0' + blocking: false + description: >- + Test suite from Parser project. + dependencies: + installer: 'fuel' + scenario: '' - name: openstack order: 4 @@ -255,12 +263,3 @@ tiers: dependencies: installer: '' scenario: '(ocl)|(nosdn)|^(os-odl)((?!bgpvpn).)*$' - - - name: parser - criteria: 'ret == 0' - blocking: false - description: >- - Test suite from Parser project. - dependencies: - installer: 'fuel' - scenario: '' |