From 92466c52f52bf4c54e16437139780c07a71f53ea Mon Sep 17 00:00:00 2001
From: Akash Jain <15995028+akash-jain-10@users.noreply.github.com>
Date: Mon, 29 Jul 2024 15:38:58 +0530
Subject: [PATCH] fix: Do not Update Docker Image Tags (3 digits) on RC
 Releases (#17218)

* fix: Do not Update Docker Image Tags (3 digits) on RC Releases

* chore(testing): Mark Push as `false`

* chore: Update Input Descriptions for ingestion publish workflows

* chore: Update Tags conditions

* chore: Update Tags conditions

* chore: Update Tags conditions

* chore: simplify docker image tags

* fix: Do not Update Docker Image Tags (3 digits) on RC Releases

* chore(testing): Mark Push as `false`

* chore: Update Input Descriptions for ingestion publish workflows

* chore: Update Tags conditions

* chore: Update Tags conditions

* chore: Update Tags conditions

* chore: simplify docker image tags

* chore: Mark Push as `true`
---
 .../actions/prepare-for-docker-build-and-push/action.yml  | 2 +-
 .../workflows/docker-openmetadata-ingestion-base-slim.yml | 8 ++++----
 .github/workflows/docker-openmetadata-ingestion-base.yml  | 8 ++++----
 .github/workflows/docker-openmetadata-ingestion.yml       | 8 ++++----
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.github/actions/prepare-for-docker-build-and-push/action.yml b/.github/actions/prepare-for-docker-build-and-push/action.yml
index 44c0cb9cda99..3ceca4922322 100644
--- a/.github/actions/prepare-for-docker-build-and-push/action.yml
+++ b/.github/actions/prepare-for-docker-build-and-push/action.yml
@@ -71,5 +71,5 @@ runs:
           ${{ inputs.image }}
         sep-tags: ','
         tags: |
-          type=raw,value=${{ inputs.release_version }},enable=${{ inputs.is_ingestion }}
+          type=raw,value=${{ inputs.release_version }},enable=${{ inputs.is_ingestion == 'true' }}
           type=raw,${{ inputs.tag }}
diff --git a/.github/workflows/docker-openmetadata-ingestion-base-slim.yml b/.github/workflows/docker-openmetadata-ingestion-base-slim.yml
index 745835105dd1..b6b927c6ac62 100644
--- a/.github/workflows/docker-openmetadata-ingestion-base-slim.yml
+++ b/.github/workflows/docker-openmetadata-ingestion-base-slim.yml
@@ -14,10 +14,10 @@ on:
   workflow_dispatch:
     inputs:
       docker_release_tag:
-        description: "Ingestion Base Slim Docker Image Tag"
+        description: "Ingestion Base Slim Docker Image Tag (3 digit docker image tag)"
         required: true
-      release_version:
-        description: "Provide the Release Version"
+      pypi_release_version:
+        description: "Provide the Release Version (4 digit docker image tag)"
         required: true
       push_latest_tag_to_release:
         description: "Do you want to update docker image latest tag as well ?"
@@ -39,7 +39,7 @@ jobs:
           tag: ${{ inputs.docker_release_tag }}
           push_latest: ${{ inputs.push_latest_tag_to_release }}
           is_ingestion: true
-          release_version: ${{ inputs.release_version }}
+          release_version: ${{ inputs.pypi_release_version }}
           dockerhub_username: ${{ secrets.DOCKERHUB_OPENMETADATA_USERNAME }}
           dockerhub_token: ${{ secrets.DOCKERHUB_OPENMETADATA_TOKEN }}
 
diff --git a/.github/workflows/docker-openmetadata-ingestion-base.yml b/.github/workflows/docker-openmetadata-ingestion-base.yml
index 02c62f9af234..6ad5c2adbdb5 100644
--- a/.github/workflows/docker-openmetadata-ingestion-base.yml
+++ b/.github/workflows/docker-openmetadata-ingestion-base.yml
@@ -14,10 +14,10 @@ on:
   workflow_dispatch:
     inputs:
       docker_release_tag:
-        description: "Ingestion Base Docker Image Tag"
+        description: "Ingestion Base Docker Image Tag (3 digit docker image tag)"
         required: true
-      release_version:
-        description: "Provide the Release Version"
+      pypi_release_version:
+        description: "Provide the Release Version (4 digit docker image tag)"
         required: true
       push_latest_tag_to_release:
         description: "Do you want to update docker image latest tag as well ?"
@@ -39,7 +39,7 @@ jobs:
           tag: ${{ inputs.docker_release_tag }}
           push_latest: ${{ inputs.push_latest_tag_to_release }}
           is_ingestion: true
-          release_version: ${{ inputs.release_version }}
+          release_version: ${{ inputs.pypi_release_version }}
           dockerhub_username: ${{ secrets.DOCKERHUB_OPENMETADATA_USERNAME }}
           dockerhub_token: ${{ secrets.DOCKERHUB_OPENMETADATA_TOKEN }}
 
diff --git a/.github/workflows/docker-openmetadata-ingestion.yml b/.github/workflows/docker-openmetadata-ingestion.yml
index eb317010ab2d..426266d47657 100644
--- a/.github/workflows/docker-openmetadata-ingestion.yml
+++ b/.github/workflows/docker-openmetadata-ingestion.yml
@@ -14,10 +14,10 @@ on:
   workflow_dispatch:
     inputs:
       docker_release_tag:
-        description: "Ingestion Docker Image Tag"
+        description: "Ingestion Docker Image Tag (3 digit docker image tag)"
         required: true
-      release_version:
-        description: "Provide the Release Version"
+      pypi_release_version:
+        description: "Provide the Release Version (4 digit docker image tag)"
         required: true
       push_latest_tag_to_release:
         description: "Mark this as latest tag as well ?"
@@ -39,7 +39,7 @@ jobs:
           tag: ${{ inputs.docker_release_tag }}
           push_latest: ${{ inputs.push_latest_tag_to_release }}
           is_ingestion: true
-          release_version: ${{ inputs.release_version }}
+          release_version: ${{ inputs.pypi_release_version }}
           dockerhub_username: ${{ secrets.DOCKERHUB_OPENMETADATA_USERNAME }}
           dockerhub_token: ${{ secrets.DOCKERHUB_OPENMETADATA_TOKEN }}