From d9c7ec97147d42d2ccc07739ee7446c04dee84ef Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Wed, 18 Jun 2025 12:04:50 +0200 Subject: [PATCH] [no-relnote] Don't refer to target image distribution Signed-off-by: Evan Lezar --- .github/workflows/image.yaml | 6 +++--- deployments/container/Makefile | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/image.yaml b/.github/workflows/image.yaml index ed423ff8..c4feb648 100644 --- a/.github/workflows/image.yaml +++ b/.github/workflows/image.yaml @@ -79,8 +79,8 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - dist: - - ubi9 + target: + - application - packaging needs: packages steps: @@ -117,4 +117,4 @@ jobs: BUILD_MULTI_ARCH_IMAGES: ${{ inputs.build_multi_arch_images }} run: | echo "${VERSION}" - make -f deployments/container/Makefile build-${{ matrix.dist }} + make -f deployments/container/Makefile build-${{ matrix.target }} diff --git a/deployments/container/Makefile b/deployments/container/Makefile index 6120b0f1..4e3373a2 100644 --- a/deployments/container/Makefile +++ b/deployments/container/Makefile @@ -38,7 +38,7 @@ OUT_IMAGE_TAG = $(OUT_IMAGE_VERSION) OUT_IMAGE = $(OUT_IMAGE_NAME):$(OUT_IMAGE_TAG) ##### Public rules ##### -DEFAULT_PUSH_TARGET := ubi9 +DEFAULT_PUSH_TARGET := application DISTRIBUTIONS := $(DEFAULT_PUSH_TARGET) META_TARGETS := packaging @@ -102,8 +102,6 @@ build: build-$(DEFAULT_PUSH_TARGET) push: push-$(DEFAULT_PUSH_TARGET) # Test targets -test-%: DIST = $(*) - TEST_CASES ?= docker crio containerd $(TEST_TARGETS): test-%: TEST_CASES="$(TEST_CASES)" bash -x $(CURDIR)/test/container/main.sh run \