diff options
Diffstat (limited to 'jjb/functest/functest-pi.yaml')
| -rw-r--r-- | jjb/functest/functest-pi.yaml | 170 |
1 files changed, 153 insertions, 17 deletions
diff --git a/jjb/functest/functest-pi.yaml b/jjb/functest/functest-pi.yaml index 27b467270..663810ce0 100644 --- a/jjb/functest/functest-pi.yaml +++ b/jjb/functest/functest-pi.yaml @@ -100,6 +100,8 @@ <<: *functest-pi-containers test: '{test}' privileged: '{privileged}' + volumes: '{volumes}' + env: '{env}' network: '{network}' DASHBOARD_URL: '{DASHBOARD_URL}' @@ -122,6 +124,8 @@ builders: - shell: | set +x + volumes=; for i in $(echo {volumes} | tr -d '[] ' |sed "s/,/ /g" ); do volumes="-v $i $volumes"; done + env=; for i in $(eval echo {env} | tr -d '[] ' |sed "s/,/ /g" ); do env="-e $i $env"; done [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/results || true if [ "{repo}" = "_" ]; then image={container}:{tag} @@ -133,6 +137,8 @@ sudo docker run --rm \ --privileged={privileged} \ --network={network} \ + $volumes \ + $env \ -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 \ @@ -142,12 +148,7 @@ -e NODE_NAME=$slave \ -e BUILD_TAG=$BUILD_TAG \ -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \ - -e EXTERNAL_NETWORK=$EXTERNAL_NETWORK \ - -e VOLUME_DEVICE_NAME=$VOLUME_DEVICE_NAME \ - -e IMAGE_PROPERTIES=$IMAGE_PROPERTIES \ -e DASHBOARD_URL={DASHBOARD_URL} \ - -v /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file \ - -v /home/opnfv/functest/images:/home/opnfv/functest/images \ $image run_tests -t {test} -p -r - builder: @@ -267,7 +268,7 @@ - 'functest-pi-{repo}-{container}-{tag}-rmi' - job-template: - name: 'functest-pi-{repo}-{container}-{tag}-{test}-run' + name: 'functest-pi-ollivier-functest-healthcheck-{tag}-{test}-run' parameters: - functest-pi-slave: slave: '{slave}' @@ -286,6 +287,13 @@ - project: name: 'functest-pi-ollivier-functest-healthcheck' <<: *functest-pi-params + volumes: + - /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file + - /home/opnfv/functest/images:/home/opnfv/functest/images + env: + - EXTERNAL_NETWORK=$EXTERNAL_NETWORK + - VOLUME_DEVICE_NAME=$VOLUME_DEVICE_NAME + - IMAGE_PROPERTIES=$IMAGE_PROPERTIES container: 'functest-healthcheck' test: - connection_check @@ -304,11 +312,35 @@ privileged: 'false' network: bridge jobs: - - 'functest-pi-{repo}-{container}-{tag}-{test}-run' + - 'functest-pi-ollivier-functest-healthcheck-{tag}-{test}-run' + +- job-template: + name: 'functest-pi-ollivier-functest-smoke-{tag}-{test}-run' + parameters: + - functest-pi-slave: + slave: '{slave}' + - functest-pi-build_tag: + build_tag: '' + - functest-pi-EXTERNAL_NETWORK: + EXTERNAL_NETWORK: public + - functest-pi-VOLUME_DEVICE_NAME: + VOLUME_DEVICE_NAME: sdb + - functest-pi-IMAGE_PROPERTIES: + IMAGE_PROPERTIES: hw_scsi_model:virtio-scsi,hw_disk_bus:scsi + builders: + - functest-pi-run-containers: + <<: *functest-pi-run-containers - project: name: 'functest-pi-ollivier-functest-smoke' <<: *functest-pi-params + volumes: + - /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file + - /home/opnfv/functest/images:/home/opnfv/functest/images + env: + - EXTERNAL_NETWORK=$EXTERNAL_NETWORK + - VOLUME_DEVICE_NAME=$VOLUME_DEVICE_NAME + - IMAGE_PROPERTIES=$IMAGE_PROPERTIES container: 'functest-smoke' test: - tempest_neutron @@ -487,11 +519,35 @@ - tag: arm64-jerma test: tempest_cyborg jobs: - - 'functest-pi-{repo}-{container}-{tag}-{test}-run' + - 'functest-pi-ollivier-functest-smoke-{tag}-{test}-run' + +- job-template: + name: 'functest-pi-ollivier-functest-smoke-cntt-{tag}-{test}-run' + parameters: + - functest-pi-slave: + slave: '{slave}' + - functest-pi-build_tag: + build_tag: '' + - functest-pi-EXTERNAL_NETWORK: + EXTERNAL_NETWORK: public + - functest-pi-VOLUME_DEVICE_NAME: + VOLUME_DEVICE_NAME: sdb + - functest-pi-IMAGE_PROPERTIES: + IMAGE_PROPERTIES: hw_scsi_model:virtio-scsi,hw_disk_bus:scsi + builders: + - functest-pi-run-containers: + <<: *functest-pi-run-containers - project: name: 'functest-pi-ollivier-functest-smoke-cntt' <<: *functest-pi-params + volumes: + - /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file + - /home/opnfv/functest/images:/home/opnfv/functest/images + env: + - EXTERNAL_NETWORK=$EXTERNAL_NETWORK + - VOLUME_DEVICE_NAME=$VOLUME_DEVICE_NAME + - IMAGE_PROPERTIES=$IMAGE_PROPERTIES container: 'functest-smoke-cntt' test: - tempest_neutron_cntt @@ -505,11 +561,35 @@ privileged: 'false' network: bridge jobs: - - 'functest-pi-{repo}-{container}-{tag}-{test}-run' + - 'functest-pi-ollivier-functest-smoke-cntt-{tag}-{test}-run' + +- job-template: + name: 'functest-pi-ollivier-functest-benchmarking-{tag}-{test}-run' + parameters: + - functest-pi-slave: + slave: '{slave}' + - functest-pi-build_tag: + build_tag: '' + - functest-pi-EXTERNAL_NETWORK: + EXTERNAL_NETWORK: public + - functest-pi-VOLUME_DEVICE_NAME: + VOLUME_DEVICE_NAME: sdb + - functest-pi-IMAGE_PROPERTIES: + IMAGE_PROPERTIES: hw_scsi_model:virtio-scsi,hw_disk_bus:scsi + builders: + - functest-pi-run-containers: + <<: *functest-pi-run-containers - project: name: 'functest-pi-ollivier-functest-benchmarking' <<: *functest-pi-params + volumes: + - /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file + - /home/opnfv/functest/images:/home/opnfv/functest/images + env: + - EXTERNAL_NETWORK=$EXTERNAL_NETWORK + - VOLUME_DEVICE_NAME=$VOLUME_DEVICE_NAME + - IMAGE_PROPERTIES=$IMAGE_PROPERTIES container: 'functest-benchmarking' test: - rally_full @@ -519,11 +599,35 @@ privileged: 'false' network: bridge jobs: - - 'functest-pi-{repo}-{container}-{tag}-{test}-run' + - 'functest-pi-ollivier-functest-benchmarking-{tag}-{test}-run' + +- job-template: + name: 'functest-pi-ollivier-functest-benchmarking-cntt-{tag}-{test}-run' + parameters: + - functest-pi-slave: + slave: '{slave}' + - functest-pi-build_tag: + build_tag: '' + - functest-pi-EXTERNAL_NETWORK: + EXTERNAL_NETWORK: public + - functest-pi-VOLUME_DEVICE_NAME: + VOLUME_DEVICE_NAME: sdb + - functest-pi-IMAGE_PROPERTIES: + IMAGE_PROPERTIES: hw_scsi_model:virtio-scsi,hw_disk_bus:scsi + builders: + - functest-pi-run-containers: + <<: *functest-pi-run-containers - project: name: 'functest-pi-ollivier-functest-benchmarking-cntt' <<: *functest-pi-params + volumes: + - /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file + - /home/opnfv/functest/images:/home/opnfv/functest/images + env: + - EXTERNAL_NETWORK=$EXTERNAL_NETWORK + - VOLUME_DEVICE_NAME=$VOLUME_DEVICE_NAME + - IMAGE_PROPERTIES=$IMAGE_PROPERTIES container: 'functest-benchmarking-cntt' test: - rally_full_cntt @@ -531,11 +635,35 @@ privileged: 'false' network: bridge jobs: - - 'functest-pi-{repo}-{container}-{tag}-{test}-run' + - 'functest-pi-ollivier-functest-benchmarking-cntt-{tag}-{test}-run' + +- job-template: + name: 'functest-pi-ollivier-functest-vnf-{tag}-{test}-run' + parameters: + - functest-pi-slave: + slave: '{slave}' + - functest-pi-build_tag: + build_tag: '' + - functest-pi-EXTERNAL_NETWORK: + EXTERNAL_NETWORK: public + - functest-pi-VOLUME_DEVICE_NAME: + VOLUME_DEVICE_NAME: sdb + - functest-pi-IMAGE_PROPERTIES: + IMAGE_PROPERTIES: hw_scsi_model:virtio-scsi,hw_disk_bus:scsi + builders: + - functest-pi-run-containers: + <<: *functest-pi-run-containers - project: name: 'functest-pi-ollivier-functest-vnf' <<: *functest-pi-params + volumes: + - /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file + - /home/opnfv/functest/images:/home/opnfv/functest/images + env: + - EXTERNAL_NETWORK=$EXTERNAL_NETWORK + - VOLUME_DEVICE_NAME=$VOLUME_DEVICE_NAME + - IMAGE_PROPERTIES=$IMAGE_PROPERTIES container: 'functest-vnf' test: - cloudify @@ -546,13 +674,15 @@ privileged: 'false' network: bridge jobs: - - 'functest-pi-{repo}-{container}-{tag}-{test}-run' + - 'functest-pi-ollivier-functest-vnf-{tag}-{test}-run' - builder: name: functest-pi-zip builders: - shell: | set +x + volumes=; for i in $(echo {volumes} | tr -d '[] ' |sed "s/,/ /g" ); do volumes="-v $i $volumes"; done + env=; for i in $(eval echo {env} | tr -d '[] ' |sed "s/,/ /g" ); do env="-e $i $env"; done [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/results || true if [ "{repo}" = "_" ]; then image={container}:{tag} @@ -562,6 +692,8 @@ image={repo}:{port}/{container}:{tag} fi sudo docker run --rm \ + $volumes \ + $env \ -e S3_ENDPOINT_URL=https://storage.googleapis.com \ -e S3_DST_URL=s3://artifacts.opnfv.org/functest \ -e HTTP_DST_URL=http://artifacts.opnfv.org/functest \ @@ -570,11 +702,6 @@ -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 EXTERNAL_NETWORK=$EXTERNAL_NETWORK \ - -e VOLUME_DEVICE_NAME=$VOLUME_DEVICE_NAME \ - -e IMAGE_PROPERTIES=$IMAGE_PROPERTIES \ - -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: @@ -593,10 +720,19 @@ builders: - functest-pi-zip: <<: *functest-pi-containers + volumes: '{volumes}' + env: '{env}' - project: name: 'functest-pi-{tag}-zip' <<: *functest-pi-params + volumes: + - /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file + - /home/opnfv/functest/images:/home/opnfv/functest/images + env: + - EXTERNAL_NETWORK=$EXTERNAL_NETWORK + - VOLUME_DEVICE_NAME=$VOLUME_DEVICE_NAME + - IMAGE_PROPERTIES=$IMAGE_PROPERTIES container: 'functest-healthcheck' jobs: - 'functest-pi-{tag}-zip' |