aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArd Biesheuvel <ard.biesheuvel@linaro.org>2015-04-22 14:04:35 +0200
committerArd Biesheuvel <ard.biesheuvel@linaro.org>2015-04-22 14:04:35 +0200
commit8b45ddc3a0408b6ea1a8800947689809c7d2bebc (patch)
tree181ca9a72549c7c925f5eed7f4eb6c124ca4570a
parent900fe09ba03742e025380a44ec0f3448070950bf (diff)
leg-virt-tianocore: use common convention for lava template naming
Also fix a type in the DEVICE_TYPE assignment Change-Id: I37dc16e3a2f9887a265903dcddb34f58335766c1 Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
-rw-r--r--leg-virt-tiancore-edk2-upstream.yaml4
-rw-r--r--leg-virt-tiancore-edk2-upstream/lava-job-definitions/mustang/template.json (renamed from leg-virt-tiancore-edk2-upstream/lava-job-definitions/xen/template.json)0
2 files changed, 2 insertions, 2 deletions
diff --git a/leg-virt-tiancore-edk2-upstream.yaml b/leg-virt-tiancore-edk2-upstream.yaml
index a31302a2ce..43b1b607ed 100644
--- a/leg-virt-tiancore-edk2-upstream.yaml
+++ b/leg-virt-tiancore-edk2-upstream.yaml
@@ -103,9 +103,9 @@
${HOME}/bin/linaro-cp out components/kernel/${JOB_NAME}/${BUILD_NUMBER}
- shell: |
- DEVICE_TYPE-mustang
+ DEVICE_TYPE=mustang
XEN_EFI_URL=https://snapshots.linaro.org/components/kernel/${JOB_NAME}/${BUILD_NUMBER}/AARCH64/RELEASE/XEN_EFI.fd
- TEMPLATE=https://git.linaro.org/ci/job/configs.git/blob_plain/HEAD:/leg-virt-tiancore-edk2-upstream/lava-job-definitions/xen/template.json
+ TEMPLATE=https://git.linaro.org/ci/job/configs.git/blob_plain/HEAD:/leg-virt-tiancore-edk2-upstream/lava-job-definitions/${DEVICE_TYPE}/template.json
wget -O - -q --no-check-certificate $TEMPLATE | \
sed -e "s|\${BUILD_URL}|${BUILD_URL}|" \
diff --git a/leg-virt-tiancore-edk2-upstream/lava-job-definitions/xen/template.json b/leg-virt-tiancore-edk2-upstream/lava-job-definitions/mustang/template.json
index 9ebd44b058..9ebd44b058 100644
--- a/leg-virt-tiancore-edk2-upstream/lava-job-definitions/xen/template.json
+++ b/leg-virt-tiancore-edk2-upstream/lava-job-definitions/mustang/template.json