From ee03fbf71f3d2f0e9b504accdcaa4857d2846cec Mon Sep 17 00:00:00 2001 From: Matthew F Leader Date: Mon, 14 Jul 2025 10:22:37 -0400 Subject: [PATCH 01/10] pr number Signed-off-by: Matthew F Leader --- .github/workflows/run-e2e-test.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-e2e-test.yml b/.github/workflows/run-e2e-test.yml index bc9b1310e..42d54fa76 100644 --- a/.github/workflows/run-e2e-test.yml +++ b/.github/workflows/run-e2e-test.yml @@ -4,6 +4,12 @@ on: pull_request: types: [opened, synchronize, reopened] branches: [ main ] + workflow_call: + inputs: + pr_number: + description: 'PR number for image tagging' + required: true + type: string jobs: e2e-tests: @@ -59,11 +65,13 @@ jobs: - name: Build operator image run: | + PR_NUMBER=${{ inputs.pr_number || github.event.pull_request.number }} + # Build the image with a simpler tag format - docker build -t kind-registry:5000/llama-stack-k8s-operator:pr${{ github.event.pull_request.number }} -f Dockerfile . + docker build -t kind-registry:5000/llama-stack-k8s-operator:pr${PR_NUMBER} -f Dockerfile . # Tag the image for local registry - docker tag kind-registry:5000/llama-stack-k8s-operator:pr${{ github.event.pull_request.number }} kind-registry:5000/llama-stack-k8s-operator:latest + docker tag kind-registry:5000/llama-stack-k8s-operator:pr${PR_NUMBER} kind-registry:5000/llama-stack-k8s-operator:latest - name: Push operator image to local registry run: | From ec7314da163bf091678db4976f0673c031f12124 Mon Sep 17 00:00:00 2001 From: Matthew F Leader Date: Mon, 14 Jul 2025 17:20:06 -0400 Subject: [PATCH 02/10] add input to e2e wf Signed-off-by: Matthew F Leader --- .github/workflows/run-e2e-test.yml | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/.github/workflows/run-e2e-test.yml b/.github/workflows/run-e2e-test.yml index 42d54fa76..03903ed2a 100644 --- a/.github/workflows/run-e2e-test.yml +++ b/.github/workflows/run-e2e-test.yml @@ -65,13 +65,18 @@ jobs: - name: Build operator image run: | - PR_NUMBER=${{ inputs.pr_number || github.event.pull_request.number }} - - # Build the image with a simpler tag format - docker build -t kind-registry:5000/llama-stack-k8s-operator:pr${PR_NUMBER} -f Dockerfile . + if [ -n "${{ inputs.pr_number }}" ]; then + IMAGE_TAG="pr${{ inputs.pr_number }}" + elif [ -n "${{ github.event.pull_request.number }}" ]; then + IMAGE_TAG="pr${{ github.event.pull_request.number }}" + else + TIMESTAMP=$(date +%Y%m%d-%H%M%S) + COMMIT_HASH=$(git rev-parse --short HEAD) + IMAGE_TAG="${TIMESTAMP}-${COMMIT_HASH}" + fi - # Tag the image for local registry - docker tag kind-registry:5000/llama-stack-k8s-operator:pr${PR_NUMBER} kind-registry:5000/llama-stack-k8s-operator:latest + docker build -t kind-registry:5000/llama-stack-k8s-operator:${IMAGE_TAG} -f Dockerfile . + docker tag kind-registry:5000/llama-stack-k8s-operator:${IMAGE_TAG} kind-registry:5000/llama-stack-k8s-operator:latest - name: Push operator image to local registry run: | From efb9dca8d3bdf5e160569b8554e5430e98aebb77 Mon Sep 17 00:00:00 2001 From: Matthew F Leader Date: Tue, 15 Jul 2025 10:22:26 -0400 Subject: [PATCH 03/10] call e2e tests in release generator Signed-off-by: Matthew F Leader --- .github/workflows/generate-release.yml | 23 ++++++++++++++++++++++- .github/workflows/run-e2e-test.yml | 14 +++++--------- 2 files changed, 27 insertions(+), 10 deletions(-) diff --git a/.github/workflows/generate-release.yml b/.github/workflows/generate-release.yml index a1a6faac7..9e133bbd7 100644 --- a/.github/workflows/generate-release.yml +++ b/.github/workflows/generate-release.yml @@ -178,9 +178,30 @@ jobs: echo "✅ Committed release changes to ${{ steps.validate.outputs.release_branch }}" fi - finalize-release: + generate-e2e-tag: needs: generate-release runs-on: ubuntu-24.04 + outputs: + image_tag: ${{ steps.tag.outputs.value }} + steps: + - name: Checkout code + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + with: + ref: ${{ needs.generate-release.outputs.release_branch }} + + - name: Generate image tag + id: tag + run: echo "value=${{ needs.generate-release.outputs.release_branch }}_$(date +%m%d-%H%M)_$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT + + run-e2e-tests: + needs: [generate-release, generate-e2e-tag] + uses: ./.github/workflows/run-e2e-test.yml + with: + image_tag: ${{ needs.generate-e2e-tag.outputs.image_tag }} + + finalize-release: + needs: [generate-release, run-e2e-tests] + runs-on: ubuntu-24.04 env: operator_version: ${{ needs.generate-release.outputs.operator_version }} llamastack_version: ${{ needs.generate-release.outputs.llamastack_version }} diff --git a/.github/workflows/run-e2e-test.yml b/.github/workflows/run-e2e-test.yml index 03903ed2a..a5d3ee818 100644 --- a/.github/workflows/run-e2e-test.yml +++ b/.github/workflows/run-e2e-test.yml @@ -6,8 +6,8 @@ on: branches: [ main ] workflow_call: inputs: - pr_number: - description: 'PR number for image tagging' + image_tag: + description: 'Image tag to use for the operator image' required: true type: string @@ -65,14 +65,10 @@ jobs: - name: Build operator image run: | - if [ -n "${{ inputs.pr_number }}" ]; then - IMAGE_TAG="pr${{ inputs.pr_number }}" - elif [ -n "${{ github.event.pull_request.number }}" ]; then - IMAGE_TAG="pr${{ github.event.pull_request.number }}" + if [ -n "${{ inputs.image_tag }}" ]; then + IMAGE_TAG="${{ inputs.image_tag }}" else - TIMESTAMP=$(date +%Y%m%d-%H%M%S) - COMMIT_HASH=$(git rev-parse --short HEAD) - IMAGE_TAG="${TIMESTAMP}-${COMMIT_HASH}" + IMAGE_TAG="pr${{ github.event.pull_request.number }}" fi docker build -t kind-registry:5000/llama-stack-k8s-operator:${IMAGE_TAG} -f Dockerfile . From 80c6544be3bdb1fb1569da57440c732072f0ca22 Mon Sep 17 00:00:00 2001 From: Matthew F Leader Date: Mon, 4 Aug 2025 16:56:22 -0400 Subject: [PATCH 04/10] fix generate release version hashes Signed-off-by: Matthew F Leader --- .github/workflows/generate-release.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/generate-release.yml b/.github/workflows/generate-release.yml index 9e133bbd7..2ee25fd63 100644 --- a/.github/workflows/generate-release.yml +++ b/.github/workflows/generate-release.yml @@ -107,7 +107,7 @@ jobs: python-version: '3.12' - name: Run pre-commit checks - uses: pre-commit/action@a26af69be951a213d495a4c3e4e4022e16d87065 + uses: pre-commit/action@576ff52938d158a24ac7e009dfa94b1455e7df99 continue-on-error: true id: precommit env: @@ -208,7 +208,7 @@ jobs: release_branch: ${{ needs.generate-release.outputs.release_branch }} steps: - name: Checkout code - uses: actions/checkout@a26af69be951a213d495a4c3e4e4022e16d87065 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 with: ref: ${{ env.release_branch }} fetch-depth: 0 @@ -265,7 +265,7 @@ jobs: GH_TOKEN: ${{ github.token }} - name: Set up Go - uses: actions/setup-go@a26af69be951a213d495a4c3e4e4022e16d87065 + uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 with: go-version: ${{ env.GO_VERSION }} From 58895cdb0abb49006215a4da13f637a2e8f8eb75 Mon Sep 17 00:00:00 2001 From: Matthew F Leader Date: Wed, 6 Aug 2025 08:39:14 -0400 Subject: [PATCH 05/10] fix e2e test call Signed-off-by: Matthew F Leader --- .github/workflows/generate-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/generate-release.yml b/.github/workflows/generate-release.yml index 2ee25fd63..d625889d5 100644 --- a/.github/workflows/generate-release.yml +++ b/.github/workflows/generate-release.yml @@ -195,7 +195,7 @@ jobs: run-e2e-tests: needs: [generate-release, generate-e2e-tag] - uses: ./.github/workflows/run-e2e-test.yml + uses: llamastack/llama-stack-k8s-operator/.github/workflows/run-e2e-test.yml@enable-e2e-wf-call with: image_tag: ${{ needs.generate-e2e-tag.outputs.image_tag }} From 5df56aef0e574de14c98b0d5acce4d1129811560 Mon Sep 17 00:00:00 2001 From: Matthew F Leader Date: Wed, 6 Aug 2025 08:44:25 -0400 Subject: [PATCH 06/10] add version hash and step name Signed-off-by: Matthew F Leader --- .github/workflows/generate-release.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/generate-release.yml b/.github/workflows/generate-release.yml index d625889d5..5f58cec07 100644 --- a/.github/workflows/generate-release.yml +++ b/.github/workflows/generate-release.yml @@ -194,8 +194,9 @@ jobs: run: echo "value=${{ needs.generate-release.outputs.release_branch }}_$(date +%m%d-%H%M)_$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT run-e2e-tests: + name: new name needs: [generate-release, generate-e2e-tag] - uses: llamastack/llama-stack-k8s-operator/.github/workflows/run-e2e-test.yml@enable-e2e-wf-call + uses: llamastack/llama-stack-k8s-operator/.github/workflows/run-e2e-test.yml@enable-e2e-wf-call@bb56647b3d4c65d7c55c7867b742e313c6c9fb75 with: image_tag: ${{ needs.generate-e2e-tag.outputs.image_tag }} From 1ba2c3bb85b0b5146bb41499f5c139e9e9bfcec8 Mon Sep 17 00:00:00 2001 From: Matthew F Leader Date: Wed, 6 Aug 2025 08:45:19 -0400 Subject: [PATCH 07/10] rm step name Signed-off-by: Matthew F Leader --- .github/workflows/generate-release.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/generate-release.yml b/.github/workflows/generate-release.yml index 5f58cec07..9f8a4ed97 100644 --- a/.github/workflows/generate-release.yml +++ b/.github/workflows/generate-release.yml @@ -194,9 +194,8 @@ jobs: run: echo "value=${{ needs.generate-release.outputs.release_branch }}_$(date +%m%d-%H%M)_$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT run-e2e-tests: - name: new name needs: [generate-release, generate-e2e-tag] - uses: llamastack/llama-stack-k8s-operator/.github/workflows/run-e2e-test.yml@enable-e2e-wf-call@bb56647b3d4c65d7c55c7867b742e313c6c9fb75 + uses: llamastack/llama-stack-k8s-operator/.github/workflows/run-e2e-test.yml@enable-e2e-wf-call@5df56aef0e574de14c98b0d5acce4d1129811560 with: image_tag: ${{ needs.generate-e2e-tag.outputs.image_tag }} From 200881258fba8f0411003062e47e94c0a397b7c4 Mon Sep 17 00:00:00 2001 From: Matthew F Leader Date: Wed, 6 Aug 2025 08:47:27 -0400 Subject: [PATCH 08/10] rm extra @ Signed-off-by: Matthew F Leader --- .github/workflows/generate-release.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/generate-release.yml b/.github/workflows/generate-release.yml index 9f8a4ed97..69a0de592 100644 --- a/.github/workflows/generate-release.yml +++ b/.github/workflows/generate-release.yml @@ -194,8 +194,9 @@ jobs: run: echo "value=${{ needs.generate-release.outputs.release_branch }}_$(date +%m%d-%H%M)_$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT run-e2e-tests: + name: step name needs: [generate-release, generate-e2e-tag] - uses: llamastack/llama-stack-k8s-operator/.github/workflows/run-e2e-test.yml@enable-e2e-wf-call@5df56aef0e574de14c98b0d5acce4d1129811560 + uses: llamastack/llama-stack-k8s-operator/.github/workflows/run-e2e-test.yml@5df56aef0e574de14c98b0d5acce4d1129811560 with: image_tag: ${{ needs.generate-e2e-tag.outputs.image_tag }} From 0abe8ddf5ac058c7497e1cd67896d41a1ef2a85e Mon Sep 17 00:00:00 2001 From: Matthew F Leader Date: Wed, 6 Aug 2025 08:48:07 -0400 Subject: [PATCH 09/10] update enable wf call version hash Signed-off-by: Matthew F Leader --- .github/workflows/generate-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/generate-release.yml b/.github/workflows/generate-release.yml index 69a0de592..a3623338a 100644 --- a/.github/workflows/generate-release.yml +++ b/.github/workflows/generate-release.yml @@ -196,7 +196,7 @@ jobs: run-e2e-tests: name: step name needs: [generate-release, generate-e2e-tag] - uses: llamastack/llama-stack-k8s-operator/.github/workflows/run-e2e-test.yml@5df56aef0e574de14c98b0d5acce4d1129811560 + uses: llamastack/llama-stack-k8s-operator/.github/workflows/run-e2e-test.yml@200881258fba8f0411003062e47e94c0a397b7c4 with: image_tag: ${{ needs.generate-e2e-tag.outputs.image_tag }} From b365a6d0af337d4639f95171d54aa693e6968123 Mon Sep 17 00:00:00 2001 From: Matthew F Leader Date: Wed, 6 Aug 2025 09:36:25 -0400 Subject: [PATCH 10/10] fix docker login version hash Signed-off-by: Matthew F Leader --- .github/workflows/generate-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/generate-release.yml b/.github/workflows/generate-release.yml index a3623338a..19bd383fa 100644 --- a/.github/workflows/generate-release.yml +++ b/.github/workflows/generate-release.yml @@ -276,7 +276,7 @@ jobs: make image-build IMG=quay.io/llamastack/llama-stack-k8s-operator:v${{ env.operator_version }} - name: Log in to Quay.io - uses: docker/login-action@a26af69be951a213d495a4c3e4e4022e16d87065 + uses: docker/login-action@465a07811f14bebb1938fbed4728c6a1ff8901fc with: registry: quay.io username: ${{ secrets.APP_QUAY_USERNAME }}