From 9760758032f0b929455861c20ad9006313d7454e Mon Sep 17 00:00:00 2001 From: Carlos Eduardo Arango Gutierrez Date: Mon, 19 Aug 2024 07:35:11 +0200 Subject: [PATCH] Fix bundle generation Signed-off-by: Carlos Eduardo Arango Gutierrez --- .github/workflows/image.yml | 11 +++++++---- test/e2e/infra/vsphere.yml | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/image.yml b/.github/workflows/image.yml index 730103d6..66bf6d4d 100644 --- a/.github/workflows/image.yml +++ b/.github/workflows/image.yml @@ -102,10 +102,13 @@ jobs: echo "PUSH_ON_BUILD=${GENERATE_ARTIFACTS}" >> $GITHUB_ENV echo "BUILD_MULTI_ARCH_IMAGES=${GENERATE_ARTIFACTS}" >> $GITHUB_ENV - name: Extract branch name for push events - if: github.event_name == 'push' id: extract_branch run: | - BRANCH=${GITHUB_REF#refs/heads/} + BRANCH_NAME=${GITHUB_REF#refs/heads/} + BRANCH="bundle-latest" + if [[ "$BRANCH_NAME" == "main" || "$BRANCH_NAME" == "release-"* ]]; then + BRANCH="bundle-latest-${BRANCH_NAME}" + fi echo "BRANCH=$BRANCH" >> $GITHUB_ENV - name: Set up QEMU uses: docker/setup-qemu-action@v3 @@ -119,8 +122,8 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Build image env: - BUNDLE_IMAGE_NAME: ghcr.io/${LOWERCASE_REPO_OWNER}/k8s-nim-operator - BUNDLE_IMAGE: ghcr.io/${LOWERCASE_REPO_OWNER}/k8s-nim-operator:bundle-lastest-${{ github.ref }} + BUNDLE_IMAGE_NAME: ghcr.io/nvidia/k8s-nim-operator + BUNDLE_IMAGE: ghcr.io/nvidia/k8s-nim-operator:${BRANCH} VERSION: '' # Until we cut a release, Version will be null run: | echo "${VERSION}" diff --git a/test/e2e/infra/vsphere.yml b/test/e2e/infra/vsphere.yml index 86987d12..10927ff9 100644 --- a/test/e2e/infra/vsphere.yml +++ b/test/e2e/infra/vsphere.yml @@ -27,4 +27,4 @@ spec: kubernetes: install: true installer: kubeadm - version: v1.20.3 + version: v1.30.3