diff options
| author |   Cedric Ollivier <cedric.ollivier@orange.com> | 2019-12-22 15:40:38 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2019-12-22 15:40:38 +0000 |
| commit | 554c5718626bd1bceb26e7036a6463bd85576f64 (patch) | |
| tree | 0772c4574ea599dbf9e06466d15b7b8db769db03 | |
| parent | 64ebe7a4dacc921620421b93c245870b88ae6b5b (diff) | |
| parent | b1748c03ac27750ad422041f46dc88727e6f3a14 (diff) | |
Merge "Dump all logs as last steps"
| -rw-r--r-- | jjb/airship/airship.yaml | 44 | ||||
| -rw-r--r-- | jjb/airship/cntt.yaml | 44 |
2 files changed, 88 insertions, 0 deletions
diff --git a/jjb/airship/airship.yaml b/jjb/airship/airship.yaml index 21cc45df8..b343e80a8 100644 --- a/jjb/airship/airship.yaml +++ b/jjb/airship/airship.yaml @@ -325,6 +325,45 @@ jobs: - 'airship-{repo}-{container}-{tag}-{test}-run' +- builder: + name: airship-zip + builders: + - shell: | + set +x + [ ! -z "$WORKSPACE" ] && rm -rf $WORKSPACE/* || true + if [ "{repo}" = "_" ]; then + image={container}:{functest_tag} + elif [ "{port}" = "None" ]; then + image={repo}/{container}:{functest_tag} + else + image={repo}:{port}/{container}:{functest_tag} + fi + docker run --rm \ + -e S3_ENDPOINT_URL=https://storage.googleapis.com \ + -e S3_DST_URL=s3://artifacts.opnfv.org/airship \ + -e HTTP_DST_URL=http://artifacts.opnfv.org/airship/ \ + -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 \ + $image zip_campaign + +- job-template: + name: 'airship-{tag}-zip' + parameters: + - airship-build_tag: + build_tag: '' + builders: + - airship-zip: + <<: *airship-containers + +- project: + name: 'airship-{tag}-zip' + <<: *airship-params + container: 'functest-healthcheck' + jobs: + - 'airship-{tag}-zip' + - job-template: name: 'airship-{tag}-daily' project-type: multijob @@ -460,6 +499,11 @@ <<: *airship-jobs - name: 'airship-opnfv-functest-vnf-{tag}-juju_epc-run' <<: *airship-jobs + - multijob: + name: dump all campaign data + projects: + - name: 'airship-{tag}-zip' + <<: *airship-jobs - trigger: name: airship-patchset-created diff --git a/jjb/airship/cntt.yaml b/jjb/airship/cntt.yaml index f39ea4223..94cfd4bf0 100644 --- a/jjb/airship/cntt.yaml +++ b/jjb/airship/cntt.yaml @@ -352,6 +352,45 @@ jobs: - 'cntt-{repo}-{container}-{tag}-{test}-run' +- builder: + name: cntt-zip + builders: + - shell: | + set +x + [ ! -z "$WORKSPACE" ] && rm -rf $WORKSPACE/* || true + if [ "{repo}" = "_" ]; then + image={container}:{functest_tag} + elif [ "{port}" = "None" ]; then + image={repo}/{container}:{functest_tag} + else + image={repo}:{port}/{container}:{functest_tag} + fi + docker run --rm \ + -e S3_ENDPOINT_URL=https://storage.googleapis.com \ + -e S3_DST_URL=s3://artifacts.opnfv.org/airship \ + -e HTTP_DST_URL=http://artifacts.opnfv.org/airship/ \ + -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 \ + $image zip_campaign + +- job-template: + name: 'cntt-{tag}-zip' + parameters: + - cntt-build_tag: + build_tag: '' + builders: + - cntt-zip: + <<: *cntt-containers + +- project: + name: 'cntt-{tag}-zip' + <<: *cntt-params + container: 'functest-healthcheck' + jobs: + - 'cntt-{tag}-zip' + - job-template: name: 'cntt-{tag}-daily' project-type: multijob @@ -509,6 +548,11 @@ <<: *cntt-jobs - name: 'cntt-opnfv-functest-vnf-{tag}-juju_epc-run' <<: *cntt-jobs + - multijob: + name: dump all campaign data + projects: + - name: 'cntt-{tag}-zip' + <<: *cntt-jobs - trigger: name: cntt-patchset-created |