From fa633b2825d9b26d719b4e792f4ec8b24aa52cf5 Mon Sep 17 00:00:00 2001 From: Michal Berger Date: Wed, 15 Mar 2023 11:52:05 +0100 Subject: [PATCH] autopackage: Move packaging test to autobuild Signed-off-by: Michal Berger Change-Id: Ifbe4d98f3d7a4b9970f923acd6d299d9cc02d350 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/17206 Tested-by: SPDK CI Jenkins Reviewed-by: Konrad Sztyber Reviewed-by: Jim Harris --- autopackage.sh | 17 ++--------------- test/common/autobuild_common.sh | 4 ++++ 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/autopackage.sh b/autopackage.sh index d3add0af0..931c040f1 100755 --- a/autopackage.sh +++ b/autopackage.sh @@ -4,21 +4,8 @@ # All rights reserved. # -set -e - -# If the configuration of tests is not provided, no tests will be carried out. -if [[ ! -f $1 ]]; then - echo "ERROR: SPDK test configuration not specified" - exit 1 -fi - -source "$1" - rootdir=$(readlink -f $(dirname $0)) -testdir=$rootdir # to get the storage space for tests -source "$rootdir/test/common/autotest_common.sh" - -out=$PWD +source "$rootdir/test/common/autobuild_common.sh" MAKEFLAGS=${MAKEFLAGS:--j16} cd $rootdir @@ -36,7 +23,7 @@ fi timing_exit porcelain_check if [[ $SPDK_TEST_RELEASE_BUILD -eq 1 ]]; then - run_test "packaging" $rootdir/test/packaging/packaging.sh + build_packaging $MAKE clean fi diff --git a/test/common/autobuild_common.sh b/test/common/autobuild_common.sh index 45f95d768..2e0cc5cd5 100755 --- a/test/common/autobuild_common.sh +++ b/test/common/autobuild_common.sh @@ -436,6 +436,10 @@ build_native_dpdk() { run_test "build_native_dpdk" _build_native_dpdk } +build_packaging() { + run_test "packaging" "$rootdir/test/packaging/packaging.sh" +} + out=$output_dir SPDK_WORKSPACE=$(mktemp -dt "spdk_$(date +%s).XXXXXX")