diff options
| author |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2021-01-05 14:14:59 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@automotivelinux.org> | 2021-01-05 14:14:59 +0000 |
| commit | aab6972696c3328dea5a380b9b78df9f9d9c3fd1 (patch) | |
| tree | de3e3ee572cf3e17ff83cdd1fafa1f924967e152 /jjb/common | |
| parent | 503579a0e8c0b9cc13355ba73e2a3580ce48f1fc (diff) | |
| parent | 9f29f1da6e6ecdcf4845e9e25ba8f420ef2e5891 (diff) | |
Merge "SPEC-3751: workaround absence of ext4.xz images"
Diffstat (limited to 'jjb/common')
| -rw-r--r-- | jjb/common/include-agl-run-test-rsync-changeid.sh | 12 | ||||
| -rw-r--r-- | jjb/common/include-agl-run-test-rsync-release.sh | 13 |
2 files changed, 25 insertions, 0 deletions
diff --git a/jjb/common/include-agl-run-test-rsync-changeid.sh b/jjb/common/include-agl-run-test-rsync-changeid.sh index 41fe2b48..2568992f 100644 --- a/jjb/common/include-agl-run-test-rsync-changeid.sh +++ b/jjb/common/include-agl-run-test-rsync-changeid.sh @@ -37,6 +37,18 @@ do cp -avL tmp/deploy/images/${TARGETMACHINE}/build-info ${DEST}/ fi + # detect BUG SPEC-3751 + F_NBDROOT="tmp/deploy/images/${TARGETMACHINE}/$DEVICE_NBDROOT" + if [ ! -e "$F_NBDROOT" ];then + NOXZ=$(echo "$F_NBDROOT" | sed 's,.xz$,,') + if [ ! -e "$NOXZ" ];then + echo "ERROR: cannot recovery from SPEC-3751, $NOXZ does not exists" + else + echo "DEBUG: xz $NOXZ to $F_NBDROOT" + xz --threads=0 --stdout "$NOXZ" > "$F_NBDROOT" + fi + fi + # copy files to $DEST (only if variable is non-empty) for i in DEVICE_DTB DEVICE_KERNEL DEVICE_INITRAMFS DEVICE_NBDROOT; do FILE=$(eval echo \$${i}) diff --git a/jjb/common/include-agl-run-test-rsync-release.sh b/jjb/common/include-agl-run-test-rsync-release.sh index 7be8bfa3..dfdffe77 100644 --- a/jjb/common/include-agl-run-test-rsync-release.sh +++ b/jjb/common/include-agl-run-test-rsync-release.sh @@ -29,6 +29,19 @@ for board in $(ls $BOARDOUT) do # copy files to $DEST . $BOARDOUT/$board/info + + # detect BUG SPEC-3751 + F_NBDROOT="tmp/deploy/images/${TARGETMACHINE}/$DEVICE_NBDROOT" + if [ ! -e "$F_NBDROOT" ];then + NOXZ=$(echo "$F_NBDROOT" | sed 's,.xz$,,') + if [ ! -e "$NOXZ" ];then + echo "ERROR: cannot recovery from SPEC-3751, $NOXZ does not exists" + else + echo "DEBUG: xz $NOXZ to $F_NBDROOT" + xz --threads=0 --stdout "$NOXZ" > "$F_NBDROOT" + fi + fi + echo "INFO: copy artifact for $x_releng_device/$x_lava_device" for i in DEVICE_DTB DEVICE_KERNEL DEVICE_INITRAMFS DEVICE_NBDROOT; do eval cp -avL tmp/deploy/images/${TARGETMACHINE}/$(echo "$"${i}) ${DEST}/ |