From 157deee3bfefb43e286413a51ae15a95c86230e7 Mon Sep 17 00:00:00 2001
From: Shlomo Heigh <shlomo.heigh@cyberark.com>
Date: Tue, 17 Sep 2024 15:59:59 -0400
Subject: [PATCH] CNJR-5954: Push internal versions (just exclude 'edge' tag)

---
 Jenkinsfile       | 6 +++---
 publish-images.sh | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index de702d0489..410d63560f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1173,9 +1173,9 @@ pipeline {
         script {
           release(INFRAPOOL_EXECUTORV2_AGENT_0) { billOfMaterialsDirectory, assetDirectory ->
             // Publish docker images
-            // INFRAPOOL_EXECUTORV2_AGENT_0.agentSh './publish-images.sh --edge --dockerhub'
-            // INFRAPOOL_EXECUTORV2ARM_AGENT_0.agentSh './publish-images.sh --edge --arch=arm64'
-            // INFRAPOOL_EXECUTORV2_AGENT_0.agentSh './publish-manifest.sh --edge'
+            INFRAPOOL_EXECUTORV2_AGENT_0.agentSh './publish-images.sh --edge'
+            INFRAPOOL_EXECUTORV2ARM_AGENT_0.agentSh './publish-images.sh --edge --arch=arm64'
+            INFRAPOOL_EXECUTORV2_AGENT_0.agentSh './publish-manifest.sh --edge'
 
             // Create deb and rpm packages (ARM64)
             INFRAPOOL_EXECUTORV2ARM_AGENT_0.agentSh 'echo "CONJUR_VERSION=5" >> debify.env'
diff --git a/publish-images.sh b/publish-images.sh
index b668ab6e26..d45f8bdb51 100755
--- a/publish-images.sh
+++ b/publish-images.sh
@@ -113,15 +113,15 @@ if [[ "${PUBLISH_EDGE}" = true ]]; then
   tag_and_push "${VERSION}-${ARCH}" "${RH_LOCAL_IMAGE}" "registry.tld/conjur-ubi"
 
   # Push image to internal registry
-  tag_and_push "edge-${ARCH}" "${LOCAL_IMAGE}" "registry.tld/${IMAGE_NAME}"
-  tag_and_push "edge-${ARCH}" "${RH_LOCAL_IMAGE}" "registry.tld/conjur-ubi"
+  # tag_and_push "edge-${ARCH}" "${LOCAL_IMAGE}" "registry.tld/${IMAGE_NAME}"
+  # tag_and_push "edge-${ARCH}" "${RH_LOCAL_IMAGE}" "registry.tld/conjur-ubi"
 
   # Publish release specific and edge tags to dockerhub
   if [[ "${DOCKERHUB}" = true ]]; then
     echo "Pushing to DockerHub"
     
     tag_and_push "${VERSION}" "${LOCAL_IMAGE}" "${IMAGE_NAME}"
-    tag_and_push "edge" "${LOCAL_IMAGE}" "${IMAGE_NAME}"
+    # tag_and_push "edge" "${LOCAL_IMAGE}" "${IMAGE_NAME}"
   fi
 fi