From 8d849e2ff9ef9fa29676b737e090fb8baa6d5ff2 Mon Sep 17 00:00:00 2001
From: Huan Truong <huan.truong@kasmweb.com>
Date: Thu, 14 Aug 2025 14:03:44 -0500
Subject: [PATCH] QA-136 updated rules logic

---
 ci-scripts/gitlab-ci.template | 20 ++++++++++----------
 ci-scripts/weekly-manifest.sh |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/ci-scripts/gitlab-ci.template b/ci-scripts/gitlab-ci.template
index 6bfb403..50ac420 100644
--- a/ci-scripts/gitlab-ci.template
+++ b/ci-scripts/gitlab-ci.template
@@ -37,7 +37,7 @@ build_{{ IMAGE.name1 }}_{{ IMAGE.name2 }}:
         $DOCKERHUB_REVERT ||
         $REVERT_IS_ROLLING
       when: never
-    - if: $PARENT_PIPELINE_SOURCE == "schedule" && $RUN_SET != "schedule"
+    - if: $PARENT_PIPELINE_SOURCE == "schedule" && $RUN_SET == "schedule"
       when: never
     {% if FILE_LIMITS %}- changes:
       {% for FILE in files %}- {{ FILE }}
@@ -66,7 +66,7 @@ build_{{ IMAGE.name1 }}_{{ IMAGE.name2 }}:
         $DOCKERHUB_REVERT ||
         $REVERT_IS_ROLLING
       when: never
-    - if: $PARENT_PIPELINE_SOURCE == "schedule" && $RUN_SET != "schedule"
+    - if: $PARENT_PIPELINE_SOURCE == "schedule" && $RUN_SET == "schedule"
       when: never
     {% if FILE_LIMITS %}- changes:
       {% for FILE in files %}- {{ FILE }}
@@ -95,7 +95,7 @@ test_{{ IMAGE.name1 }}_{{ IMAGE.name2 }}:
         $DOCKERHUB_REVERT ||
         $REVERT_IS_ROLLING
       when: never
-    - if: $PARENT_PIPELINE_SOURCE == "schedule" && $RUN_SET != "schedule"
+    - if: $PARENT_PIPELINE_SOURCE == "schedule" && $RUN_SET == "schedule"
       when: never
     {% if FILE_LIMITS %}- changes:
       {% for FILE in files %}- {{ FILE }}
@@ -126,7 +126,7 @@ test_{{ IMAGE.name1 }}_{{ IMAGE.name2 }}:
         $DOCKERHUB_REVERT ||
         $REVERT_IS_ROLLING
       when: never
-    - if: $PARENT_PIPELINE_SOURCE == "schedule" && $RUN_SET != "schedule"
+    - if: $PARENT_PIPELINE_SOURCE == "schedule" && $RUN_SET == "schedule"
       when: never
     {% if FILE_LIMITS %}- changes:
       {% for FILE in files %}- {{ FILE }}
@@ -155,7 +155,7 @@ scan_{{ IMAGE.name1 }}_{{ IMAGE.name2 }}:
         $README_PASSWORD ||
         $QUAY_API_KEY
       when: never
-    - if: $PARENT_PIPELINE_SOURCE == "schedule" && $RUN_SET != "schedule"
+    - if: $PARENT_PIPELINE_SOURCE == "schedule" && $RUN_SET == "schedule"
       when: never
     {% if FILE_LIMITS %}- changes:
       {% for FILE in files %}- {{ FILE }}
@@ -189,7 +189,7 @@ scan_{{ IMAGE.name1 }}_{{ IMAGE.name2 }}:
         $README_PASSWORD ||
         $QUAY_API_KEY
       when: never
-    - if: $PARENT_PIPELINE_SOURCE == "schedule" && $RUN_SET != "schedule"
+    - if: $PARENT_PIPELINE_SOURCE == "schedule" && $RUN_SET == "schedule"
       when: never
     {% if FILE_LIMITS %}- changes:
       {% for FILE in files %}- {{ FILE }}
@@ -225,7 +225,7 @@ manifest_{{ IMAGE.name1 }}_{{ IMAGE.name2 }}:
         $DOCKERHUB_REVERT ||
         $REVERT_IS_ROLLING
       when: never
-    - if: $PARENT_PIPELINE_SOURCE == "schedule" && $RUN_SET != "schedule"
+    - if: $PARENT_PIPELINE_SOURCE == "schedule" && $RUN_SET == "schedule"
       when: never
     {% if FILE_LIMITS %}- changes:
       {% for FILE in files %}- {{ FILE }}
@@ -255,7 +255,7 @@ manifest_{{ IMAGE.name1 }}_{{ IMAGE.name2 }}:
         $DOCKERHUB_REVERT ||
         $REVERT_IS_ROLLING
       when: never
-    - if: $PARENT_PIPELINE_SOURCE == "schedule" && $RUN_SET != "schedule"
+    - if: $PARENT_PIPELINE_SOURCE == "schedule" && $RUN_SET == "schedule"
       when: never
     {% if FILE_LIMITS %}- changes:
       {% for FILE in files %}- {{ FILE }}
@@ -279,7 +279,7 @@ manifest_{{ IMAGE.name1 }}_{{ IMAGE.name2 }}:
 #############################
 
 {% for IMAGE in multiImages %}
-manifest_{{ IMAGE.name1 }}_{{ IMAGE.name2 }}:
+manifest_weekly_{{ IMAGE.name1 }}_{{ IMAGE.name2 }}:
   stage: manifest
   rules:
     - if: >
@@ -301,7 +301,7 @@ manifest_{{ IMAGE.name1 }}_{{ IMAGE.name2 }}:
 {% endfor %}
 
 {% for IMAGE in singleImages %}
-manifest_{{ IMAGE.name1 }}_{{ IMAGE.name2 }}:
+manifest_weekly_{{ IMAGE.name1 }}_{{ IMAGE.name2 }}:
   stage: manifest
   rules:
     - if: >
diff --git a/ci-scripts/weekly-manifest.sh b/ci-scripts/weekly-manifest.sh
index 9160f25..7a395ef 100644
--- a/ci-scripts/weekly-manifest.sh
+++ b/ci-scripts/weekly-manifest.sh
@@ -48,9 +48,9 @@ if [[ "${TYPE}" == "multi" ]]; then
   
 # Single arch image just pull and push
 else
-    tagImage "${ORG_NAME}/${NAME}:x86_64-${SANITIZED_BRANCH_DAILY}" "${ORG_NAME}/${NAME}:${SANITIZED_BRANCH}"
+    tagImage "${ORG_NAME}/${NAME}:${SANITIZED_BRANCH_DAILY}" "${ORG_NAME}/${NAME}:${SANITIZED_BRANCH}"
     
     for MIRROR in "${REGISTRY_MIRRORS[@]}"; do
-        tagImage "${ORG_NAME}/${NAME}:x86_64-${SANITIZED_BRANCH_DAILY}" "${MIRROR}/${MIRROR_ORG_NAME}/${NAME}:${SANITIZED_BRANCH}"
+        tagImage "${ORG_NAME}/${NAME}:${SANITIZED_BRANCH_DAILY}" "${MIRROR}/${MIRROR_ORG_NAME}/${NAME}:${SANITIZED_BRANCH}"
     done
 fi
\ No newline at end of file