diff options
| author | Aníbal Limón <anibal.limon@linaro.org> | 2018-04-12 11:54:29 -0500 |
|---|---|---|
| committer | Anibal Limon <anibal.limon@linaro.org> | 2018-04-16 17:19:57 +0000 |
| commit | d72a724b8b2cc1acd9fbddc3bfdb3944a0478286 (patch) | |
| tree | 679151002ca1e297ff796cb31dfeb0412c690f28 /lt-qcom-linux-integration | |
| parent | 2112f016b14327a8f02389c400401f76fa3bbb34 (diff) | |
lt-qcom-linux-integration/lava-job-definitions: Use LAVA_DEVICE_TYPE instead of MACHINE
We map MACHINE to LAVA_DEVICE_TYPE in the build so since the templates
are for LAVA dosen't make sense to use two different sets of values.
Change-Id: Idbab2763701ea340f1dbf162e79247dd1f4ab187
Signed-off-by: Aníbal Limón <anibal.limon@linaro.org>
Diffstat (limited to 'lt-qcom-linux-integration')
| -rw-r--r-- | lt-qcom-linux-integration/lava-job-definitions/dragonboard-410c/base_template.yaml | 18 | ||||
| -rw-r--r-- | lt-qcom-linux-integration/lava-job-definitions/dragonboard-410c/template.yaml | 8 |
2 files changed, 13 insertions, 13 deletions
diff --git a/lt-qcom-linux-integration/lava-job-definitions/dragonboard-410c/base_template.yaml b/lt-qcom-linux-integration/lava-job-definitions/dragonboard-410c/base_template.yaml index b27699e2c5..3cb2a1739d 100644 --- a/lt-qcom-linux-integration/lava-job-definitions/dragonboard-410c/base_template.yaml +++ b/lt-qcom-linux-integration/lava-job-definitions/dragonboard-410c/base_template.yaml @@ -1,6 +1,6 @@ protocols: lava-lxc: - name: lxc-${MACHINE}-test + name: lxc-${LAVA_DEVICE_TYPE}-test template: debian distribution: debian release: stretch @@ -34,7 +34,7 @@ actions: timeout: minutes: 40 to: download - namespace: ${MACHINE} + namespace: ${LAVA_DEVICE_TYPE} images: boot: url: ${BOOT_URL} @@ -48,16 +48,16 @@ actions: minutes: 30 definitions: - from: inline - name: ${MACHINE}-apply-test-overlay - path: inline/${MACHINE}-apply-test-overlay.yaml + name: ${LAVA_DEVICE_TYPE}-apply-test-overlay + path: inline/${LAVA_DEVICE_TYPE}-apply-test-overlay.yaml repository: metadata: - description: ${MACHINE} apply test overlay + description: ${LAVA_DEVICE_TYPE} apply test overlay format: Lava-Test Test Definition 1.0 - name: ${MACHINE}-apply-test-overlay + name: ${LAVA_DEVICE_TYPE}-apply-test-overlay run: steps: - - overlay_file=/lava-lxc/overlays/${MACHINE}/overlay.tar.gz + - overlay_file=/lava-lxc/overlays/${LAVA_DEVICE_TYPE}/overlay.tar.gz - if [ -f $$overlay_file ] - then - configs_dir=$$(mktemp -d /tmp/configs.XXXX) @@ -93,7 +93,7 @@ actions: timeout: minutes: 40 to: fastboot - namespace: ${MACHINE} + namespace: ${LAVA_DEVICE_TYPE} images: boot: url: lxc:///${LXC_BOOT_FILE} @@ -106,7 +106,7 @@ actions: minutes: 2 - boot: - namespace: ${MACHINE} + namespace: ${LAVA_DEVICE_TYPE} prompts: - 'linaro-test .*#' timeout: diff --git a/lt-qcom-linux-integration/lava-job-definitions/dragonboard-410c/template.yaml b/lt-qcom-linux-integration/lava-job-definitions/dragonboard-410c/template.yaml index fd44386e73..df0dfeeffd 100644 --- a/lt-qcom-linux-integration/lava-job-definitions/dragonboard-410c/template.yaml +++ b/lt-qcom-linux-integration/lava-job-definitions/dragonboard-410c/template.yaml @@ -1,5 +1,5 @@ - test: - namespace: ${MACHINE} + namespace: ${LAVA_DEVICE_TYPE} name: qcomlt-linux-integration-smoke timeout: minutes: 5 @@ -23,7 +23,7 @@ - echo "linux_integration_smoke:" "pass" - test: - namespace: ${MACHINE} + namespace: ${LAVA_DEVICE_TYPE} name: qcomlt-linux-integration-bootrr timeout: minutes: 5 @@ -38,7 +38,7 @@ name: qcomlt-linux-integration-bootrr run: steps: - - if [ "${MACHINE}" == "dragonboard410c" ]; then + - if [ "${LAVA_DEVICE_TYPE}" == "dragonboard-410c" ]; then - qcom,apq8016-sbc - fi @@ -56,4 +56,4 @@ visibility: public metadata: source: https://git.linaro.org/ci/job/configs.git - path: lt-qcom-linux-integration/lava-job-definitions/template.yaml + path: lt-qcom-linux-integration/lava-job-definitions/${LAVA_DEVICE_TYPE}/template.yaml |