fixup! fixup! fixup! bundle image nightly build with limitador lastco…

…mmit
Kuadrant · Sep 4, 2024 · 0e5916d · 0e5916d
1 parent 67efed8
commit 0e5916d
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/.github/workflows/build-images-base.yaml b/.github/workflows/build-images-base.yaml
@@ -8,7 +8,7 @@ on:
         default: 0.0.0
         type: string
       operatorTag:
-        description: Operator tag
+        description: Operator bundle tag
         default: latest
         type: string
       limitadorVersion:
@@ -23,14 +23,18 @@ on:
         description: Bundle and catalog channels, comma separated
         default: preview
         type: string
+      imageTags:
+        description: Docker image tags
+        default: latest
+        type: string
   workflow_dispatch:
     inputs:
       operatorVersion:
         description: Operator bundle version
         default: 0.0.0
         type: string
       operatorTag:
-        description: Operator tag
+        description: Operator bundle tag
         default: latest
         type: string
       limitadorVersion:
@@ -47,7 +51,7 @@ on:
         type: string
 
 env:
-  IMG_TAGS: ${{ inputs.operatorTag }}
+  IMG_TAGS: ${{ inputs.imageTags || inputs.operatorTag }}
   VERSION: ${{ inputs.operatorVersion }}
   IMG_REGISTRY_HOST: quay.io
   IMG_REGISTRY_ORG: kuadrant

diff --git a/.github/workflows/build-images-branches-2.yaml b/.github/workflows/build-images-branches-2.yaml
@@ -33,6 +33,7 @@ jobs:
     uses: ./.github/workflows/build-images-base.yaml
     secrets: inherit
     with:
-      operatorVersion: ${{ github.sha }}
+      operatorVersion: 0.0.0
+      imageTags: ${{ needs.release-date.outputs.release_date }} nightly-latest
       operatorTag: ${{ needs.release-date.outputs.release_date }}
       limitadorVersion: ${{ needs.limitador-latest-revision.outputs.limitador_last_hash }}
diff --git a/.github/workflows/build-images-branches.yaml b/.github/workflows/build-images-branches.yaml
@@ -7,11 +7,11 @@ on:
 
 jobs:
   workflow-build:
-    if: github.ref_name != 'main' && !startsWith(github.ref, 'refs/tags/v')
     name: Calls build-images-base workflow
     uses: ./.github/workflows/build-images-base.yaml
     secrets: inherit
     with:
-      operatorVersion: ${{ github.ref_name }}
+      operatorVersion: 0.0.0
       operatorTag: ${{ github.ref_name }}
       limitadorVersion: latest
+      imageTags: ${{ github.ref_name }}
diff --git a/.github/workflows/build-images-scheduled.yaml b/.github/workflows/build-images-scheduled.yaml
@@ -32,6 +32,7 @@ jobs:
     uses: ./.github/workflows/build-images-base.yaml
     secrets: inherit
     with:
-      operatorVersion: ${{ github.sha }}
+      operatorVersion: 0.0.0
+      imageTags: ${{ needs.release-date.outputs.RELEASE_DATE }} nightly-latest
       operatorTag: ${{ needs.release-date.outputs.RELEASE_DATE }}
       limitadorVersion: ${{ needs.limitador-latest-revision.steps.lastcommit.outpus.hash }}