Makefile: add "verify" target to test install of packages

This verify step is primarily intended to verify that dependencies
are defined correctly, and available on the given distro.

Signed-off-by: Sebastiaan van Stijn <[email protected]>

Author: thaJeztah

Jenkinsfile

@@ -44,12 +44,12 @@ def genBuildStep(LinkedHashMap pkg, String arch) {
                 sh 'docker info'
             }
             stage("build") {
-                try {
-                    checkout scm
-                    sh "make REF=$branch ${pkg.target}"
-                } finally {
-                    sh "make clean"
-                }
+                checkout scm
+                sh "make clean"
+                sh "make REF=$branch ${pkg.target}"
+            }
+            stage("verify") {
+                sh "make IMAGE=${pkg.image} verify"
             }
         }
     }

Makefile

@@ -97,3 +97,13 @@ static: checkout ## build static-compiled packages
 	for p in $(DOCKER_BUILD_PKGS); do \
 		$(MAKE) -C $@ VERSION=$(VERSION) GO_VERSION=$(GO_VERSION) TARGETPLATFORM=$(TARGETPLATFORM) CONTAINERD_VERSION=$(CONTAINERD_VERSION) RUNC_VERSION=$(RUNC_VERSION) $${p}; \
 	done
+
+.PHONY: verify
+verify: ## verify installation of packages
+# to verify using packages from staging, use: make VERIFY_PACKAGE_REPO=stage IMAGE=ubuntu:focal verify
+	docker run $(VERIFY_PLATFORM) --rm -i \
+		-v "$$(pwd):/v" \
+		-e DEBIAN_FRONTEND=noninteractive \
+		-e PACKAGE_REPO=$(VERIFY_PACKAGE_REPO) \
+		-w /v \
+		$(IMAGE) ./verify

common.mk

@@ -43,6 +43,13 @@ DOCKER_SCAN_REF    ?= v0.17.0
 DOCKER_COMPOSE_REF ?= v2.5.1
 DOCKER_BUILDX_REF  ?= v0.8.2
 
+# Use "stage" to install dependencies from download-stage.docker.com during the
+# verify step. Leave empty or use any other value to install from download.docker.com
+VERIFY_PACKAGE_REPO ?= staging
+
+# Optional flags like --platform=linux/armhf
+VERIFY_PLATFORM ?=
+
 export BUILDTIME
 export DEFAULT_PRODUCT_LICENSE
 export PACKAGER_NAME

verify

@@ -6,7 +6,7 @@
 # Description: This runs a smoke test to verify that the packages can be installed corrected
 ###
 
-# packaging/build/${DIST_ID}/${DIST_VERSION}/${ARCH} - location of all packages
+# build/${DIST_ID}/${DIST_VERSION}/${ARCH} - location of all packages
 # Manually Testing: docker run --rm -it -v $(pwd):/v -w /v "centos:7" ./verify
 
 set -e
@@ -47,7 +47,7 @@ function verify_deb() {
 
 	install_debian_containerd
 
-	packages=$(find "packaging/deb/debbuild/${DIST_ID}-${DIST_VERSION}/" -type f -name "*.deb")
+	packages=$(find "deb/debbuild/${DIST_ID}-${DIST_VERSION}/" -type f -name "*.deb")
 	# All local packages need to be prefixed with `./` or else apt-get doesn't understand where to pull from
 	packages=$(echo "${packages}" | awk '$0="./"$0' | xargs)
 
@@ -120,7 +120,7 @@ function verify_rpm() {
 
 	# find all rpm packages, exclude src package
 	echo "[DEBUG] Installing engine rpms"
-	packages=$(find "packaging/rpm/rpmbuild/${DIST_ID}-${DIST_VERSION}/RPMS/" -type f -name "*.rpm" | sed '/src/d')
+	packages=$(find "rpm/rpmbuild/${DIST_ID}-${DIST_VERSION}/RPMS/" -type f -name "*.rpm" | sed '/src/d')
 
 	# install all non-source packages
 	(