summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Konovalov <andrey.konovalov@linaro.org>2014-10-16 21:43:05 +0400
committerAndrey Konovalov <andrey.konovalov@linaro.org>2014-10-16 21:43:05 +0400
commit591dbb6d0db749d71758667b28d05c497b267c76 (patch)
treed29d30ebed9516d47fb8667c5be1780eedd36703
parentf8c756c54aab35fd3cd21efa220c9d956ce84415 (diff)
downloadlinux-linaro-kernel-ci-591dbb6d0db749d71758667b28d05c497b267c76.tar.gz
vexpress64: switch from minimal to lamp rootfs
minimal rootfs doesn't have LTP. Signed-off-by: Andrey Konovalov <andrey.konovalov@linaro.org>
-rw-r--r--job-template.json2
-rwxr-xr-xll-ci.sh6
2 files changed, 4 insertions, 4 deletions
diff --git a/job-template.json b/job-template.json
index 60d80bb..2e162a0 100644
--- a/job-template.json
+++ b/job-template.json
@@ -7,7 +7,7 @@
"hwpack.build": "%%BUILD_NUMBER%%",
"hwpack.type": "%%hwpack%%",
"rootfs.build": "%%ROOTFS_BUILD_NUMBER%%",
- "rootfs.type": "minimal-armv8"
+ "rootfs.type": "lamp-armv8"
},
"parameters": {
"hwpack": "http://snapshots.linaro.org/kernel-hwpack/linux-linaro-tracking-ll-%%hwpack%%/%%BUILD_NUMBER%%/%%HWPACK_FILENAME%%",
diff --git a/ll-ci.sh b/ll-ci.sh
index 256ab9a..3f63313 100755
--- a/ll-ci.sh
+++ b/ll-ci.sh
@@ -121,9 +121,9 @@ case "${hwpack}" in
echo "DEVICE_TYPE=${device_type}" > post_build_lava_parameters
echo "CUSTOM_JSON_URL=${BUILD_URL}/artifact/custom_lava_job_definition.json" >> post_build_lava_parameters
# generate custom json file
- ROOTFS_BUILD_NUMBER=`wget -q --no-check-certificate -O - https://ci.linaro.org/jenkins/job/openembedded-armv8-rootfs/gcc_version=4.9,label=build,rootfs=minimal/lastSuccessfulBuild/buildNumber`
- ROOTFS_BUILD_TIMESTAMP=`wget -q --no-check-certificate -O - https://ci.linaro.org/jenkins/job/openembedded-armv8-rootfs/gcc_version=4.9,label=build,rootfs=minimal/lastSuccessfulBuild/buildTimestamp?format=yyyyMMdd`
- ROOTFS_BUILD_URL="http://snapshots.linaro.org/openembedded/images/minimal-armv8-gcc-4.9/${ROOTFS_BUILD_NUMBER}/linaro-image-minimal-genericarmv8-${ROOTFS_BUILD_TIMESTAMP}-${ROOTFS_BUILD_NUMBER}.rootfs.tar.gz"
+ ROOTFS_BUILD_NUMBER=`wget -q --no-check-certificate -O - https://ci.linaro.org/jenkins/job/openembedded-armv8-rootfs/gcc_version=4.9,label=build,rootfs=lamp/lastSuccessfulBuild/buildNumber`
+ ROOTFS_BUILD_TIMESTAMP=`wget -q --no-check-certificate -O - https://ci.linaro.org/jenkins/job/openembedded-armv8-rootfs/gcc_version=4.9,label=build,rootfs=lamp/lastSuccessfulBuild/buildTimestamp?format=yyyyMMdd`
+ ROOTFS_BUILD_URL="http://snapshots.linaro.org/openembedded/images/lamp-armv8-gcc-4.9/${ROOTFS_BUILD_NUMBER}/linaro-image-lamp-genericarmv8-${ROOTFS_BUILD_TIMESTAMP}-${ROOTFS_BUILD_NUMBER}.rootfs.tar.gz"
hwpack_filename=`ls hwpack_linaro-${hwpack}*.tar.gz`
sed -e "s|%%BUILD_NUMBER%%|${BUILD_NUMBER}|" \
-e "s|%%hwpack%%|${hwpack}|" \