From 9c7adc72b210cbbe99d550d3b55b08c84fba650e Mon Sep 17 00:00:00 2001
From: Akash-Jain <15995028+akash-jain-10@users.noreply.github.com>
Date: Mon, 29 Jul 2024 13:46:58 +0530
Subject: [PATCH] chore: Update Tags conditions

---
 .github/actions/prepare-for-docker-build-and-push/action.yml  | 4 ++--
 .github/workflows/docker-openmetadata-ingestion-base-slim.yml | 4 ++--
 .github/workflows/docker-openmetadata-ingestion-base.yml      | 4 ++--
 .github/workflows/docker-openmetadata-ingestion.yml           | 4 ++--
 4 files changed, 8 insertions(+), 8 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 e0faacb828da..f5c6d6d6eede 100644
--- a/.github/actions/prepare-for-docker-build-and-push/action.yml
+++ b/.github/actions/prepare-for-docker-build-and-push/action.yml
@@ -75,5 +75,5 @@ runs:
           ${{ inputs.image }}
         sep-tags: ','
         tags: |
-          type=raw,value=${{ inputs.release_version }},enable=${{ inputs.is_ingestion && !(inputs.is_release_candidate) }}
-          type=raw,${{ inputs.tag }}
+          type=raw,value=${{ inputs.release_version }},enable=${{ inputs.is_ingestion }}
+          type=raw,${{ inputs.tag }},enable=${{ !inputs.is_ingestion || (inputs.is_ingestion && !inputs.is_release_candidate) }}
diff --git a/.github/workflows/docker-openmetadata-ingestion-base-slim.yml b/.github/workflows/docker-openmetadata-ingestion-base-slim.yml
index 47d351d830d5..766d2774892b 100644
--- a/.github/workflows/docker-openmetadata-ingestion-base-slim.yml
+++ b/.github/workflows/docker-openmetadata-ingestion-base-slim.yml
@@ -16,7 +16,7 @@ on:
       docker_release_tag:
         description: "Ingestion Base Slim Docker Image Tag (3 digit docker image tag)"
         required: true
-      release_version:
+      pypi_release_version:
         description: "Provide the Release Version (4 digit docker image tag)"
         required: true
       push_latest_tag_to_release:
@@ -44,7 +44,7 @@ jobs:
           push_latest: ${{ inputs.push_latest_tag_to_release }}
           is_ingestion: true
           is_release_candidate: ${{ inputs.build_for_release_candidate }}
-          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 a8d7830d4906..eb8b6afd830e 100644
--- a/.github/workflows/docker-openmetadata-ingestion-base.yml
+++ b/.github/workflows/docker-openmetadata-ingestion-base.yml
@@ -16,7 +16,7 @@ on:
       docker_release_tag:
         description: "Ingestion Base Docker Image Tag (3 digit docker image tag)"
         required: true
-      release_version:
+      pypi_release_version:
         description: "Provide the Release Version (4 digit docker image tag)"
         required: true
       push_latest_tag_to_release:
@@ -44,7 +44,7 @@ jobs:
           push_latest: ${{ inputs.push_latest_tag_to_release }}
           is_ingestion: true
           is_release_candidate: ${{ inputs.build_for_release_candidate }}
-          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 dd5c7d14b998..72162db7cf06 100644
--- a/.github/workflows/docker-openmetadata-ingestion.yml
+++ b/.github/workflows/docker-openmetadata-ingestion.yml
@@ -16,7 +16,7 @@ on:
       docker_release_tag:
         description: "Ingestion Docker Image Tag (3 digit docker image tag)"
         required: true
-      release_version:
+      pypi_release_version:
         description: "Provide the Release Version (4 digit docker image tag)"
         required: true
       push_latest_tag_to_release:
@@ -44,7 +44,7 @@ jobs:
           push_latest: ${{ inputs.push_latest_tag_to_release }}
           is_ingestion: true
           is_release_candidate: ${{ inputs.build_for_release_candidate }}
-          release_version: ${{ inputs.release_version }}
+          release_version: ${{ inputs.pypi_release_version }}
           dockerhub_username: ${{ secrets.DOCKERHUB_OPENMETADATA_USERNAME }}
           dockerhub_token: ${{ secrets.DOCKERHUB_OPENMETADATA_TOKEN }}