From 2719d8a8e4793c8dc8b7bb3985e05d229ac48ea1 Mon Sep 17 00:00:00 2001 From: Sven Dowideit Date: Fri, 21 Jul 2017 01:15:14 +0000 Subject: [PATCH] oh, that's why we're quietly skipping the integration tests Signed-off-by: Sven Dowideit --- scripts/integration-test | 2 +- scripts/release | 19 +++++++++++++------ 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/scripts/integration-test b/scripts/integration-test index 1b27cf6e..2191e46a 100755 --- a/scripts/integration-test +++ b/scripts/integration-test @@ -1,6 +1,6 @@ #!/bin/bash # help: Run integration tests -set -e +set -ex if [ "$INTEGRATION_TESTS" = 0 ]; then exit 0 diff --git a/scripts/release b/scripts/release index 18b0aaf1..014eb8d1 100755 --- a/scripts/release +++ b/scripts/release @@ -5,7 +5,6 @@ cd $(dirname $0)/.. source ./scripts/version export REPO_VERSION=$VERSION export COMPRESS="xz --format=lzma -9 --memlimit-compress=80% -e" -export INTEGRATION_TESTS=0 ./scripts/ci @@ -14,12 +13,20 @@ echo PREPARE ./scripts/prepare echo PACKAGE ./scripts/package -echo INTEGRATION-TEST -./scripts/integration-test +if [[ "$ARCH" == "" || "$ARCH" == "amd64" ]]; then + export INTEGRATION_TESTS=1 + echo INTEGRATION-TEST + ./scripts/integration-test +else + export INTEGRATION_TESTS=0 + echo "Skipping integration tests" +fi -# make generated changelog -lastrelease=$(hub release | grep -v rc | head -n1 | tr -d ' \r\n') -git log --format="%s: %b" ${lastrelease}..${VERSION} | grep "Merge pull" | sed 's/.*\(#.*\) from .*:\(.*\)/* \1: \2/g' > dist/artifacts/changelog.txt +if [[ "$ARCH" == "" || "$ARCH" == "amd64" ]]; then + # make generated changelog + lastrelease=$(hub release | grep -v rc | head -n1 | tr -d ' \r\n') + git log --format="%s: %b" ${lastrelease}..${VERSION} | grep "Merge pull" | sed 's/.*\(#.*\) from .*:\(.*\)/* \1: \2/g' > dist/artifacts/changelog.txt +fi CHECKSUM="dist/checksums.txt" rm -f $CHECKSUM