From 468e9785696c8293bf395e5284328b6960858895 Mon Sep 17 00:00:00 2001 From: Abhay Krishna Date: Mon, 12 Feb 2024 14:24:08 -0800 Subject: [PATCH] Ensure proper values are passed to release branch support check (#2921) --- projects/kubernetes-sigs/image-builder/buildspecs/ami.yml | 2 +- .../kubernetes-sigs/image-builder/buildspecs/cloudstack.yml | 2 +- projects/kubernetes-sigs/image-builder/buildspecs/ova.yml | 2 +- projects/kubernetes-sigs/image-builder/buildspecs/raw.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/kubernetes-sigs/image-builder/buildspecs/ami.yml b/projects/kubernetes-sigs/image-builder/buildspecs/ami.yml index ca3a88263d..e2bbd19e2c 100644 --- a/projects/kubernetes-sigs/image-builder/buildspecs/ami.yml +++ b/projects/kubernetes-sigs/image-builder/buildspecs/ami.yml @@ -16,4 +16,4 @@ phases: build: commands: - - if make check-for-supported-release-branch -C $PROJECT_PATH && make check-for-release-branch-skip -C $PROJECT_PATH; then make binaries -C $CLI_FOLDER && make release IMAGE_OS=$IMAGE_OS IMAGE_OS_VERSION=$IMAGE_OS_VERSION IMAGE_FORMAT=ami RELEASE_BRANCH=$RELEASE_BRANCH -C $PROJECT_PATH; fi + - if make check-for-supported-release-branch IMAGE_OS=$IMAGE_OS IMAGE_FORMAT=ami RELEASE_BRANCH=$RELEASE_BRANCH -C $PROJECT_PATH && make check-for-release-branch-skip -C $PROJECT_PATH; then make binaries -C $CLI_FOLDER && make release IMAGE_OS=$IMAGE_OS IMAGE_OS_VERSION=$IMAGE_OS_VERSION IMAGE_FORMAT=ami RELEASE_BRANCH=$RELEASE_BRANCH -C $PROJECT_PATH; fi diff --git a/projects/kubernetes-sigs/image-builder/buildspecs/cloudstack.yml b/projects/kubernetes-sigs/image-builder/buildspecs/cloudstack.yml index 2159553853..7db33eb6f3 100644 --- a/projects/kubernetes-sigs/image-builder/buildspecs/cloudstack.yml +++ b/projects/kubernetes-sigs/image-builder/buildspecs/cloudstack.yml @@ -12,4 +12,4 @@ phases: build: commands: - - if make check-for-supported-release-branch -C $PROJECT_PATH && make check-for-release-branch-skip -C $PROJECT_PATH; then make binaries -C $CLI_FOLDER && make release IMAGE_OS=$IMAGE_OS IMAGE_OS_VERSION=$IMAGE_OS_VERSION IMAGE_FORMAT=cloudstack RELEASE_BRANCH=$RELEASE_BRANCH -C $PROJECT_PATH; fi + - if make check-for-supported-release-branch IMAGE_OS=$IMAGE_OS IMAGE_FORMAT=cloudstack RELEASE_BRANCH=$RELEASE_BRANCH -C $PROJECT_PATH && make check-for-release-branch-skip -C $PROJECT_PATH; then make binaries -C $CLI_FOLDER && make release IMAGE_OS=$IMAGE_OS IMAGE_OS_VERSION=$IMAGE_OS_VERSION IMAGE_FORMAT=cloudstack RELEASE_BRANCH=$RELEASE_BRANCH -C $PROJECT_PATH; fi diff --git a/projects/kubernetes-sigs/image-builder/buildspecs/ova.yml b/projects/kubernetes-sigs/image-builder/buildspecs/ova.yml index 3ba6be6575..7ebd924766 100644 --- a/projects/kubernetes-sigs/image-builder/buildspecs/ova.yml +++ b/projects/kubernetes-sigs/image-builder/buildspecs/ova.yml @@ -22,4 +22,4 @@ phases: build: commands: - - if make check-for-supported-release-branch -C $PROJECT_PATH && make check-for-release-branch-skip -C $PROJECT_PATH; then make binaries -C $CLI_FOLDER && make release IMAGE_OS=$IMAGE_OS IMAGE_OS_VERSION=$IMAGE_OS_VERSION IMAGE_FORMAT=ova RELEASE_BRANCH=$RELEASE_BRANCH -C $PROJECT_PATH; fi + - if make check-for-supported-release-branch IMAGE_OS=$IMAGE_OS IMAGE_FORMAT=ova RELEASE_BRANCH=$RELEASE_BRANCH -C $PROJECT_PATH && make check-for-release-branch-skip -C $PROJECT_PATH; then make binaries -C $CLI_FOLDER && make release IMAGE_OS=$IMAGE_OS IMAGE_OS_VERSION=$IMAGE_OS_VERSION IMAGE_FORMAT=ova RELEASE_BRANCH=$RELEASE_BRANCH -C $PROJECT_PATH; fi diff --git a/projects/kubernetes-sigs/image-builder/buildspecs/raw.yml b/projects/kubernetes-sigs/image-builder/buildspecs/raw.yml index c29ea9d0c7..83d96ad089 100644 --- a/projects/kubernetes-sigs/image-builder/buildspecs/raw.yml +++ b/projects/kubernetes-sigs/image-builder/buildspecs/raw.yml @@ -12,4 +12,4 @@ phases: build: commands: - - if make check-for-supported-release-branch -C $PROJECT_PATH && make check-for-release-branch-skip -C $PROJECT_PATH; then make binaries -C $CLI_FOLDER && make release IMAGE_OS=$IMAGE_OS IMAGE_OS_VERSION=$IMAGE_OS_VERSION IMAGE_FORMAT=raw RELEASE_BRANCH=$RELEASE_BRANCH -C $PROJECT_PATH; fi + - if make check-for-supported-release-branch IMAGE_OS=$IMAGE_OS IMAGE_FORMAT=raw RELEASE_BRANCH=$RELEASE_BRANCH -C $PROJECT_PATH && make check-for-release-branch-skip -C $PROJECT_PATH; then make binaries -C $CLI_FOLDER && make release IMAGE_OS=$IMAGE_OS IMAGE_OS_VERSION=$IMAGE_OS_VERSION IMAGE_FORMAT=raw RELEASE_BRANCH=$RELEASE_BRANCH -C $PROJECT_PATH; fi