diff options
| -rw-r--r-- | odp-armv7a-debian-validation-test-definitions.yaml | 7 | ||||
| -rw-r--r-- | odp-armv8-debian-validation-test-definitions.yaml | 7 | ||||
| -rw-r--r-- | odp-debian-validation.yaml | 14 | ||||
| -rw-r--r-- | odp-x86-64-debian-validation-test-definitions.yaml | 7 |
4 files changed, 25 insertions, 10 deletions
diff --git a/odp-armv7a-debian-validation-test-definitions.yaml b/odp-armv7a-debian-validation-test-definitions.yaml index 4c9f2d1cdd..28e9ef1bd4 100644 --- a/odp-armv7a-debian-validation-test-definitions.yaml +++ b/odp-armv7a-debian-validation-test-definitions.yaml @@ -19,10 +19,13 @@ default: 'lng.validation.linaro.org/RPC2/' - string: name: PUB_DEST - default: 'http://snapshots.linaro.org/debian/images/odp/armv7a-validation/' + default: 'http://snapshots.linaro.org/debian/images/odp/armv7a-' - string: name: UPSTREAM_BUILD_NUMBER default: '1' + - string: + name: UPSTREAM_TEST + default: 'vald' disabled: false node: master display-name: 'ODP Debian validation (armv7a) - Submit LAVA test definitions' @@ -33,7 +36,7 @@ cat << EOF > post_build_lava_parameters DEVICE_TYPE=arndale BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME} - CUSTOM_JSON_URL=${PUB_DEST}/${UPSTREAM_BUILD_NUMBER}/lava/template-base.json + CUSTOM_JSON_URL=${PUB_DEST}${UPSTREAM_TEST}/${UPSTREAM_BUILD_NUMBER}/lava/template-base.json LAVA_SERVER=${LAVA_SERVER} EOF - trigger-builds: diff --git a/odp-armv8-debian-validation-test-definitions.yaml b/odp-armv8-debian-validation-test-definitions.yaml index 8ccd01ac91..0332bc9ada 100644 --- a/odp-armv8-debian-validation-test-definitions.yaml +++ b/odp-armv8-debian-validation-test-definitions.yaml @@ -19,10 +19,13 @@ default: 'lng.validation.linaro.org/RPC2/' - string: name: PUB_DEST - default: 'http://snapshots.linaro.org/debian/images/odp/armv8-validation/' + default: 'http://snapshots.linaro.org/debian/images/odp/armv8-' - string: name: UPSTREAM_BUILD_NUMBER default: '1' + - string: + name: UPSTREAM_TEST + default: 'vald' disabled: false node: master display-name: 'ODP Debian validation (armv8) - Submit LAVA test definitions' @@ -33,7 +36,7 @@ cat << EOF > post_build_lava_parameters DEVICE_TYPE=juno BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME} - CUSTOM_JSON_URL=${PUB_DEST}/${UPSTREAM_BUILD_NUMBER}/lava/template-base.json + CUSTOM_JSON_URL=${PUB_DEST}${UPSTREAM_TEST}/${UPSTREAM_BUILD_NUMBER}/lava/template-base.json LAVA_SERVER=${LAVA_SERVER} EOF - trigger-builds: diff --git a/odp-debian-validation.yaml b/odp-debian-validation.yaml index 5150302b53..76bb7004d1 100644 --- a/odp-debian-validation.yaml +++ b/odp-debian-validation.yaml @@ -146,7 +146,7 @@ wget https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py time python ${HOME}/bin/linaro-cp.py \ --api_version 3 \ - --link-latest ${WORKSPACE}/out debian/images/odp/${arch}-validation/${BUILD_NUMBER} + --link-latest ${WORKSPACE}/out debian/images/odp/${arch}-${test}/${BUILD_NUMBER} - inject: properties-file: post_build_lava_parameters - conditional-step: @@ -156,7 +156,9 @@ steps: - trigger-builds: - project: 'odp-armv7a-debian-validation-test-definitions' - predefined-parameters: UPSTREAM_BUILD_NUMBER=${BUILD_NUMBER} + predefined-parameters: | + UPSTREAM_BUILD_NUMBER=${BUILD_NUMBER} + UPSTREAM_TEST=${test} block: true - conditional-step: condition-kind: strings-match @@ -165,7 +167,9 @@ steps: - trigger-builds: - project: 'odp-armv8-debian-validation-test-definitions' - predefined-parameters: UPSTREAM_BUILD_NUMBER=${BUILD_NUMBER} + predefined-parameters: | + UPSTREAM_BUILD_NUMBER=${BUILD_NUMBER} + UPSTREAM_TEST=${test} block: true - conditional-step: condition-kind: strings-match @@ -174,7 +178,9 @@ steps: - trigger-builds: - project: 'odp-x86-64-debian-validation-test-definitions' - predefined-parameters: UPSTREAM_BUILD_NUMBER=${BUILD_NUMBER} + predefined-parameters: | + UPSTREAM_BUILD_NUMBER=${BUILD_NUMBER} + UPSTREAM_TEST=${test} block: true publishers: - email: diff --git a/odp-x86-64-debian-validation-test-definitions.yaml b/odp-x86-64-debian-validation-test-definitions.yaml index 157a9ee367..44eab4cc8d 100644 --- a/odp-x86-64-debian-validation-test-definitions.yaml +++ b/odp-x86-64-debian-validation-test-definitions.yaml @@ -19,10 +19,13 @@ default: 'lng.validation.linaro.org/RPC2/' - string: name: PUB_DEST - default: 'http://snapshots.linaro.org/debian/images/odp/x86_64-validation/' + default: 'http://snapshots.linaro.org/debian/images/odp/x86_64-' - string: name: UPSTREAM_BUILD_NUMBER default: '1' + - string: + name: UPSTREAM_TEST + default: 'vald' disabled: false node: master display-name: 'ODP Debian validation (x86-64) - Submit LAVA test definitions' @@ -33,7 +36,7 @@ cat << EOF > post_build_lava_parameters DEVICE_TYPE=x86 BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME} - CUSTOM_JSON_URL=${PUB_DEST}/${UPSTREAM_BUILD_NUMBER}/lava/template-base.json + CUSTOM_JSON_URL=${PUB_DEST}${UPSTREAM_TEST}/${UPSTREAM_BUILD_NUMBER}/lava/template-base.json LAVA_SERVER=${LAVA_SERVER} EOF - trigger-builds: |