From e662e8197c474f7ac78c10ae0a9f229ceb0e74e5 Mon Sep 17 00:00:00 2001
From: Evan Lezar <elezar@nvidia.com>
Date: Thu, 25 Nov 2021 20:43:43 +0100
Subject: [PATCH] Add placeholder for testing packaging image

Signed-off-by: Evan Lezar <elezar@nvidia.com>
---
 .common-ci.yml                       |  9 ++++++++-
 build/container/Dockerfile.packaging |  3 ---
 build/container/Makefile             | 20 ++++++++++++++++++++
 3 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/.common-ci.yml b/.common-ci.yml
index fa1c045f..3343bcc2 100644
--- a/.common-ci.yml
+++ b/.common-ci.yml
@@ -433,6 +433,13 @@ test-docker-ubuntu18.04:
   needs:
     - image-ubuntu18.04
 
+test-packaging:
+  extends:
+    - .integration
+    - .dist-packaging
+  needs:
+    - image-packaging
+
 # .release forms the base of the deployment jobs which push images to the CI registry.
 # This is extended with the version to be deployed (e.g. the SHA or TAG) and the
 # target os.
@@ -527,4 +534,4 @@ release:staging-packaging:
     - .release:staging
     - .dist-packaging
   needs:
-    - image-packaging
+    - test-packaging
diff --git a/build/container/Dockerfile.packaging b/build/container/Dockerfile.packaging
index da1a4ce8..444109c9 100644
--- a/build/container/Dockerfile.packaging
+++ b/build/container/Dockerfile.packaging
@@ -27,6 +27,3 @@ COPY ${ARTIFACTS_DIR}/ /artifacts/packages/
 WORKDIR /artifacts/packages
 
 COPY ./LICENSE /licenses/LICENSE
-
-# This container is not intended to be run
-ENTRYPOINT ["exit", "1"]
diff --git a/build/container/Makefile b/build/container/Makefile
index f37880bb..20893a49 100644
--- a/build/container/Makefile
+++ b/build/container/Makefile
@@ -112,3 +112,23 @@ $(TEST_TARGETS): test-%:
 		$(IMAGE) \
 			--no-cleanup-on-error
 
+.PHONY: test-packaging
+test-packaging: DIST = packaging
+test-packaging:
+	@echo "Testing package image contents"
+	@$(DOCKER) run --rm $(IMAGE) test -d "/artifacts/packages/amazonlinux1/x86_64" || echo "Missing amazonlinux1/x86_64"
+	@$(DOCKER) run --rm $(IMAGE) test -d "/artifacts/packages/amazonlinux2/aarch64" || echo "Missing amazonlinux2/aarch64"
+	@$(DOCKER) run --rm $(IMAGE) test -d "/artifacts/packages/amazonlinux2/x86_64" || echo "Missing amazonlinux2/x86_64"
+	@$(DOCKER) run --rm $(IMAGE) test -d "/artifacts/packages/centos7/ppc64le" || echo "Missing centos7/ppc64le"
+	@$(DOCKER) run --rm $(IMAGE) test -d "/artifacts/packages/centos7/x86_64" || echo "Missing centos7/x86_64"
+	@$(DOCKER) run --rm $(IMAGE) test -d "/artifacts/packages/centos8/aarch64" || echo "Missing centos8/aarch64"
+	@$(DOCKER) run --rm $(IMAGE) test -d "/artifacts/packages/centos8/ppc64le" || echo "Missing centos8/ppc64le"
+	@$(DOCKER) run --rm $(IMAGE) test -d "/artifacts/packages/centos8/x86_64" || echo "Missing centos8/x86_64"
+	@$(DOCKER) run --rm $(IMAGE) test -d "/artifacts/packages/debian10/amd64" || echo "Missing debian10/amd64"
+	@$(DOCKER) run --rm $(IMAGE) test -d "/artifacts/packages/debian9/amd64" || echo "Missing debian9/amd64"
+	@$(DOCKER) run --rm $(IMAGE) test -d "/artifacts/packages/opensuse-leap15.1/x86_64" || echo "Missing opensuse-leap15.1/x86_64"
+	@$(DOCKER) run --rm $(IMAGE) test -d "/artifacts/packages/ubuntu16.04/amd64" || echo "Missing ubuntu16.04/amd64"
+	@$(DOCKER) run --rm $(IMAGE) test -d "/artifacts/packages/ubuntu16.04/ppc64le" || echo "Missing ubuntu16.04/ppc64le"
+	@$(DOCKER) run --rm $(IMAGE) test -d "/artifacts/packages/ubuntu18.04/amd64" || echo "Missing ubuntu18.04/amd64"
+	@$(DOCKER) run --rm $(IMAGE) test -d "/artifacts/packages/ubuntu18.04/arm64" || echo "Missing ubuntu18.04/arm64"
+	@$(DOCKER) run --rm $(IMAGE) test -d "/artifacts/packages/ubuntu18.04/ppc64le" || echo "Missing ubuntu18.04/ppc64le"