diff options
Diffstat (limited to 'functest/ci')
| -rw-r--r-- | functest/ci/config_functest.yaml | 29 | ||||
| -rw-r--r-- | functest/ci/download_images.sh | 5 | ||||
| -rw-r--r-- | functest/ci/testcases.yaml | 44 |
3 files changed, 13 insertions, 65 deletions
diff --git a/functest/ci/config_functest.yaml b/functest/ci/config_functest.yaml index cf63e1ed..5ff5c824 100644 --- a/functest/ci/config_functest.yaml +++ b/functest/ci/config_functest.yaml @@ -6,18 +6,17 @@ general: repo_tempest: /src/tempest dir_repo_releng: /home/opnfv/repos/releng repo_vims_test: /src/vims-test - repo_onos: /home/opnfv/repos/onos repo_barometer: /home/opnfv/repos/barometer repo_doctor: /home/opnfv/repos/doctor repo_odl_test: /src/odl_test repo_fds: /src/fds repo_securityscan: /home/opnfv/repos/securityscanning - repo_vrouter: /home/opnfv/repos/vnfs/vrouter functest: /home/opnfv/functest results: /home/opnfv/functest/results functest_conf: /home/opnfv/functest/conf functest_data: /home/opnfv/functest/data ims_data: /home/opnfv/functest/data/ims/ + router_data: /home/opnfv/functest/data/router/ functest_images: /home/opnfv/functest/images rally_inst: /root/.rally @@ -105,11 +104,6 @@ vping: cleanup_objects: True unique_names: True -onos_sfc: - image_base_url: http://artifacts.opnfv.org/sfc/demo - image_name: TestSfcVm - image_file_name: firewall_block_image.img - odl_sfc: image_base_url: "http://artifacts.opnfv.org/sfc/images" image_name: sfc_nsh_danube @@ -159,24 +153,11 @@ vnf: tenant_name: orchestra_clearwaterims tenant_description: Clearwater IMS deployed with Open Baton config: orchestra.yaml + vyos_vrouter: + tenant_name: vrouter + tenant_description: vRouter + config: cloudify_vrouter.yaml -ONOS: - general: - onosbench_username: 'root' - onosbench_password: 'root' - onoscli_username: 'root' - onoscli_password: 'root' - runtimeout: 300 - environment: - OCT: '10.20.0.1' - OC1: '10.20.0.7' - OC2: '10.20.0.7' - OC3: '10.20.0.7' - OCN: '10.20.0.4' - OCN2: '10.20.0.5' - installer_master: '10.20.0.2' - installer_master_username: 'root' - installer_master_password: 'r00tme' promise: tenant_name: promise tenant_description: promise Functionality Testing diff --git a/functest/ci/download_images.sh b/functest/ci/download_images.sh index 88474d3a..367ad8d9 100644 --- a/functest/ci/download_images.sh +++ b/functest/ci/download_images.sh @@ -18,8 +18,7 @@ http://download.cirros-cloud.net/daily/20161201/cirros-d161201-aarch64-initramfs http://download.cirros-cloud.net/daily/20161201/cirros-d161201-aarch64-kernel https://cloud-images.ubuntu.com/releases/14.04/release/ubuntu-14.04-server-cloudimg-arm64-uefi1.img http://cloud.centos.org/altarch/7/images/aarch64/CentOS-7-aarch64-GenericCloud.qcow2.xz +https://sourceforge.net/projects/ool-opnfv/files/vyos-1.1.7.img EOF -xz --decompress --force ${1:-/home/opnfv/functest/images}/CentOS-7-aarch64-GenericCloud.qcow2.xz - -exit $? +xz --decompress --force --keep ${1:-/home/opnfv/functest/images}/CentOS-7-aarch64-GenericCloud.qcow2.xz diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml index ce71c9b6..5364035f 100644 --- a/functest/ci/testcases.yaml +++ b/functest/ci/testcases.yaml @@ -207,22 +207,6 @@ tiers: - /src/fds/testing/robot - - case_name: onos - project_name: functest - criteria: 100 - blocking: true - description: >- - Test Suite for the ONOS SDN Controller. It integrates - some test suites from upstream using TestON as the test - framework. - dependencies: - installer: '' - scenario: 'onos' - run: - module: 'functest.opnfv_tests.sdn.onos.onos' - class: 'Onos' - - - case_name: snaps_smoke project_name: functest criteria: 100 @@ -319,7 +303,7 @@ tiers: - case_name: functest-odl-sfc - enabled: false + enabled: true project_name: sfc criteria: 100 blocking: false @@ -335,21 +319,6 @@ tiers: cmd: 'run_sfc_tests.py' - - case_name: onos_sfc - enabled: false - project_name: functest - criteria: 100 - blocking: true - description: >- - Test Suite for onos-sfc to test sfc function. - dependencies: - installer: '' - scenario: 'onos-sfc' - run: - module: 'functest.opnfv_tests.sdn.onos.onos' - class: 'OnosSfc' - - - case_name: parser-basics enabled: false project_name: parser @@ -466,7 +435,7 @@ tiers: - case_name: cloudify_ims project_name: functest - criteria: 100 + criteria: 80 blocking: false description: >- This test case deploys an OpenSource vIMS solution from Clearwater @@ -507,15 +476,14 @@ tiers: - case_name: vyos_vrouter - enabled: false project_name: functest criteria: 100 blocking: false description: >- This test case is vRouter testing. dependencies: - installer: 'fuel' - scenario: 'nosdn-nofeature' + installer: '' + scenario: 'os-nosdn-nofeature-ha' run: - module: 'functest.opnfv_tests.vnf.router.vyos_vrouter' - class: 'VrouterVnf' + module: 'functest.opnfv_tests.vnf.router.cloudify_vrouter' + class: 'CloudifyVrouter' |