Re: [PATCHv2 1/2] ci: always test signed and unsigned repo builds

[Henning Schild <henning.schild@siemens.com>]

diff to v1:
 - just ignore the "-s" for "legacy" CI
 - update gitlab-ci config

Henning

On Fri, 15 Nov 2019 18:21:38 +0100
Henning Schild <henning.schild@siemens.com> wrote:

> From: Henning Schild <henning.schild@siemens.com>
> 
> Just split the target set we had into two. Test the first signed and
> the other one unsigned.
> 
> Signed-off-by: Henning Schild <henning.schild@siemens.com>
> ---
>  .gitlab-ci.yml      |  2 +-
>  scripts/ci_build.sh | 42 +++++++++++++++++++++++++++---------------
>  2 files changed, 28 insertions(+), 16 deletions(-)
> 
> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
> index dd6e12b..1437bd7 100644
> --- a/.gitlab-ci.yml
> +++ b/.gitlab-ci.yml
> @@ -32,7 +32,7 @@ full-ci:
>      - PREVIOUS_SHA="$(cat .CI_COMMIT_SHA || true)"
>      - if [ "$CI_COMMIT_SHA" != "$PREVIOUS_SHA" ]; then
>            echo "$CI_COMMIT_SHA" > .CI_COMMIT_SHA;
> -          scripts/ci_build.sh -q -c -r -s;
> +          scripts/ci_build.sh -q -c -r;
>        fi
>    cache:
>      key: "$CI_COMMIT_REF_SLUG"
> diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh
> index ecaa88a..8707a71 100755
> --- a/scripts/ci_build.sh
> +++ b/scripts/ci_build.sh
> @@ -50,13 +50,14 @@ CROSS_TARGETS_SET="\
>                    mc:de0-nano-soc-stretch:isar-image-base \
>                    mc:rpi-stretch:isar-image-base"
>  
> -REPRO_TARGETS_SET="\
> +REPRO_TARGETS_SET_SIGNED="\
>              mc:qemuarm-stretch:isar-image-base \
> -            mc:qemuarm64-stretch: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
> @@ -70,7 +71,7 @@ show_help() {
>      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 [-s, --sign] enable use of cached base
> repository with optional signing."
> +    echo "    -r, --repro              enable use of cached base
> repository." echo "    --help                   display this message
> and exit." echo
>      echo "Exit status:"
> @@ -109,9 +110,10 @@ do
>          ;;
>      -r|--repro)
>          REPRO_BUILD="1"
> -        case "$2" in
> -        -s|--sign) SIGN_REPO='1'; shift ;;
> -        esac
> +	# 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" @@ -133,13 +135,24 @@ if [ -n
> "$CROSS_BUILD" ]; then fi
>  
>  if [ -n "$REPRO_BUILD" ]; then
> -    if [ -n "$SIGN_REPO" ]; then
> -
> ISAR_TESTSUITE_GPG_PUB_KEY_FILE="$ISARROOT/testsuite/base-apt/test_pub.key"
> -
> ISAR_TESTSUITE_GPG_PRIV_KEY_FILE="$ISARROOT/testsuite/base-apt/test_priv.key"
> -        export GNUPGHOME=$(mktemp -d)
> -        gpg --import $ISAR_TESTSUITE_GPG_PUB_KEY_FILE
> $ISAR_TESTSUITE_GPG_PRIV_KEY_FILE
> -        echo
> BASE_REPO_KEY=\"file://$ISAR_TESTSUITE_GPG_PUB_KEY_FILE\" >>
> conf/local.conf
> -    fi
> +
> ISAR_TESTSUITE_GPG_PUB_KEY_FILE="$ISARROOT/testsuite/base-apt/test_pub.key"
> +
> ISAR_TESTSUITE_GPG_PRIV_KEY_FILE="$ISARROOT/testsuite/base-apt/test_priv.key"
> +    export GNUPGHOME=$(mktemp -d)
> +    gpg --import $ISAR_TESTSUITE_GPG_PUB_KEY_FILE
> $ISAR_TESTSUITE_GPG_PRIV_KEY_FILE
> +    
> +    # Enable use of cached base repository
> +    echo BASE_REPO_KEY=\"file://$ISAR_TESTSUITE_GPG_PUB_KEY_FILE\"
> >> conf/local.conf
> +    bitbake $BB_ARGS -c cache_base_repo $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
> +    bitbake $BB_ARGS $REPRO_TARGETS_SET_SIGNED
> +    while [ -e bitbake.sock ]; do sleep 1; done
> +    # Cleanup and disable use of 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/^BASE_REPO_KEY/#BASE_REPO_KEY/g' conf/local.conf
> +
>      # Enable use of cached base repository
>      bitbake $BB_ARGS -c cache_base_repo $REPRO_TARGETS_SET
>      while [ -e bitbake.sock ]; do sleep 1; done
> @@ -150,7 +163,6 @@ if [ -n "$REPRO_BUILD" ]; then
>      # Cleanup and disable use of 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/^BASE_REPO_KEY/#BASE_REPO_KEY/g' conf/local.conf
>  fi
>  
>  sed -i -e 's/#IMAGE_INSTALL +=
> "isar-disable-apt-cache"/IMAGE_INSTALL += "isar-disable-apt-cache"/g'
> conf/local.conf