From 612eee348f797f8f74b24828b5ff455c7ebc25c3 Mon Sep 17 00:00:00 2001 From: Markus Lehtonen Date: Mon, 12 Dec 2022 11:12:20 +0200 Subject: [PATCH] Makefile: add cross-tar to cross-packages Also build the "distroless" binary tarball with the corss-packages target similar to the deb and rpm packages. Also, change packaging-tests target to depend on cross-packages so that it also tests the binary tarball. Even if it currently only tests the buildability of the tarball as there is no actual e2e test to install and verify it. Adding a packaging e2e-test for the binary tarball is left as a future exercise. --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 579563ee3..cba7e87c9 100644 --- a/Makefile +++ b/Makefile @@ -451,7 +451,7 @@ e2e-tests: build-static exit 1; \ fi -packaging-tests: cross-deb cross-rpm +packaging-tests: cross-packages $(Q)for dir in test/e2e/packages.test-suite/*; do \ cleanup=1 omit_agent=1 $(E2E_RUN) $$dir; \ echo "--------------------------------------"; \ @@ -480,7 +480,7 @@ else packages: cross-$(DISTRO_PACKAGE).$(DISTRO_ID) endif -cross-packages: cross-rpm cross-deb +cross-packages: cross-rpm cross-deb cross-tar cross-rpm: $(foreach d,$(SUPPORTED_RPM_DISTROS),cross-rpm.$(d))