X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest.yaml;h=2647581f9b04722d6c84913f695215bbc254433a;hb=86a13b92466be1a188adb5769f0f35a85e0d61ed;hp=d498f724c3170629314eb2ea53d681bb8f599d66;hpb=3a29c4dc1e0449fb1ce1c60015eacddaed874f05;p=releng.git diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml index d498f724c..2647581f9 100644 --- a/jjb/functest/functest.yaml +++ b/jjb/functest/functest.yaml @@ -12,10 +12,14 @@ branch: master slave: lf-virtual9 dashboard_url: http://172.30.13.94 + - kali: + branch: stable/kali + slave: lf-pod4-3 + dashboard_url: http://172.30.12.88 - jerma: branch: stable/jerma - slave: lf-virtual4 - dashboard_url: http://172.30.13.89 + slave: lf-pod4 + dashboard_url: http://172.30.12.83 - iruya: branch: stable/iruya slave: lf-virtual4 @@ -127,15 +131,6 @@ else image={repo}:{port}/{container}:{tag} fi - if [ "{tag}" = "latest" ]; then - py=3.7 - elif [ "{tag}" = "jerma" ]; then - py=3.7 - elif [ "{tag}" = "iruya" ]; then - py=3.6 - else - py=2.7 - fi sudo docker run --rm \ -e S3_ENDPOINT_URL=https://storage.googleapis.com \ -e S3_DST_URL=s3://artifacts.opnfv.org/functest/$BUILD_TAG/$JOB_NAME-$BUILD_ID \ @@ -151,9 +146,6 @@ -e IMAGE_PROPERTIES=hw_scsi_model:virtio-scsi,hw_disk_bus:scsi \ -v /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file \ -v /home/opnfv/functest/images:/home/opnfv/functest/images \ - -v /home/opnfv/functest/tempest_blacklist.yaml:/usr/lib/python$py/\ - site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/\ - blacklist.yaml \ -v /home/opnfv/functest/.boto:/root/.boto \ $image run_tests -t {test} -r -p @@ -217,6 +209,13 @@ jobs: - 'functest-{repo}-{container}-{tag}-pull' +- project: + name: 'functest-opnfv-functest-benchmarking-cntt-pull' + <<: *functest-params + container: 'functest-benchmarking-cntt' + jobs: + - 'functest-{repo}-{container}-{tag}-pull' + - project: name: 'functest-opnfv-functest-vnf-pull' <<: *functest-params @@ -261,6 +260,13 @@ jobs: - 'functest-{repo}-{container}-{tag}-rmi' +- project: + name: 'functest-opnfv-functest-benchmarking-cntt-rmi' + <<: *functest-params + container: 'functest-benchmarking-cntt' + jobs: + - 'functest-{repo}-{container}-{tag}-rmi' + - project: name: 'functest-opnfv-functest-vnf-rmi' <<: *functest-params @@ -301,9 +307,6 @@ - odl - tempest_smoke - tempest_horizon - exclude: - - tag: hunter - test: tempest_horizon jobs: - 'functest-{repo}-{container}-{tag}-{test}-run' @@ -312,9 +315,11 @@ <<: *functest-params container: 'functest-smoke' test: - - neutron-tempest-plugin-api + - tempest_neutron - tempest_cinder - tempest_keystone + - tempest_heat + - tempest_telemetry - rally_sanity - refstack_defcore - refstack_compute @@ -327,17 +332,37 @@ - neutron_trunk - networking-bgpvpn - networking-sfc - - barbican - - octavia + - tempest_barbican + - tempest_octavia exclude: - tag: latest test: refstack_defcore + - tag: latest + test: neutron_trunk + - tag: latest + test: networking-bgpvpn + - tag: latest + test: networking-sfc + - tag: kali + test: refstack_defcore + - tag: kali + test: neutron_trunk + - tag: kali + test: networking-bgpvpn + - tag: kali + test: networking-sfc - tag: jerma test: refstack_defcore + - tag: jerma + test: neutron_trunk + - tag: jerma + test: networking-bgpvpn + - tag: jerma + test: networking-sfc - tag: iruya test: refstack_defcore - tag: iruya - test: octavia + test: neutron_trunk - tag: hunter test: refstack_compute - tag: hunter @@ -345,7 +370,11 @@ - tag: hunter test: refstack_platform - tag: hunter - test: octavia + test: tempest_octavia + - tag: hunter + test: neutron_trunk + - tag: hunter + test: tempest_telemetry jobs: - 'functest-{repo}-{container}-{tag}-{test}-run' @@ -354,13 +383,14 @@ <<: *functest-params container: 'functest-smoke-cntt' test: - - neutron-tempest-plugin-api - - tempest_cinder - - tempest_keystone - - rally_sanity - - tempest_full - - tempest_scenario - - tempest_slow + - tempest_neutron_cntt + - tempest_cinder_cntt + - tempest_keystone_cntt + - tempest_heat_cntt + - rally_sanity_cntt + - tempest_full_cntt + - tempest_scenario_cntt + - tempest_slow_cntt jobs: - 'functest-{repo}-{container}-{tag}-{test}-run' @@ -376,6 +406,16 @@ jobs: - 'functest-{repo}-{container}-{tag}-{test}-run' +- project: + name: 'functest-opnfv-functest-benchmarking-cntt' + <<: *functest-params + container: 'functest-benchmarking-cntt' + test: + - rally_full_cntt + - rally_jobs_cntt + jobs: + - 'functest-{repo}-{container}-{tag}-{test}-run' + - project: name: 'functest-opnfv-functest-vnf' <<: *functest-params @@ -394,7 +434,7 @@ builders: - shell: | set +x - [ ! -z "$WORKSPACE" ] && rm -rf $WORKSPACE/* || true + [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/* || true if [ "{repo}" = "_" ]; then image={container}:{tag} elif [ "{port}" = "None" ]; then @@ -460,6 +500,8 @@ <<: *functest-jobs - name: 'functest-opnfv-functest-benchmarking-{tag}-rmi' <<: *functest-jobs + - name: 'functest-opnfv-functest-benchmarking-cntt-{tag}-rmi' + <<: *functest-jobs - name: 'functest-opnfv-functest-vnf-{tag}-rmi' <<: *functest-jobs - multijob: @@ -473,6 +515,8 @@ <<: *functest-jobs - name: 'functest-opnfv-functest-benchmarking-{tag}-pull' <<: *functest-jobs + - name: 'functest-opnfv-functest-benchmarking-cntt-{tag}-pull' + <<: *functest-jobs - name: 'functest-opnfv-functest-vnf-{tag}-pull' <<: *functest-jobs - multijob: @@ -507,12 +551,16 @@ - multijob: name: opnfv/functest-smoke:{tag} projects: - - name: 'functest-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run' + - name: 'functest-opnfv-functest-smoke-{tag}-tempest_neutron-run' <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-tempest_cinder-run' <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-tempest_keystone-run' <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-{tag}-tempest_heat-run' + <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-{tag}-tempest_telemetry-run' + <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-rally_sanity-run' <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-refstack_defcore-run' @@ -537,26 +585,28 @@ <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-networking-sfc-run' <<: *functest-jobs - - name: 'functest-opnfv-functest-smoke-{tag}-barbican-run' + - name: 'functest-opnfv-functest-smoke-{tag}-tempest_barbican-run' <<: *functest-jobs - - name: 'functest-opnfv-functest-smoke-{tag}-octavia-run' + - name: 'functest-opnfv-functest-smoke-{tag}-tempest_octavia-run' <<: *functest-jobs - multijob: name: opnfv/functest-smoke-cntt:{tag} projects: - - name: 'functest-opnfv-functest-smoke-cntt-{tag}-neutron-tempest-plugin-api-run' + - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_neutron_cntt-run' + <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_cinder_cntt-run' <<: *functest-jobs - - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_cinder-run' + - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_keystone_cntt-run' <<: *functest-jobs - - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_keystone-run' + - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_heat_cntt-run' <<: *functest-jobs - - name: 'functest-opnfv-functest-smoke-cntt-{tag}-rally_sanity-run' + - name: 'functest-opnfv-functest-smoke-cntt-{tag}-rally_sanity_cntt-run' <<: *functest-jobs - - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_full-run' + - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_full_cntt-run' <<: *functest-jobs - - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_scenario-run' + - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_scenario_cntt-run' <<: *functest-jobs - - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_slow-run' + - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_slow_cntt-run' <<: *functest-jobs - multijob: name: opnfv/functest-benchmarking:{tag} @@ -569,9 +619,15 @@ <<: *functest-jobs - name: 'functest-opnfv-functest-benchmarking-{tag}-shaker-run' <<: *functest-jobs + - multijob: + name: opnfv/functest-benchmarking-cntt:{tag} + projects: + - name: 'functest-opnfv-functest-benchmarking-cntt-{tag}-rally_full_cntt-run' + <<: *functest-jobs + - name: 'functest-opnfv-functest-benchmarking-cntt-{tag}-rally_jobs_cntt-run' + <<: *functest-jobs - multijob: name: opnfv/functest-vnf:{tag} - execution-type: SEQUENTIALLY projects: - name: 'functest-opnfv-functest-vnf-{tag}-cloudify-run' <<: *functest-jobs @@ -618,21 +674,21 @@ ref: $branch - project: - name: 'functest-_-alpine-3.11-rmi' + name: 'functest-_-alpine-3.12-rmi' repo: _ port: container: alpine - tag: '3.11' + tag: '3.12' slave: master jobs: - 'functest-{repo}-{container}-{tag}-rmi' - project: - name: 'functest-_-alpine-3.11-pull' + name: 'functest-_-alpine-3.12-pull' repo: _ port: container: alpine - tag: '3.11' + tag: '3.12' slave: master jobs: - 'functest-{repo}-{container}-{tag}-pull' @@ -658,6 +714,7 @@ - 'functest-{repo}-{container}-{tag}-check' exclude: - tag: latest + - tag: kali - tag: jerma - project: @@ -690,6 +747,16 @@ - 'functest-{repo}-{container}-{tag}-gate' - 'functest-{repo}-{container}-{tag}-check' +- project: + name: functest-opnfv-functest-benchmarking-cntt-{tag}-build + <<: *functest-params + container: functest-benchmarking-cntt + ref_arg: BRANCH + path: docker/benchmarking-cntt + jobs: + - 'functest-{repo}-{container}-{tag}-gate' + - 'functest-{repo}-{container}-{tag}-check' + - project: name: functest-opnfv-functest-vnf-{tag}-build <<: *functest-params @@ -742,17 +809,19 @@ <<: *functest-jobs - name: 'functest-opnfv-functest-benchmarking-{tag}-rmi' <<: *functest-jobs + - name: 'functest-opnfv-functest-benchmarking-cntt-{tag}-rmi' + <<: *functest-jobs - name: 'functest-opnfv-functest-vnf-{tag}-rmi' <<: *functest-jobs - multijob: name: remove dependencies projects: - - name: 'functest-_-alpine-3.11-rmi' + - name: 'functest-_-alpine-3.12-rmi' <<: *functest-jobs - multijob: name: pull dependencies projects: - - name: 'functest-_-alpine-3.11-pull' + - name: 'functest-_-alpine-3.12-pull' <<: *functest-jobs - multijob: name: build opnfv/functest-core @@ -776,10 +845,12 @@ - name: 'functest-opnfv-functest-vnf-{tag}-check' <<: *functest-jobs - multijob: - name: build opnfv/functest-smoke-cntt + name: build cntt containers projects: - name: 'functest-opnfv-functest-smoke-cntt-{tag}-check' <<: *functest-jobs + - name: 'functest-opnfv-functest-benchmarking-cntt-{tag}-check' + <<: *functest-jobs - multijob: name: opnfv/functest-healthcheck:{tag} projects: @@ -812,12 +883,16 @@ - multijob: name: opnfv/functest-smoke:{tag} projects: - - name: 'functest-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run' + - name: 'functest-opnfv-functest-smoke-{tag}-tempest_neutron-run' <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-tempest_cinder-run' <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-tempest_keystone-run' <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-{tag}-tempest_heat-run' + <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-{tag}-tempest_telemetry-run' + <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-rally_sanity-run' <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-refstack_defcore-run' @@ -842,26 +917,28 @@ <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-networking-sfc-run' <<: *functest-jobs - - name: 'functest-opnfv-functest-smoke-{tag}-barbican-run' + - name: 'functest-opnfv-functest-smoke-{tag}-tempest_barbican-run' <<: *functest-jobs - - name: 'functest-opnfv-functest-smoke-{tag}-octavia-run' + - name: 'functest-opnfv-functest-smoke-{tag}-tempest_octavia-run' <<: *functest-jobs - multijob: name: opnfv/functest-smoke-cntt:{tag} projects: - - name: 'functest-opnfv-functest-smoke-cntt-{tag}-neutron-tempest-plugin-api-run' + - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_neutron_cntt-run' + <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_cinder_cntt-run' <<: *functest-jobs - - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_cinder-run' + - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_keystone_cntt-run' <<: *functest-jobs - - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_keystone-run' + - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_heat_cntt-run' <<: *functest-jobs - - name: 'functest-opnfv-functest-smoke-cntt-{tag}-rally_sanity-run' + - name: 'functest-opnfv-functest-smoke-cntt-{tag}-rally_sanity_cntt-run' <<: *functest-jobs - - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_full-run' + - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_full_cntt-run' <<: *functest-jobs - - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_scenario-run' + - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_scenario_cntt-run' <<: *functest-jobs - - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_slow-run' + - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_slow_cntt-run' <<: *functest-jobs - multijob: name: opnfv/functest-benchmarking:{tag} @@ -874,9 +951,15 @@ <<: *functest-jobs - name: 'functest-opnfv-functest-benchmarking-{tag}-shaker-run' <<: *functest-jobs + - multijob: + name: opnfv/functest-benchmarking-cntt:{tag} + projects: + - name: 'functest-opnfv-functest-benchmarking-cntt-{tag}-rally_full_cntt-run' + <<: *functest-jobs + - name: 'functest-opnfv-functest-benchmarking-cntt-{tag}-rally_jobs_cntt-run' + <<: *functest-jobs - multijob: name: opnfv/functest-vnf:{tag} - execution-type: SEQUENTIALLY projects: - name: 'functest-opnfv-functest-vnf-{tag}-cloudify-run' <<: *functest-jobs @@ -945,17 +1028,19 @@ <<: *functest-jobs - name: 'functest-opnfv-functest-benchmarking-{tag}-rmi' <<: *functest-jobs + - name: 'functest-opnfv-functest-benchmarking-cntt-{tag}-rmi' + <<: *functest-jobs - name: 'functest-opnfv-functest-vnf-{tag}-rmi' <<: *functest-jobs - multijob: name: remove dependencies projects: - - name: 'functest-_-alpine-3.11-rmi' + - name: 'functest-_-alpine-3.12-rmi' <<: *functest-jobs - multijob: name: pull dependencies projects: - - name: 'functest-_-alpine-3.11-pull' + - name: 'functest-_-alpine-3.12-pull' <<: *functest-jobs - multijob: name: build opnfv/functest-core @@ -979,10 +1064,12 @@ - name: 'functest-opnfv-functest-vnf-{tag}-gate' <<: *functest-jobs - multijob: - name: build opnfv/functest-smoke-cntt + name: build cntt containers projects: - name: 'functest-opnfv-functest-smoke-cntt-{tag}-gate' <<: *functest-jobs + - name: 'functest-opnfv-functest-benchmarking-cntt-{tag}-gate' + <<: *functest-jobs - multijob: name: opnfv/functest-healthcheck:{tag} projects: @@ -1015,12 +1102,16 @@ - multijob: name: opnfv/functest-smoke:{tag} projects: - - name: 'functest-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run' + - name: 'functest-opnfv-functest-smoke-{tag}-tempest_neutron-run' <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-tempest_cinder-run' <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-tempest_keystone-run' <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-{tag}-tempest_heat-run' + <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-{tag}-tempest_telemetry-run' + <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-rally_sanity-run' <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-refstack_defcore-run' @@ -1045,26 +1136,28 @@ <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-networking-sfc-run' <<: *functest-jobs - - name: 'functest-opnfv-functest-smoke-{tag}-barbican-run' + - name: 'functest-opnfv-functest-smoke-{tag}-tempest_barbican-run' <<: *functest-jobs - - name: 'functest-opnfv-functest-smoke-{tag}-octavia-run' + - name: 'functest-opnfv-functest-smoke-{tag}-tempest_octavia-run' <<: *functest-jobs - multijob: name: opnfv/functest-smoke-cntt:{tag} projects: - - name: 'functest-opnfv-functest-smoke-cntt-{tag}-neutron-tempest-plugin-api-run' + - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_neutron_cntt-run' <<: *functest-jobs - - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_cinder-run' + - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_cinder_cntt-run' <<: *functest-jobs - - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_keystone-run' + - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_keystone_cntt-run' <<: *functest-jobs - - name: 'functest-opnfv-functest-smoke-cntt-{tag}-rally_sanity-run' + - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_heat_cntt-run' <<: *functest-jobs - - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_full-run' + - name: 'functest-opnfv-functest-smoke-cntt-{tag}-rally_sanity_cntt-run' <<: *functest-jobs - - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_scenario-run' + - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_full_cntt-run' <<: *functest-jobs - - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_slow-run' + - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_scenario_cntt-run' + <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_slow_cntt-run' <<: *functest-jobs - multijob: name: opnfv/functest-benchmarking:{tag} @@ -1077,9 +1170,15 @@ <<: *functest-jobs - name: 'functest-opnfv-functest-benchmarking-{tag}-shaker-run' <<: *functest-jobs + - multijob: + name: opnfv/functest-benchmarking-cntt:{tag} + projects: + - name: 'functest-opnfv-functest-benchmarking-cntt-{tag}-rally_full_cntt-run' + <<: *functest-jobs + - name: 'functest-opnfv-functest-benchmarking-cntt-{tag}-rally_jobs_cntt-run' + <<: *functest-jobs - multijob: name: opnfv/functest-vnf:{tag} - execution-type: SEQUENTIALLY projects: - name: 'functest-opnfv-functest-vnf-{tag}-cloudify-run' <<: *functest-jobs @@ -1110,4 +1209,16 @@ - last-success - last-failure - last-duration - regex: ^functest-[a-z]+-(daily|check|gate)$ + regex: ^functest(-ovn)?-[a-z]+-daily$ + +- view: + name: functest-gate + view-type: list + columns: + - status + - weather + - job + - last-success + - last-failure + - last-duration + regex: ^functest(-ovn)?-[a-z]+-gate$