X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest.yaml;h=925d6dea556a2703ab9684e9000b94f6f26fba4e;hb=bbc3002a3d91b6abfda6c948c19c50b849cb3782;hp=fc40c9e5204a9651061b980e48b3bcc6ce51280a;hpb=96812433fe4c4805bd272ae3cf1a9d5f91ba7356;p=releng.git diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml index fc40c9e52..925d6dea5 100644 --- a/jjb/functest/functest.yaml +++ b/jjb/functest/functest.yaml @@ -12,6 +12,10 @@ branch: master slave: lf-virtual9 dashboard_url: http://172.30.13.94 + - leguer: + branch: stable/leguer + slave: lf-virtual9 + dashboard_url: http://172.30.13.94 - kali: branch: stable/kali slave: lf-pod4-3 @@ -63,6 +67,20 @@ name: EXTERNAL_NETWORK default: public +- parameter: + name: functest-VOLUME_DEVICE_NAME + parameters: + - string: + name: VOLUME_DEVICE_NAME + default: sdb + +- parameter: + name: functest-IMAGE_PROPERTIES + parameters: + - string: + name: IMAGE_PROPERTIES + default: hw_scsi_model:virtio-scsi,hw_disk_bus:scsi + - functest-containers: &functest-containers name: 'functest-containers' repo: '{repo}' @@ -75,12 +93,8 @@ <<: *functest-containers test: '{test}' dashboard_url: '{dashboard_url}' - -- functest-build-containers: &functest-build-containers - name: 'functest-build-containers' - <<: *functest-containers - ref_arg: '{ref_arg}' - path: '{path}' + privileged: '{privileged}' + network: '{network}' - builder: name: functest-pull-containers @@ -96,28 +110,6 @@ fi sudo docker pull $image -- builder: - name: functest-build-containers - builders: - - shell: | - set +x - if [ "{repo}" = "_" ]; then - image={container}:{tag} - elif [ "{port}" = "None" ]; then - image={repo}/{container}:{tag} - else - image={repo}:{port}/{container}:{tag} - fi - if [ "{ref_arg}" = "None" ]; then - build_arg="" - else - build_arg="--build-arg {ref_arg}={ref}" - fi - cd {path} - sudo docker build $build_arg \ - --pull=false --no-cache --force-rm=true \ - -t $image . - - builder: name: functest-run-containers builders: @@ -132,21 +124,24 @@ image={repo}:{port}/{container}:{tag} fi sudo docker run --rm \ + --privileged={privileged} \ + --network={network} \ -e S3_ENDPOINT_URL=https://storage.googleapis.com \ -e S3_DST_URL=s3://artifacts.opnfv.org/functest/$BUILD_TAG/$JOB_NAME-$BUILD_ID \ -e HTTP_DST_URL=http://artifacts.opnfv.org/functest/$BUILD_TAG/$JOB_NAME-$BUILD_ID \ -e TEST_DB_URL=http://testresults.opnfv.org/test/api/v1/results \ + -e TEST_DB_EXT_URL=http://testresults.opnfv.org/test/api/v1/results \ -e NODE_NAME=$slave \ -e BUILD_TAG=$BUILD_TAG \ -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \ -e DEBUG=$DEBUG \ -e EXTERNAL_NETWORK=$EXTERNAL_NETWORK \ -e DASHBOARD_URL={dashboard_url} \ - -e VOLUME_DEVICE_NAME=sdb \ - -e IMAGE_PROPERTIES=hw_scsi_model:virtio-scsi,hw_disk_bus:scsi \ + -e VOLUME_DEVICE_NAME=$VOLUME_DEVICE_NAME \ + -e IMAGE_PROPERTIES=$IMAGE_PROPERTIES \ + -v /home/opnfv/functest/.boto:/root/.boto \ -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/.boto:/root/.boto \ $image run_tests -t {test} -r -p - builder: @@ -163,6 +158,34 @@ fi sudo docker rmi $image || true +- functest-build-containers: &functest-build-containers + name: 'functest-build-containers' + <<: *functest-containers + ref_arg: '{ref_arg}' + path: '{path}' + +- builder: + name: functest-build-containers + builders: + - shell: | + set +x + if [ "{repo}" = "_" ]; then + image={container}:{tag} + elif [ "{port}" = "None" ]; then + image={repo}/{container}:{tag} + else + image={repo}:{port}/{container}:{tag} + fi + if [ "{ref_arg}" = "None" ]; then + build_arg="" + else + build_arg="--build-arg {ref_arg}={ref}" + fi + cd {path} + sudo docker build $build_arg \ + --pull=false --no-cache --force-rm=true \ + -t $image . + - scm: name: functest-scm scm: @@ -285,6 +308,10 @@ DEBUG: 'true' - functest-EXTERNAL_NETWORK: EXTERNAL_NETWORK: public + - functest-VOLUME_DEVICE_NAME: + VOLUME_DEVICE_NAME: sdb + - functest-IMAGE_PROPERTIES: + IMAGE_PROPERTIES: hw_scsi_model:virtio-scsi,hw_disk_bus:scsi builders: - functest-run-containers: <<: *functest-run-containers @@ -307,6 +334,8 @@ - odl - tempest_smoke - tempest_horizon + privileged: 'false' + network: bridge jobs: - 'functest-{repo}-{container}-{tag}-{test}-run' @@ -332,7 +361,6 @@ - patrole_admin - patrole_member - patrole_reader - - neutron_trunk - networking-bgpvpn - networking-sfc - tempest_barbican @@ -341,18 +369,22 @@ exclude: - tag: latest test: refstack_defcore - - tag: latest - test: neutron_trunk - tag: latest test: networking-bgpvpn - tag: latest test: networking-sfc - tag: latest test: patrole - - tag: kali + - tag: leguer test: refstack_defcore + - tag: leguer + test: networking-bgpvpn + - tag: leguer + test: networking-sfc + - tag: leguer + test: patrole - tag: kali - test: neutron_trunk + test: refstack_defcore - tag: kali test: networking-bgpvpn - tag: kali @@ -363,12 +395,8 @@ test: patrole_member - tag: kali test: patrole_reader - - tag: kali - test: tempest_cyborg - tag: jerma test: refstack_defcore - - tag: jerma - test: neutron_trunk - tag: jerma test: networking-bgpvpn - tag: jerma @@ -383,8 +411,6 @@ test: tempest_cyborg - tag: iruya test: refstack_defcore - - tag: iruya - test: neutron_trunk - tag: iruya test: patrole_admin - tag: iruya @@ -401,8 +427,6 @@ test: refstack_platform - tag: hunter test: tempest_octavia - - tag: hunter - test: neutron_trunk - tag: hunter test: tempest_telemetry - tag: hunter @@ -413,6 +437,8 @@ test: patrole_reader - tag: hunter test: tempest_cyborg + privileged: 'false' + network: bridge jobs: - 'functest-{repo}-{container}-{tag}-{test}-run' @@ -429,6 +455,8 @@ - tempest_full_cntt - tempest_scenario_cntt - tempest_slow_cntt + privileged: 'false' + network: bridge jobs: - 'functest-{repo}-{container}-{tag}-{test}-run' @@ -441,6 +469,8 @@ - rally_jobs - vmtp - shaker + privileged: 'false' + network: bridge jobs: - 'functest-{repo}-{container}-{tag}-{test}-run' @@ -451,6 +481,8 @@ test: - rally_full_cntt - rally_jobs_cntt + privileged: 'false' + network: bridge jobs: - 'functest-{repo}-{container}-{tag}-{test}-run' @@ -464,9 +496,12 @@ - heat_ims - vyos_vrouter - juju_epc + privileged: 'false' + network: bridge jobs: - 'functest-{repo}-{container}-{tag}-{test}-run' + - builder: name: functest-zip builders: @@ -485,16 +520,33 @@ -e S3_DST_URL=s3://artifacts.opnfv.org/functest \ -e HTTP_DST_URL=http://artifacts.opnfv.org/functest \ -e TEST_DB_URL=http://testresults.opnfv.org/test/api/v1/results \ + -e TEST_DB_EXT_URL=http://testresults.opnfv.org/test/api/v1/results \ -e BUILD_TAG=$BUILD_TAG \ -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \ + -e DEBUG=$DEBUG \ + -e EXTERNAL_NETWORK=$EXTERNAL_NETWORK \ + -e VOLUME_DEVICE_NAME=$VOLUME_DEVICE_NAME \ + -e IMAGE_PROPERTIES=$IMAGE_PROPERTIES \ -v /home/opnfv/functest/.boto:/root/.boto \ + -v /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file \ + -v /home/opnfv/functest/images:/home/opnfv/functest/images \ $image zip_campaign - job-template: name: 'functest-{tag}-zip' parameters: + - functest-slave: + slave: '{slave}' - functest-build_tag: build_tag: '' + - functest-DEBUG: + DEBUG: 'true' + - functest-EXTERNAL_NETWORK: + EXTERNAL_NETWORK: public + - functest-VOLUME_DEVICE_NAME: + VOLUME_DEVICE_NAME: sdb + - functest-IMAGE_PROPERTIES: + IMAGE_PROPERTIES: hw_scsi_model:virtio-scsi,hw_disk_bus:scsi builders: - functest-zip: <<: *functest-containers @@ -510,7 +562,7 @@ name: 'functest-{tag}-daily' project-type: multijob triggers: - - timed: '@daily' + - timed: '@weekly' parameters: - functest-slave: slave: '{slave}' @@ -520,12 +572,16 @@ DEBUG: 'true' - functest-EXTERNAL_NETWORK: EXTERNAL_NETWORK: public + - functest-VOLUME_DEVICE_NAME: + VOLUME_DEVICE_NAME: sdb + - functest-IMAGE_PROPERTIES: + IMAGE_PROPERTIES: hw_scsi_model:virtio-scsi,hw_disk_bus:scsi properties: - build-blocker: use-build-blocker: true blocking-level: 'NODE' blocking-jobs: - - '^functest-{tag}-(daily|check|gate)$' + - '^functest(-pi)?(-ovn)?-(arm.*-|amd64-)*[a-z]+-(daily|gate|check)$' builders: - multijob: name: remove former images @@ -623,8 +679,6 @@ <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-patrole_reader-run' <<: *functest-jobs - - name: 'functest-opnfv-functest-smoke-{tag}-neutron_trunk-run' - <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-networking-bgpvpn-run' <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-networking-sfc-run' @@ -720,21 +774,21 @@ ref: $branch - project: - name: 'functest-_-alpine-3.12-rmi' + name: 'functest-_-alpine-3.13-rmi' repo: _ port: container: alpine - tag: '3.12' + tag: '3.13' slave: master jobs: - 'functest-{repo}-{container}-{tag}-rmi' - project: - name: 'functest-_-alpine-3.12-pull' + name: 'functest-_-alpine-3.13-pull' repo: _ port: container: alpine - tag: '3.12' + tag: '3.13' slave: master jobs: - 'functest-{repo}-{container}-{tag}-pull' @@ -760,6 +814,7 @@ - 'functest-{repo}-{container}-{tag}-check' exclude: - tag: latest + - tag: leguer - tag: kali - tag: jerma @@ -837,12 +892,16 @@ DEBUG: 'true' - functest-EXTERNAL_NETWORK: EXTERNAL_NETWORK: public + - functest-VOLUME_DEVICE_NAME: + VOLUME_DEVICE_NAME: sdb + - functest-IMAGE_PROPERTIES: + IMAGE_PROPERTIES: hw_scsi_model:virtio-scsi,hw_disk_bus:scsi properties: - build-blocker: use-build-blocker: true blocking-level: 'NODE' blocking-jobs: - - '^functest-{tag}-(daily|check|gate)$' + - '^functest(-pi)?(-ovn)?-(arm.*-|amd64-)*[a-z]+-(daily|gate|check)$' builders: - multijob: name: remove former images @@ -862,12 +921,12 @@ - multijob: name: remove dependencies projects: - - name: 'functest-_-alpine-3.12-rmi' + - name: 'functest-_-alpine-3.13-rmi' <<: *functest-jobs - multijob: name: pull dependencies projects: - - name: 'functest-_-alpine-3.12-pull' + - name: 'functest-_-alpine-3.13-pull' <<: *functest-jobs - multijob: name: build opnfv/functest-core @@ -963,8 +1022,6 @@ <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-patrole_reader-run' <<: *functest-jobs - - name: 'functest-opnfv-functest-smoke-{tag}-neutron_trunk-run' - <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-networking-bgpvpn-run' <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-networking-sfc-run' @@ -1064,12 +1121,16 @@ DEBUG: 'true' - functest-EXTERNAL_NETWORK: EXTERNAL_NETWORK: public + - functest-VOLUME_DEVICE_NAME: + VOLUME_DEVICE_NAME: sdb + - functest-IMAGE_PROPERTIES: + IMAGE_PROPERTIES: hw_scsi_model:virtio-scsi,hw_disk_bus:scsi properties: - build-blocker: use-build-blocker: true blocking-level: 'NODE' blocking-jobs: - - '^functest-{tag}-(daily|check|gate)$' + - '^functest(-pi)?(-ovn)?-(arm.*-|amd64-)*[a-z]+-(daily|gate|check)$' builders: - multijob: name: remove former images @@ -1089,12 +1150,12 @@ - multijob: name: remove dependencies projects: - - name: 'functest-_-alpine-3.12-rmi' + - name: 'functest-_-alpine-3.13-rmi' <<: *functest-jobs - multijob: name: pull dependencies projects: - - name: 'functest-_-alpine-3.12-pull' + - name: 'functest-_-alpine-3.13-pull' <<: *functest-jobs - multijob: name: build opnfv/functest-core @@ -1190,8 +1251,6 @@ <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-patrole_reader-run' <<: *functest-jobs - - name: 'functest-opnfv-functest-smoke-{tag}-neutron_trunk-run' - <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-networking-bgpvpn-run' <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-networking-sfc-run' @@ -1258,6 +1317,11 @@ <<: *functest-params jobs: - 'functest-{tag}-daily' + +- project: + name: 'functest-gate' + <<: *functest-params + jobs: - 'functest-{tag}-check' - 'functest-{tag}-gate' @@ -1271,7 +1335,7 @@ - last-success - last-failure - last-duration - regex: ^functest(-ovn)?-[a-z]+-daily$ + regex: ^functest(-ovn)?-(amd64-)*[a-z]+-daily$ - view: name: functest-gate @@ -1283,4 +1347,4 @@ - last-success - last-failure - last-duration - regex: ^functest(-ovn)?-[a-z]+-gate$ + regex: ^functest(-ovn)?-(amd64-)*[a-z]+-gate$