From 88f222b41daa256ebeee961346dbc74b99156189 Mon Sep 17 00:00:00 2001 From: Chris Evich Date: Mon, 28 Jan 2019 15:12:25 -0500 Subject: Cirrus: Enable AppArmor build and test This was specifically disabled early on in transitioning to cirrus due to an excessive number of test failures and lack of knowledge. This commit reverses the stance and unifies build and test commands across all current platforms. Signed-off-by: Chris Evich --- contrib/cirrus/integration_test.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'contrib/cirrus/integration_test.sh') diff --git a/contrib/cirrus/integration_test.sh b/contrib/cirrus/integration_test.sh index 627864f47..58c8af289 100755 --- a/contrib/cirrus/integration_test.sh +++ b/contrib/cirrus/integration_test.sh @@ -17,9 +17,9 @@ set -x cd "$GOSRC" case "${OS_RELEASE_ID}-${OS_RELEASE_VER}" in ubuntu-18) - make install PREFIX=/usr ETCDIR=/etc "BUILDTAGS=$BUILDTAGS" - make test-binaries "BUILDTAGS=$BUILDTAGS" - SKIP_USERNS=1 make localintegration "BUILDTAGS=$BUILDTAGS" + make install PREFIX=/usr ETCDIR=/etc + make test-binaries + SKIP_USERNS=1 make localintegration ;; fedora-29) ;& # Continue to the next item fedora-28) ;& -- cgit v1.2.3-54-g00ecf