From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6940636076695355392 X-Received: by 2002:a17:906:cd05:: with SMTP id oz5mr36474593ejb.345.1615992799378; Wed, 17 Mar 2021 07:53:19 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6402:50cd:: with SMTP id h13ls1543066edb.3.gmail; Wed, 17 Mar 2021 07:53:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy5sSYUD4EAnyn3Ssqw0UUlU9Hji4KmmNwAY4cAnR9NYlR6sKNpsk0Ibt1pg6gIvkNU4Am9 X-Received: by 2002:a05:6402:1691:: with SMTP id a17mr42588492edv.336.1615992798557; Wed, 17 Mar 2021 07:53:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1615992798; cv=none; d=google.com; s=arc-20160816; b=k294sHW07fbLF3A0aGtrz9CiJmQ8bs4bmBTIBljhHxI0uGAYFiT5XwDYHo9ORHzY3t Y1jwmYJDsJFUY22pfH3z3+m2wEm1iuyZGbOFscvKFgcNHDIHMCxZvt9CWKlYF1RdNvCu ZPnB9dAi4OQEN+qQOSGO2vlLb4IWAG4xFFNW0x6ayAK/Bl5/j6FC2SOBVtdGnGzJvkDm wc0f4Z7SaL0Kld9JBGb4SuXFBeEm0X069cVT5sddBadgKnv7VY1JyIGfAXB5bLSVYGLb FDrGQdAKBgzPFuNcElos7o59NLuL2hqGYgY931nCtUj5GxhHilEbFof59STQNLSOesxf AJHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=Dsv1soH5pOtD0SBemJIS/po33GS3e5o0ZaDScKhBsdE=; b=DTcyMY2XAchQWyg+DrH79Sg4hepZEL1BVCjvAx0eqjvrrxbvmOIYn0SXobqTGZxZMW dy/5TJ6MRmuzRCX9+mp6EpItqnif/JxEskF/MvqNsU+F9a1EiPRr6zJ43gratEpBIN1J 8WdxEkVUW3JN88IZfnZNE9q74W7mNfqMcK1jY/bHrldwFkJdslkUQTpimI1fMm9Ey1cr byFuvWD6Wmw/1cjknxGvzOg6aUhpWl2j0koRqX5qCwkCAlop81a4i/yhGKNiNRMqT59h 2YwM99kHLr3iAT0lZG/yHiIRZRK7+noc52PjbiPhQ9gPK4uLuEt88E+8puClrko57KbJ qrXw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id df17si962455edb.3.2021.03.17.07.53.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 17 Mar 2021 07:53:18 -0700 (PDT) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from localhost.localdomain (mm-117-75-121-178.mgts.dynamic.pppoe.byfly.by [178.121.75.117] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 12HEqhaJ032071 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 17 Mar 2021 15:53:17 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v3 10/11] ci_build: Migrate to Avocado Date: Wed, 17 Mar 2021 17:52:24 +0300 Message-Id: <20210317145225.88050-11-amikan@ilbers.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210317145225.88050-1-amikan@ilbers.de> References: <20210317145225.88050-1-amikan@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-TUID: uxNhPN+QG4oV Call Avocado test cases instead of shell based. Signed-off-by: Anton Mikanovich --- scripts/ci_build.sh | 170 ++++---------------------- scripts/ci_build_legacy.sh | 239 +++++++++++++++++++++++++++++++++++++ 2 files changed, 261 insertions(+), 148 deletions(-) create mode 100755 scripts/ci_build_legacy.sh diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh index 3868fb6..9abebb8 100755 --- a/scripts/ci_build.sh +++ b/scripts/ci_build.sh @@ -14,59 +14,12 @@ export PATH=$PATH:/sbin # Go to Isar root cd "$(dirname "$0")/.." +# Get Avocado build tests path +BUILD_TEST_DIR="$(pwd)/testsuite/build_test" + # Start build in Isar tree by default BUILD_DIR=./build -BB_ARGS="-v" - -TARGETS_SET="\ - mc:qemuarm-stretch:isar-image-base \ - mc:qemuarm-buster:isar-image-base \ - mc:qemuarm64-stretch:isar-image-base \ - mc:qemui386-stretch:isar-image-base \ - mc:qemui386-buster:isar-image-base \ - mc:qemuamd64-stretch:isar-image-base \ - mc:qemuamd64-buster:isar-image-base \ - mc:qemuamd64-buster-tgz:isar-image-base \ - mc:qemuamd64-buster:isar-initramfs \ - mc:qemumipsel-stretch:isar-image-base \ - mc:qemumipsel-buster:isar-image-base \ - mc:nand-ubi-demo-buster:isar-image-ubi \ - mc:rpi-stretch:isar-image-base \ - mc:qemuamd64-focal:isar-image-base" - # qemu-user-static of <= buster too old to build that - # mc:qemuarm64-buster:isar-image-base - # mc:qemuarm64-bullseye:isar-image-base - -TARGETS_SET_BULLSEYE="\ - mc:qemuamd64-bullseye:isar-image-base \ - mc:qemuarm-bullseye:isar-image-base \ - mc:qemui386-bullseye:isar-image-base \ - mc:qemumipsel-bullseye:isar-image-base \ -" - -CROSS_TARGETS_SET="\ - mc:qemuarm-stretch:isar-image-base \ - mc:qemuarm-buster:isar-image-base \ - mc:qemuarm64-stretch:isar-image-base \ - mc:qemuamd64-stretch:isar-image-base \ - mc:de0-nano-soc-buster:isar-image-base \ - mc:stm32mp15x-buster:isar-image-base \ - mc:rpi-stretch:isar-image-base \ - mc:qemuarm64-focal:isar-image-base" - -CROSS_TARGETS_SET_BULLSEYE="\ - mc:qemuarm-bullseye:isar-image-base \ -" - -REPRO_TARGETS_SET_SIGNED="\ - mc:de0-nano-soc-buster:isar-image-base \ - mc:qemuarm64-stretch:isar-image-base" - -REPRO_TARGETS_SET="\ - mc:qemuamd64-stretch:isar-image-base \ - mc:qemuarm-buster:isar-image-base" - show_help() { echo "This script builds the default Isar images." echo @@ -88,6 +41,10 @@ show_help() { echo " 3 if invalid parameters are passed." } +TAGS="full" +CROSS_BUILD="0" +QUIET="0" + # Parse command line to get user configuration while [ $# -gt 0 ] do @@ -106,16 +63,18 @@ do CROSS_BUILD="1" ;; -d|--debug) - BB_ARGS="$BB_ARGS -D" + QUIET="0" + VERBOSE="--show-job-log" ;; -f|--fast) # Start build for the reduced set of configurations # Enforce cross-compilation to speed up the build - FAST_BUILD="1" + TAGS="fast" CROSS_BUILD="1" ;; -q|--quiet) - BB_ARGS="" + QUIET="1" + VERBOSE="" ;; -r|--repro) REPRO_BUILD="1" @@ -134,106 +93,21 @@ do shift done +if [ -z "$REPRO_BUILD" ]; then + TAGS = "$TAGS,-repro" +fi + +# Provide working path +export VIRTUAL_ENV="./" + # the real stuff starts here, trace commands from now on set -x # Setup build folder for the current build if [ ! -d "$BUILD_DIR" ]; then - mkdir -p "$BUILD_DIR" + mkdir -p "$BUILD_DIR" fi source isar-init-build-env "$BUILD_DIR" -cat >>conf/local.conf <> conf/local.conf - bitbake $BB_ARGS $REPRO_TARGETS_SET_SIGNED - while [ -e bitbake.sock ]; do sleep 1; done - sudo rm -rf tmp - sed -i -e 's/#ISAR_USE_CACHED_BASE_REPO ?= "1"/ISAR_USE_CACHED_BASE_REPO ?= "1"/g' conf/local.conf - sed -i -e 's/^#BB_NO_NETWORK/BB_NO_NETWORK/g' conf/local.conf - bitbake $BB_ARGS $REPRO_TARGETS_SET_SIGNED - while [ -e bitbake.sock ]; do sleep 1; done - # Cleanup and disable use of signed cached base repository - sudo rm -rf tmp - sed -i -e 's/ISAR_USE_CACHED_BASE_REPO ?= "1"/#ISAR_USE_CACHED_BASE_REPO ?= "1"/g' conf/local.conf - sed -i -e 's/^BB_NO_NETWORK/#BB_NO_NETWORK/g' conf/local.conf - sed -i -e 's/^BASE_REPO_KEY/#BASE_REPO_KEY/g' conf/local.conf - - # Enable use of unsigned cached base repository - bitbake $BB_ARGS $REPRO_TARGETS_SET - while [ -e bitbake.sock ]; do sleep 1; done - sudo rm -rf tmp - sed -i -e 's/#ISAR_USE_CACHED_BASE_REPO ?= "1"/ISAR_USE_CACHED_BASE_REPO ?= "1"/g' conf/local.conf - sed -i -e 's/^#BB_NO_NETWORK/BB_NO_NETWORK/g' conf/local.conf - bitbake $BB_ARGS $REPRO_TARGETS_SET - while [ -e bitbake.sock ]; do sleep 1; done - # Cleanup and disable use of unsigned cached base repository - sudo rm -rf tmp - sed -i -e 's/ISAR_USE_CACHED_BASE_REPO ?= "1"/#ISAR_USE_CACHED_BASE_REPO ?= "1"/g' conf/local.conf - sed -i -e 's/^BB_NO_NETWORK/#BB_NO_NETWORK/g' conf/local.conf -fi - -sed -i -e 's/^#BASE_REPO_FEATURES ?= "cache-deb-src"/BASE_REPO_FEATURES ?= "cache-deb-src"/g' conf/local.conf -# Start cross build for the defined set of configurations -sed -i -e 's/ISAR_CROSS_COMPILE ?= "0"/ISAR_CROSS_COMPILE ?= "1"/g' conf/local.conf -bitbake $BB_ARGS $CROSS_TARGETS_SET -while [ -e bitbake.sock ]; do sleep 1; done -if bitbake $BB_ARGS $CROSS_TARGETS_SET_BULLSEYE; then - echo "bullseye cross: PASSED" -else - echo "bullseye cross: KFAIL" -fi -# In addition test SDK creation -bitbake $BB_ARGS -c do_populate_sdk mc:qemuarm-stretch:isar-image-base -while [ -e bitbake.sock ]; do sleep 1; done - -if [ -z "$FAST_BUILD" ]; then - # Cleanup and disable cross build - sudo rm -rf tmp - sed -i -e 's/ISAR_CROSS_COMPILE ?= "1"/ISAR_CROSS_COMPILE ?= "0"/g' conf/local.conf - bitbake $BB_ARGS $TARGETS_SET - while [ -e bitbake.sock ]; do sleep 1; done - - if bitbake $BB_ARGS $TARGETS_SET_BULLSEYE; then - echo "bullseye: PASSED" - else - echo "bullseye: KFAIL" - fi - while [ -e bitbake.sock ]; do sleep 1; done -fi - -eval $(bitbake -e | grep "^LAYERDIR_core=") -eval $(bitbake -e | grep "^LAYERDIR_isar=") -cp -a "${LAYERDIR_core}/classes/dpkg-base.bbclass" "${LAYERDIR_core}/classes/dpkg-base.bbclass.ci-backup" -echo -e "do_fetch_append() {\n\n}" >> "${LAYERDIR_core}/classes/dpkg-base.bbclass" - -bitbake $BB_ARGS mc:qemuamd64-stretch:isar-image-base - -mv "${LAYERDIR_core}/classes/dpkg-base.bbclass.ci-backup" "${LAYERDIR_core}/classes/dpkg-base.bbclass" - -# Test wic --exclude-path -cp -a "${LAYERDIR_isar}/scripts/lib/wic/canned-wks/sdimage-efi.wks" "${LAYERDIR_isar}/scripts/lib/wic/canned-wks/sdimage-efi.wks.ci-backup" -mv ${BUILDDIR}/tmp/deploy/images/qemuamd64/isar-image-base-debian-stretch-qemuamd64.wic.img \ - ${BUILDDIR}/tmp/deploy/images/qemuamd64/isar-image-base-debian-stretch-qemuamd64.wic.img.ci-backup -sed -i -e 's/part \/ /part \/ --exclude-path usr /g' "${LAYERDIR_isar}/scripts/lib/wic/canned-wks/sdimage-efi.wks" - -bitbake $BB_ARGS mc:qemuamd64-stretch:isar-image-base - -mv "${LAYERDIR_isar}/scripts/lib/wic/canned-wks/sdimage-efi.wks.ci-backup" "${LAYERDIR_isar}/scripts/lib/wic/canned-wks/sdimage-efi.wks" -mv ${BUILDDIR}/tmp/deploy/images/qemuamd64/isar-image-base-debian-stretch-qemuamd64.wic.img.ci-backup \ - ${BUILDDIR}/tmp/deploy/images/qemuamd64/isar-image-base-debian-stretch-qemuamd64.wic.img +avocado run "$BUILD_TEST_DIR/build_test.py" -t $TAGS -p build_dir="$BUILD_DIR" \ + -p quiet=$QUIET -p cross=$CROSS_BUILD $VERBOSE diff --git a/scripts/ci_build_legacy.sh b/scripts/ci_build_legacy.sh new file mode 100755 index 0000000..3868fb6 --- /dev/null +++ b/scripts/ci_build_legacy.sh @@ -0,0 +1,239 @@ +#!/usr/bin/env bash +# Script for CI system build +# +# Alexander Smirnov +# Copyright (c) 2016-2018 ilbers GmbH + +set -e + +ES_BUG=3 + +# Export $PATH to use 'parted' tool +export PATH=$PATH:/sbin + +# Go to Isar root +cd "$(dirname "$0")/.." + +# Start build in Isar tree by default +BUILD_DIR=./build + +BB_ARGS="-v" + +TARGETS_SET="\ + mc:qemuarm-stretch:isar-image-base \ + mc:qemuarm-buster:isar-image-base \ + mc:qemuarm64-stretch:isar-image-base \ + mc:qemui386-stretch:isar-image-base \ + mc:qemui386-buster:isar-image-base \ + mc:qemuamd64-stretch:isar-image-base \ + mc:qemuamd64-buster:isar-image-base \ + mc:qemuamd64-buster-tgz:isar-image-base \ + mc:qemuamd64-buster:isar-initramfs \ + mc:qemumipsel-stretch:isar-image-base \ + mc:qemumipsel-buster:isar-image-base \ + mc:nand-ubi-demo-buster:isar-image-ubi \ + mc:rpi-stretch:isar-image-base \ + mc:qemuamd64-focal:isar-image-base" + # qemu-user-static of <= buster too old to build that + # mc:qemuarm64-buster:isar-image-base + # mc:qemuarm64-bullseye:isar-image-base + +TARGETS_SET_BULLSEYE="\ + mc:qemuamd64-bullseye:isar-image-base \ + mc:qemuarm-bullseye:isar-image-base \ + mc:qemui386-bullseye:isar-image-base \ + mc:qemumipsel-bullseye:isar-image-base \ +" + +CROSS_TARGETS_SET="\ + mc:qemuarm-stretch:isar-image-base \ + mc:qemuarm-buster:isar-image-base \ + mc:qemuarm64-stretch:isar-image-base \ + mc:qemuamd64-stretch:isar-image-base \ + mc:de0-nano-soc-buster:isar-image-base \ + mc:stm32mp15x-buster:isar-image-base \ + mc:rpi-stretch:isar-image-base \ + mc:qemuarm64-focal:isar-image-base" + +CROSS_TARGETS_SET_BULLSEYE="\ + mc:qemuarm-bullseye:isar-image-base \ +" + +REPRO_TARGETS_SET_SIGNED="\ + mc:de0-nano-soc-buster:isar-image-base \ + mc:qemuarm64-stretch:isar-image-base" + +REPRO_TARGETS_SET="\ + mc:qemuamd64-stretch:isar-image-base \ + mc:qemuarm-buster:isar-image-base" + +show_help() { + echo "This script builds the default Isar images." + echo + echo "Usage:" + echo " $0 [params]" + echo + echo "Parameters:" + echo " -b, --build BUILD_DIR set path to build directory. If not set," + echo " the build will be started in current path." + echo " -c, --cross enable cross-compilation." + echo " -d, --debug enable debug bitbake output." + echo " -f, --fast cross build reduced set of configurations." + echo " -q, --quiet suppress verbose bitbake output." + echo " -r, --repro enable use of cached base repository." + echo " --help display this message and exit." + echo + echo "Exit status:" + echo " 0 if OK," + echo " 3 if invalid parameters are passed." +} + +# Parse command line to get user configuration +while [ $# -gt 0 ] +do + key="$1" + + case $key in + -h|--help) + show_help + exit 0 + ;; + -b|--build) + BUILD_DIR="$2" + shift + ;; + -c|--cross) + CROSS_BUILD="1" + ;; + -d|--debug) + BB_ARGS="$BB_ARGS -D" + ;; + -f|--fast) + # Start build for the reduced set of configurations + # Enforce cross-compilation to speed up the build + FAST_BUILD="1" + CROSS_BUILD="1" + ;; + -q|--quiet) + BB_ARGS="" + ;; + -r|--repro) + REPRO_BUILD="1" + # This switch is deprecated, just here to not cause failing CI on + # legacy configs + case "$2" in + -s|--sign) shift ;; + esac + ;; + *) + echo "error: invalid parameter '$key', please try '--help' to get list of supported parameters" + exit $ES_BUG + ;; + esac + + shift +done + +# the real stuff starts here, trace commands from now on +set -x + +# Setup build folder for the current build +if [ ! -d "$BUILD_DIR" ]; then + mkdir -p "$BUILD_DIR" +fi +source isar-init-build-env "$BUILD_DIR" + +cat >>conf/local.conf <> conf/local.conf + bitbake $BB_ARGS $REPRO_TARGETS_SET_SIGNED + while [ -e bitbake.sock ]; do sleep 1; done + sudo rm -rf tmp + sed -i -e 's/#ISAR_USE_CACHED_BASE_REPO ?= "1"/ISAR_USE_CACHED_BASE_REPO ?= "1"/g' conf/local.conf + sed -i -e 's/^#BB_NO_NETWORK/BB_NO_NETWORK/g' conf/local.conf + bitbake $BB_ARGS $REPRO_TARGETS_SET_SIGNED + while [ -e bitbake.sock ]; do sleep 1; done + # Cleanup and disable use of signed cached base repository + sudo rm -rf tmp + sed -i -e 's/ISAR_USE_CACHED_BASE_REPO ?= "1"/#ISAR_USE_CACHED_BASE_REPO ?= "1"/g' conf/local.conf + sed -i -e 's/^BB_NO_NETWORK/#BB_NO_NETWORK/g' conf/local.conf + sed -i -e 's/^BASE_REPO_KEY/#BASE_REPO_KEY/g' conf/local.conf + + # Enable use of unsigned cached base repository + bitbake $BB_ARGS $REPRO_TARGETS_SET + while [ -e bitbake.sock ]; do sleep 1; done + sudo rm -rf tmp + sed -i -e 's/#ISAR_USE_CACHED_BASE_REPO ?= "1"/ISAR_USE_CACHED_BASE_REPO ?= "1"/g' conf/local.conf + sed -i -e 's/^#BB_NO_NETWORK/BB_NO_NETWORK/g' conf/local.conf + bitbake $BB_ARGS $REPRO_TARGETS_SET + while [ -e bitbake.sock ]; do sleep 1; done + # Cleanup and disable use of unsigned cached base repository + sudo rm -rf tmp + sed -i -e 's/ISAR_USE_CACHED_BASE_REPO ?= "1"/#ISAR_USE_CACHED_BASE_REPO ?= "1"/g' conf/local.conf + sed -i -e 's/^BB_NO_NETWORK/#BB_NO_NETWORK/g' conf/local.conf +fi + +sed -i -e 's/^#BASE_REPO_FEATURES ?= "cache-deb-src"/BASE_REPO_FEATURES ?= "cache-deb-src"/g' conf/local.conf +# Start cross build for the defined set of configurations +sed -i -e 's/ISAR_CROSS_COMPILE ?= "0"/ISAR_CROSS_COMPILE ?= "1"/g' conf/local.conf +bitbake $BB_ARGS $CROSS_TARGETS_SET +while [ -e bitbake.sock ]; do sleep 1; done +if bitbake $BB_ARGS $CROSS_TARGETS_SET_BULLSEYE; then + echo "bullseye cross: PASSED" +else + echo "bullseye cross: KFAIL" +fi +# In addition test SDK creation +bitbake $BB_ARGS -c do_populate_sdk mc:qemuarm-stretch:isar-image-base +while [ -e bitbake.sock ]; do sleep 1; done + +if [ -z "$FAST_BUILD" ]; then + # Cleanup and disable cross build + sudo rm -rf tmp + sed -i -e 's/ISAR_CROSS_COMPILE ?= "1"/ISAR_CROSS_COMPILE ?= "0"/g' conf/local.conf + bitbake $BB_ARGS $TARGETS_SET + while [ -e bitbake.sock ]; do sleep 1; done + + if bitbake $BB_ARGS $TARGETS_SET_BULLSEYE; then + echo "bullseye: PASSED" + else + echo "bullseye: KFAIL" + fi + while [ -e bitbake.sock ]; do sleep 1; done +fi + +eval $(bitbake -e | grep "^LAYERDIR_core=") +eval $(bitbake -e | grep "^LAYERDIR_isar=") +cp -a "${LAYERDIR_core}/classes/dpkg-base.bbclass" "${LAYERDIR_core}/classes/dpkg-base.bbclass.ci-backup" +echo -e "do_fetch_append() {\n\n}" >> "${LAYERDIR_core}/classes/dpkg-base.bbclass" + +bitbake $BB_ARGS mc:qemuamd64-stretch:isar-image-base + +mv "${LAYERDIR_core}/classes/dpkg-base.bbclass.ci-backup" "${LAYERDIR_core}/classes/dpkg-base.bbclass" + +# Test wic --exclude-path +cp -a "${LAYERDIR_isar}/scripts/lib/wic/canned-wks/sdimage-efi.wks" "${LAYERDIR_isar}/scripts/lib/wic/canned-wks/sdimage-efi.wks.ci-backup" +mv ${BUILDDIR}/tmp/deploy/images/qemuamd64/isar-image-base-debian-stretch-qemuamd64.wic.img \ + ${BUILDDIR}/tmp/deploy/images/qemuamd64/isar-image-base-debian-stretch-qemuamd64.wic.img.ci-backup +sed -i -e 's/part \/ /part \/ --exclude-path usr /g' "${LAYERDIR_isar}/scripts/lib/wic/canned-wks/sdimage-efi.wks" + +bitbake $BB_ARGS mc:qemuamd64-stretch:isar-image-base + +mv "${LAYERDIR_isar}/scripts/lib/wic/canned-wks/sdimage-efi.wks.ci-backup" "${LAYERDIR_isar}/scripts/lib/wic/canned-wks/sdimage-efi.wks" +mv ${BUILDDIR}/tmp/deploy/images/qemuamd64/isar-image-base-debian-stretch-qemuamd64.wic.img.ci-backup \ + ${BUILDDIR}/tmp/deploy/images/qemuamd64/isar-image-base-debian-stretch-qemuamd64.wic.img -- 2.25.1