diff options
Diffstat (limited to 'jjb/functest')
| -rw-r--r-- | jjb/functest/functest-daily-jobs.yaml | 10 | ||||
| -rw-r--r-- | jjb/functest/functest-docker.yaml | 13 | ||||
| -rw-r--r-- | jjb/functest/functest-kubernetes.yaml | 185 | ||||
| -rw-r--r-- | jjb/functest/functest-project-jobs.yaml | 8 | ||||
| -rw-r--r-- | jjb/functest/functest.yaml | 91 | ||||
| -rw-r--r-- | jjb/functest/xtesting.yaml | 158 |
6 files changed, 363 insertions, 102 deletions
diff --git a/jjb/functest/functest-daily-jobs.yaml b/jjb/functest/functest-daily-jobs.yaml index 3f5e7fd12..3cdff3d16 100644 --- a/jjb/functest/functest-daily-jobs.yaml +++ b/jjb/functest/functest-daily-jobs.yaml @@ -43,11 +43,11 @@ - baremetal: slave-label: fuel-baremetal installer: fuel - <<: *hunter + <<: *iruya - virtual: slave-label: fuel-virtual installer: fuel - <<: *hunter + <<: *iruya # apex CI PODs - virtual: slave-label: apex-virtual-master @@ -60,11 +60,11 @@ - virtual: slave-label: apex-virtual-master installer: apex - <<: *hunter + <<: *iruya - baremetal: slave-label: apex-baremetal-master installer: apex - <<: *hunter + <<: *iruya # armband CI PODs - armband-baremetal: slave-label: armband-baremetal @@ -73,7 +73,7 @@ - armband-baremetal: slave-label: armband-baremetal installer: fuel - <<: *hunter + <<: *iruya # fuel NONE CI PODs - zte-pod1: slave-label: fuel-baremetal diff --git a/jjb/functest/functest-docker.yaml b/jjb/functest/functest-docker.yaml index a0741f1ee..c11b4e13d 100644 --- a/jjb/functest/functest-docker.yaml +++ b/jjb/functest/functest-docker.yaml @@ -38,12 +38,19 @@ - 'vnf' - 'smoke-cntt' - 'benchmarking-cntt' + - 'features' exclude: - stream: 'master' image: 'tempest' - stream: 'jerma' image: 'tempest' + - stream: 'master' + image: 'features' + - stream: 'jerma' + image: 'features' + - stream: 'iruya' + image: 'features' # settings for jobs run in multijob phases build-job-settings: &build-job-settings @@ -154,6 +161,10 @@ <<: *build-job-settings - name: 'functest-vnf-docker-build-arm64-{stream}' <<: *build-job-settings + - name: 'functest-features-docker-build-amd64-{stream}' + <<: *build-job-settings + - name: 'functest-features-docker-build-arm64-{stream}' + <<: *build-job-settings - multijob: name: 'publish all manifests' condition: SUCCESSFUL @@ -167,6 +178,8 @@ <<: *manifest-job-settings - name: 'functest-vnf-docker-manifest-{stream}' <<: *manifest-job-settings + - name: 'functest-features-docker-manifest-{stream}' + <<: *manifest-job-settings - multijob: name: 'build all functest cntt images' condition: SUCCESSFUL diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml index 12c9c26a1..fcc1eb15e 100644 --- a/jjb/functest/functest-kubernetes.yaml +++ b/jjb/functest/functest-kubernetes.yaml @@ -29,12 +29,31 @@ default: '{slave}' - parameter: + name: functest-kubernetes-build_tag + parameters: + - random-string: + name: build_tag + +- parameter: name: functest-kubernetes-branch parameters: - string: name: branch default: '{branch}' +- parameter: + name: functest-kubernetes-DEBUG + parameters: + - string: + name: DEBUG + default: 'true' +- parameter: + name: functest-kubernetes-DEPLOY_SCENARIO + parameters: + - string: + name: DEPLOY_SCENARIO + default: k8-nosdn-nofeature-noha + - functest-kubernetes-containers: &functest-kubernetes-containers name: 'functest-kubernetes-containers' repo: '{repo}' @@ -43,16 +62,10 @@ tag: '{tag}' - functest-kubernetes-run-containers: &functest-kubernetes-run-containers - name: 'functest-kubernetes-build-containers' + name: 'functest-kubernetes-run-containers' <<: *functest-kubernetes-containers test: '{test}' -- functest-kubernetes-build-containers: &functest-kubernetes-build-containers - name: 'functest-kubernetes-build-containers' - <<: *functest-kubernetes-containers - ref_arg: '{ref_arg}' - path: '{path}' - - builder: name: functest-kubernetes-pull-containers builders: @@ -68,10 +81,11 @@ docker pull $image - builder: - name: functest-kubernetes-build-containers + name: functest-kubernetes-run-containers builders: - shell: | set +x + [ ! -z "$WORKSPACE" ] && rm -rf $WORKSPACE/* || true if [ "{repo}" = "_" ]; then image={container}:{tag} elif [ "{port}" = "None" ]; then @@ -79,22 +93,26 @@ 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} - docker build $build_arg \ - --pull=false --no-cache --force-rm=true \ - -t $image . + docker run --rm \ + -e S3_ENDPOINT_URL=https://storage.googleapis.com \ + -e S3_DST_URL=s3://artifacts.opnfv.org/functest-kubernetes/$BUILD_TAG/$JOB_NAME-$BUILD_ID \ + -e HTTP_DST_URL=http://artifacts.opnfv.org/functest-kubernetes/$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 DEPLOY_SCENARIO=$DEPLOY_SCENARIO \ + -v /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config \ + -v /home/opnfv/functest-kubernetes/.boto:/root/.boto \ + $image run_tests -t {test} -p -r - builder: - name: functest-kubernetes-run-containers + name: functest-kubernetes-remove-images builders: - shell: | - set +ex - [ ! -z "$WORKSPACE" ] && rm -rf $WORKSPACE/* || true + set +x if [ "{repo}" = "_" ]; then image={container}:{tag} elif [ "{port}" = "None" ]; then @@ -102,18 +120,16 @@ else image={repo}:{port}/{container}:{tag} fi - docker run --rm \ - -e S3_ENDPOINT_URL=https://storage.googleapis.com \ - -e S3_DST_URL=s3://artifacts.opnfv.org/functest-kubernetes/$JOB_NAME-$BUILD_ID \ - -e HTTP_DST_URL=http://artifacts.opnfv.org/functest-kubernetes/$JOB_NAME-$BUILD_ID \ - -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \ - -e DEPLOY_SCENARIO=k8-nosdn-nofeature-noha \ - -v /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config \ - -v /home/opnfv/functest-kubernetes/.boto:/root/.boto \ - $image run_tests -t {test} -p + docker rmi $image || true + +- functest-kubernetes-build-containers: &functest-kubernetes-build-containers + name: 'functest-kubernetes-build-containers' + <<: *functest-kubernetes-containers + ref_arg: '{ref_arg}' + path: '{path}' - builder: - name: functest-kubernetes-remove-images + name: functest-kubernetes-build-containers builders: - shell: | set +x @@ -124,7 +140,15 @@ else image={repo}:{port}/{container}:{tag} fi - docker rmi $image || true + if [ "{ref_arg}" = "None" ]; then + build_arg="" + else + build_arg="--build-arg {ref_arg}={ref}" + fi + cd {path} + docker build $build_arg \ + --pull=false --no-cache --force-rm=true \ + -t $image . - scm: name: functest-kubernetes-scm @@ -186,6 +210,12 @@ parameters: - functest-kubernetes-slave: slave: '{slave}' + - functest-kubernetes-build_tag: + build_tag: '' + - functest-kubernetes-DEBUG: + DEBUG: 'true' + - functest-kubernetes-DEPLOY_SCENARIO: + DEPLOY_SCENARIO: k8-nosdn-nofeature-noha builders: - functest-kubernetes-run-containers: <<: *functest-kubernetes-run-containers @@ -206,13 +236,63 @@ test: - xrally_kubernetes - k8s_conformance - jobs: - - 'functest-kubernetes-{repo}-{container}-{tag}-{test}-run' exclude: - tag: iruya test: xrally_kubernetes - tag: hunter test: xrally_kubernetes + jobs: + - 'functest-kubernetes-{repo}-{container}-{tag}-{test}-run' + + +- builder: + name: functest-kubernetes-zip + builders: + - shell: | + set +x + [ ! -z "$WORKSPACE" ] && rm -rf $WORKSPACE/* || true + if [ "{repo}" = "_" ]; then + image={container}:{tag} + elif [ "{port}" = "None" ]; then + image={repo}/{container}:{tag} + else + image={repo}:{port}/{container}:{tag} + fi + docker run --rm \ + -e S3_ENDPOINT_URL=https://storage.googleapis.com \ + -e S3_DST_URL=s3://artifacts.opnfv.org/functest-kubernetes \ + -e HTTP_DST_URL=http://artifacts.opnfv.org/functest-kubernetes \ + -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 DEPLOY_SCENARIO=$DEPLOY_SCENARIO \ + -v /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config \ + -v /home/opnfv/functest-kubernetes/.boto:/root/.boto \ + $image zip_campaign + +- job-template: + name: 'functest-kubernetes-{tag}-zip' + parameters: + - functest-kubernetes-slave: + slave: '{slave}' + - functest-kubernetes-build_tag: + build_tag: '' + - functest-kubernetes-DEBUG: + DEBUG: 'true' + - functest-kubernetes-DEPLOY_SCENARIO: + DEPLOY_SCENARIO: k8-nosdn-nofeature-noha + builders: + - functest-kubernetes-zip: + <<: *functest-kubernetes-containers + +- project: + name: 'functest-kubernetes-{tag}-zip' + <<: *functest-kubernetes-params + container: 'functest-kubernetes-healthcheck' + jobs: + - 'functest-kubernetes-{tag}-zip' - job-template: name: 'functest-kubernetes-{tag}-daily' @@ -222,6 +302,12 @@ parameters: - functest-kubernetes-slave: slave: '{slave}' + - functest-kubernetes-build_tag: + build_tag: '' + - functest-kubernetes-DEBUG: + DEBUG: 'true' + - functest-kubernetes-DEPLOY_SCENARIO: + DEPLOY_SCENARIO: k8-nosdn-nofeature-noha properties: - build-blocker: use-build-blocker: true @@ -256,6 +342,11 @@ <<: *functest-kubernetes-jobs - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-k8s_conformance-run' <<: *functest-kubernetes-jobs + - multijob: + name: dump all campaign data + projects: + - name: 'functest-kubernetes-{tag}-zip' + <<: *functest-kubernetes-jobs - job-template: name: 'functest-kubernetes-{repo}-{container}-{tag}-gate' @@ -286,21 +377,21 @@ ref: $branch - project: - name: 'functest-kubernetes-_-golang-1.12-alpine3.10-rmi' + name: 'functest-kubernetes-_-golang-1.13-alpine3.11-rmi' repo: _ port: container: golang - tag: '1.12-alpine3.10' + tag: '1.13-alpine3.11' slave: master jobs: - 'functest-kubernetes-{repo}-{container}-{tag}-rmi' - project: - name: 'functest-kubernetes-_-golang-1.12-alpine3.10-pull' + name: 'functest-kubernetes-_-golang-1.13-alpine3.11-pull' repo: _ port: container: golang - tag: '1.12-alpine3.10' + tag: '1.13-alpine3.11' slave: master jobs: - 'functest-kubernetes-{repo}-{container}-{tag}-pull' @@ -341,8 +432,14 @@ parameters: - functest-kubernetes-slave: slave: '{slave}' + - functest-kubernetes-build_tag: + build_tag: '' - functest-kubernetes-branch: branch: '{branch}' + - functest-kubernetes-DEBUG: + DEBUG: 'true' + - functest-kubernetes-DEPLOY_SCENARIO: + DEPLOY_SCENARIO: k8-nosdn-nofeature-noha properties: - build-blocker: use-build-blocker: true @@ -360,12 +457,12 @@ - multijob: name: remove dependencies projects: - - name: 'functest-kubernetes-_-golang-1.12-alpine3.10-rmi' + - name: 'functest-kubernetes-_-golang-1.13-alpine3.11-rmi' <<: *functest-kubernetes-jobs - multijob: name: pull dependencies projects: - - name: 'functest-kubernetes-_-golang-1.12-alpine3.10-pull' + - name: 'functest-kubernetes-_-golang-1.13-alpine3.11-pull' <<: *functest-kubernetes-jobs - multijob: name: build opnfv/functest-kubernetes-core @@ -428,6 +525,12 @@ parameters: - functest-kubernetes-slave: slave: '{slave}' + - functest-kubernetes-build_tag: + build_tag: '' + - functest-kubernetes-DEBUG: + DEBUG: 'true' + - functest-kubernetes-DEPLOY_SCENARIO: + DEPLOY_SCENARIO: k8-nosdn-nofeature-noha properties: - build-blocker: use-build-blocker: true @@ -445,12 +548,12 @@ - multijob: name: remove dependencies projects: - - name: 'functest-kubernetes-_-golang-1.12-alpine3.10-rmi' + - name: 'functest-kubernetes-_-golang-1.13-alpine3.11-rmi' <<: *functest-kubernetes-jobs - multijob: name: pull dependencies projects: - - name: 'functest-kubernetes-_-golang-1.12-alpine3.10-pull' + - name: 'functest-kubernetes-_-golang-1.13-alpine3.11-pull' <<: *functest-kubernetes-jobs - multijob: name: build opnfv/functest-kubernetes-core diff --git a/jjb/functest/functest-project-jobs.yaml b/jjb/functest/functest-project-jobs.yaml index 0a836441b..306c3ca93 100644 --- a/jjb/functest/functest-project-jobs.yaml +++ b/jjb/functest/functest-project-jobs.yaml @@ -4,16 +4,16 @@ tag: - latest: branch: master - slave: lf-virtual9 + slave: lf-virtual1 - jerma: branch: stable/jerma - slave: lf-virtual4 + slave: lf-virtual1 - iruya: branch: stable/iruya - slave: lf-virtual4 + slave: lf-virtual1 - hunter: branch: stable/hunter - slave: lf-virtual6 + slave: lf-virtual1 - builder: name: functest-run-tox diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml index feb672c40..b93be3a4e 100644 --- a/jjb/functest/functest.yaml +++ b/jjb/functest/functest.yaml @@ -14,8 +14,8 @@ dashboard_url: http://172.30.13.94 - 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 @@ -33,6 +33,12 @@ default: '{slave}' - parameter: + name: functest-build_tag + parameters: + - random-string: + name: build_tag + +- parameter: name: functest-branch parameters: - string: @@ -132,21 +138,24 @@ fi sudo docker run --rm \ -e S3_ENDPOINT_URL=https://storage.googleapis.com \ - -e S3_DST_URL=s3://artifacts.opnfv.org/functest/$JOB_NAME-$BUILD_ID \ - -e HTTP_DST_URL=http://artifacts.opnfv.org/functest/$JOB_NAME-$BUILD_ID \ + -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 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 \ -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/blacklist.yaml:/usr/lib/python$py/\ - site-packages/functest/opnfv_tests/openstack/rally/blacklist.yaml \ -v /home/opnfv/functest/.boto:/root/.boto \ - $image run_tests -t {test} -p + $image run_tests -t {test} -r -p - builder: name: functest-remove-images @@ -264,6 +273,8 @@ parameters: - functest-slave: slave: '{slave}' + - functest-build_tag: + build_tag: '' - functest-DEBUG: DEBUG: 'true' - functest-EXTERNAL_NETWORK: @@ -378,6 +389,45 @@ jobs: - 'functest-{repo}-{container}-{tag}-{test}-run' +- builder: + name: functest-zip + builders: + - shell: | + set +x + [ ! -z "$WORKSPACE" ] && rm -rf $WORKSPACE/* || true + if [ "{repo}" = "_" ]; then + image={container}:{tag} + elif [ "{port}" = "None" ]; then + image={repo}/{container}:{tag} + else + image={repo}:{port}/{container}:{tag} + fi + sudo docker run --rm \ + -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 \ + -e TEST_DB_URL=http://testresults.opnfv.org/test/api/v1/results \ + -e BUILD_TAG=$BUILD_TAG \ + -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \ + -v /home/opnfv/functest/.boto:/root/.boto \ + $image zip_campaign + +- job-template: + name: 'functest-{tag}-zip' + parameters: + - functest-build_tag: + build_tag: '' + builders: + - functest-zip: + <<: *functest-containers + +- project: + name: 'functest-{tag}-zip' + <<: *functest-params + container: 'functest-healthcheck' + jobs: + - 'functest-{tag}-zip' + - job-template: name: 'functest-{tag}-daily' project-type: multijob @@ -386,6 +436,8 @@ parameters: - functest-slave: slave: '{slave}' + - functest-build_tag: + build_tag: '' - functest-DEBUG: DEBUG: 'true' - functest-EXTERNAL_NETWORK: @@ -531,6 +583,11 @@ <<: *functest-jobs - name: 'functest-opnfv-functest-vnf-{tag}-juju_epc-run' <<: *functest-jobs + - multijob: + name: dump all campaign data + projects: + - name: 'functest-{tag}-zip' + <<: *functest-jobs - job-template: name: 'functest-{repo}-{container}-{tag}-gate' @@ -561,21 +618,21 @@ ref: $branch - project: - name: 'functest-_-alpine-3.10-rmi' + name: 'functest-_-alpine-3.11-rmi' repo: _ port: container: alpine - tag: '3.10' + tag: '3.11' slave: master jobs: - 'functest-{repo}-{container}-{tag}-rmi' - project: - name: 'functest-_-alpine-3.10-pull' + name: 'functest-_-alpine-3.11-pull' repo: _ port: container: alpine - tag: '3.10' + tag: '3.11' slave: master jobs: - 'functest-{repo}-{container}-{tag}-pull' @@ -659,6 +716,8 @@ parameters: - functest-slave: slave: '{slave}' + - functest-build_tag: + build_tag: '' - functest-branch: branch: '{branch}' - functest-DEBUG: @@ -688,12 +747,12 @@ - multijob: name: remove dependencies projects: - - name: 'functest-_-alpine-3.10-rmi' + - name: 'functest-_-alpine-3.11-rmi' <<: *functest-jobs - multijob: name: pull dependencies projects: - - name: 'functest-_-alpine-3.10-pull' + - name: 'functest-_-alpine-3.11-pull' <<: *functest-jobs - multijob: name: build opnfv/functest-core @@ -862,6 +921,8 @@ parameters: - functest-slave: slave: '{slave}' + - functest-build_tag: + build_tag: '' - functest-DEBUG: DEBUG: 'true' - functest-EXTERNAL_NETWORK: @@ -889,12 +950,12 @@ - multijob: name: remove dependencies projects: - - name: 'functest-_-alpine-3.10-rmi' + - name: 'functest-_-alpine-3.11-rmi' <<: *functest-jobs - multijob: name: pull dependencies projects: - - name: 'functest-_-alpine-3.10-pull' + - name: 'functest-_-alpine-3.11-pull' <<: *functest-jobs - multijob: name: build opnfv/functest-core diff --git a/jjb/functest/xtesting.yaml b/jjb/functest/xtesting.yaml index b34fc100c..44231e432 100644 --- a/jjb/functest/xtesting.yaml +++ b/jjb/functest/xtesting.yaml @@ -29,12 +29,25 @@ default: '{slave}' - parameter: + name: xtesting-build_tag + parameters: + - random-string: + name: build_tag + +- parameter: name: xtesting-branch parameters: - string: name: branch default: '{branch}' +- parameter: + name: xtesting-DEBUG + parameters: + - string: + name: DEBUG + default: 'true' + - xtesting-containers: &xtesting-containers name: 'xtesting-containers' repo: '{repo}' @@ -43,16 +56,10 @@ tag: '{tag}' - xtesting-run-containers: &xtesting-run-containers - name: 'xtesting-build-containers' + name: 'xtesting-run-containers' <<: *xtesting-containers test: '{test}' -- xtesting-build-containers: &xtesting-build-containers - name: 'xtesting-build-containers' - <<: *xtesting-containers - ref_arg: '{ref_arg}' - path: '{path}' - - builder: name: xtesting-pull-containers builders: @@ -68,10 +75,11 @@ sudo docker pull $image - builder: - name: xtesting-build-containers + name: xtesting-run-containers builders: - shell: | set +x + [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/* || true if [ "{repo}" = "_" ]; then image={container}:{tag} elif [ "{port}" = "None" ]; then @@ -79,22 +87,24 @@ 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 . + sudo docker run --rm \ + -e S3_ENDPOINT_URL=https://storage.googleapis.com \ + -e S3_DST_URL=s3://artifacts.opnfv.org/xtesting/$BUILD_TAG/$JOB_NAME-$BUILD_ID \ + -e HTTP_DST_URL=http://artifacts.opnfv.org/xtesting/$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 \ + -v /home/opnfv/xtesting/.boto:/root/.boto \ + $image run_tests -t {test} -p -r - builder: - name: xtesting-run-containers + name: xtesting-remove-images builders: - shell: | set +x - [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/* || true if [ "{repo}" = "_" ]; then image={container}:{tag} elif [ "{port}" = "None" ]; then @@ -102,17 +112,16 @@ else image={repo}:{port}/{container}:{tag} fi - sudo docker run --rm \ - -e S3_ENDPOINT_URL=https://storage.googleapis.com \ - -e S3_DST_URL=s3://artifacts.opnfv.org/xtesting/$JOB_NAME-$BUILD_ID \ - -e HTTP_DST_URL=http://artifacts.opnfv.org/xtesting/$JOB_NAME-$BUILD_ID \ - -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \ - -v /home/opnfv/xtesting/.boto:/root/.boto \ - -e DEBUG=true \ - $image run_tests -t {test} -p + sudo docker rmi $image || true + +- xtesting-build-containers: &xtesting-build-containers + name: 'xtesting-build-containers' + <<: *xtesting-containers + ref_arg: '{ref_arg}' + path: '{path}' - builder: - name: xtesting-remove-images + name: xtesting-build-containers builders: - shell: | set +x @@ -123,7 +132,15 @@ else image={repo}:{port}/{container}:{tag} fi - sudo docker rmi $image || true + 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: xtesting-scm @@ -171,6 +188,10 @@ parameters: - xtesting-slave: slave: '{slave}' + - xtesting-build_tag: + build_tag: '' + - xtesting-DEBUG: + DEBUG: 'true' builders: - xtesting-run-containers: <<: *xtesting-run-containers @@ -194,6 +215,52 @@ jobs: - 'xtesting-{repo}-{container}-{tag}-{test}-run' + +- builder: + name: xtesting-zip + builders: + - shell: | + set +x + [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/* || true + if [ "{repo}" = "_" ]; then + image={container}:{tag} + elif [ "{port}" = "None" ]; then + image={repo}/{container}:{tag} + else + image={repo}:{port}/{container}:{tag} + fi + sudo docker run --rm \ + -e S3_ENDPOINT_URL=https://storage.googleapis.com \ + -e S3_DST_URL=s3://artifacts.opnfv.org/xtesting \ + -e HTTP_DST_URL=http://artifacts.opnfv.org/xtesting \ + -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 \ + -v /home/opnfv/xtesting/.boto:/root/.boto \ + $image zip_campaign + +- job-template: + name: 'xtesting-{tag}-zip' + parameters: + - xtesting-slave: + slave: '{slave}' + - xtesting-build_tag: + build_tag: '' + - xtesting-DEBUG: + DEBUG: 'true' + builders: + - xtesting-zip: + <<: *xtesting-containers + +- project: + name: 'xtesting-{tag}-zip' + <<: *xtesting-params + container: 'xtesting' + jobs: + - 'xtesting-{tag}-zip' + - job-template: name: 'xtesting-{tag}-daily' project-type: multijob @@ -202,6 +269,10 @@ parameters: - xtesting-slave: slave: '{slave}' + - xtesting-build_tag: + build_tag: '' + - xtesting-DEBUG: + DEBUG: 'true' properties: - build-blocker: use-build-blocker: true @@ -234,6 +305,11 @@ <<: *xtesting-jobs - name: 'xtesting-opnfv-xtesting-{tag}-sixth-run' <<: *xtesting-jobs + - multijob: + name: dump all campaign data + projects: + - name: 'xtesting-{tag}-zip' + <<: *xtesting-jobs - job-template: name: 'xtesting-{repo}-{container}-{tag}-gate' @@ -264,21 +340,21 @@ ref: $branch - project: - name: 'xtesting-_-alpine-3.10-rmi' + name: 'xtesting-_-alpine-3.11-rmi' repo: _ port: container: alpine - tag: '3.10' + tag: '3.11' slave: master jobs: - 'xtesting-{repo}-{container}-{tag}-rmi' - project: - name: 'xtesting-_-alpine-3.10-pull' + name: 'xtesting-_-alpine-3.11-pull' repo: _ port: container: alpine - tag: '3.10' + tag: '3.11' slave: master jobs: - 'xtesting-{repo}-{container}-{tag}-pull' @@ -299,8 +375,12 @@ parameters: - xtesting-slave: slave: '{slave}' + - xtesting-build_tag: + build_tag: '' - xtesting-branch: branch: '{branch}' + - xtesting-DEBUG: + DEBUG: 'true' properties: - build-blocker: use-build-blocker: true @@ -316,12 +396,12 @@ - multijob: name: remove dependencies projects: - - name: 'xtesting-_-alpine-3.10-rmi' + - name: 'xtesting-_-alpine-3.11-rmi' <<: *xtesting-jobs - multijob: name: pull dependencies projects: - - name: 'xtesting-_-alpine-3.10-pull' + - name: 'xtesting-_-alpine-3.11-pull' <<: *xtesting-jobs - multijob: name: opnfv/xtesting @@ -376,6 +456,10 @@ parameters: - xtesting-slave: slave: '{slave}' + - xtesting-build_tag: + build_tag: '' + - xtesting-DEBUG: + DEBUG: 'true' properties: - build-blocker: use-build-blocker: true @@ -391,12 +475,12 @@ - multijob: name: remove dependencies projects: - - name: 'xtesting-_-alpine-3.10-rmi' + - name: 'xtesting-_-alpine-3.11-rmi' <<: *xtesting-jobs - multijob: name: pull dependencies projects: - - name: 'xtesting-_-alpine-3.10-pull' + - name: 'xtesting-_-alpine-3.11-pull' <<: *xtesting-jobs - multijob: name: opnfv/xtesting |