From 40001a73c16410499aa58e41072e135347b33875 Mon Sep 17 00:00:00 2001
From: dfeldick <dfeldick@axway.com>
Date: Wed, 4 Sep 2024 14:09:39 -0700
Subject: [PATCH 1/3] APIGOV-28133 - use shared csr jobs file

---
 .gitlab-ci.yml | 89 +++++++++++++++++++++++++-------------------------
 1 file changed, 45 insertions(+), 44 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4f2e2c9..f385f60 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -53,10 +53,11 @@ include:
       - "/.gitlab-ci-blackduck.yml"
       - "/.gitlab-ci-csr.yml"
   - project: "apigov/beano_cicd"
-    ref: $BEANO_CICD_LATEST
+    ref: APIGOV-28133
     # the order of these include files is important
     file:
       - "/gitlabci/csrjobs.yml"
+      - "/gitlabci/csrjobsformirror.yml"
 
 stages:
   - test
@@ -114,46 +115,46 @@ twistlock-traceability:on-schedule:
     - export IMAGE_NAME=ghcr.io/axway/apigee_traceability_agent:${LAST_TAG_VERSION}
     - docker pull ${IMAGE_NAME}
 
-# overridden from csrjobs.yml because mirror repos like this one don't get merge events
-fortify:
-  rules:
-    - !reference [.mirror-branch-csr-rules, rules]
-
-fetch-fortify:
-  rules:
-    - !reference [.mirror-branch-csr-rules, rules]
-
-blackduck-rapid:
-  rules:
-    - !reference [.mirror-branch-csr-rules, rules]
-
-blackduck:on-schedule:
-  rules:
-    - !reference [.mirror-schedule-csr-rules, rules]
-  before_script:
-    - !reference [.get-agent-last-tag, script]
-
-run-csr:
-  rules:
-    - !reference [.mirror-branch-csr-rules, rules]
-
-####################
-# CSR - overridden from csrjobs.yml to effectively not see these jobs ever. For some reason, probably multi-level
-# extends and overrides, using only-never for these csr jobs doesn't work. Had to do it like this.
-####################
-fetch-iriusrisk:
-  rules:
-    - !reference [.only-never-rule, rules]
-
-fetch-iriusrisk:on-schedule:
-  rules:
-    - !reference [.only-never-rule, rules]
-
-twistlock:
-  rules:
-    - !reference [.only-never-rule, rules]
-  dependencies:
-
-twistlock:on-schedule:
-  rules:
-    - !reference [.only-never-rule, rules]
+# # overridden from csrjobs.yml because mirror repos like this one don't get merge events
+# fortify:
+#   rules:
+#     - !reference [.mirror-branch-csr-rules, rules]
+
+# fetch-fortify:
+#   rules:
+#     - !reference [.mirror-branch-csr-rules, rules]
+
+# blackduck-rapid:
+#   rules:
+#     - !reference [.mirror-branch-csr-rules, rules]
+
+# blackduck:on-schedule:
+#   rules:
+#     - !reference [.mirror-schedule-csr-rules, rules]
+#   before_script:
+#     - !reference [.get-agent-last-tag, script]
+
+# run-csr:
+#   rules:
+#     - !reference [.mirror-branch-csr-rules, rules]
+
+# ####################
+# # CSR - overridden from csrjobs.yml to effectively not see these jobs ever. For some reason, probably multi-level
+# # extends and overrides, using only-never for these csr jobs doesn't work. Had to do it like this.
+# ####################
+# fetch-iriusrisk:
+#   rules:
+#     - !reference [.only-never-rule, rules]
+
+# fetch-iriusrisk:on-schedule:
+#   rules:
+#     - !reference [.only-never-rule, rules]
+
+# twistlock:
+#   rules:
+#     - !reference [.only-never-rule, rules]
+#   dependencies:
+
+# twistlock:on-schedule:
+#   rules:
+#     - !reference [.only-never-rule, rules]

From ce55a9e54eef7d9676d011ae2b48844496bece1f Mon Sep 17 00:00:00 2001
From: dfeldick <dfeldick@axway.com>
Date: Wed, 4 Sep 2024 14:19:26 -0700
Subject: [PATCH 2/3] APIGOV-28133 - cleanup

---
 .gitlab-ci.yml | 44 --------------------------------------------
 1 file changed, 44 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f385f60..b07d490 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -114,47 +114,3 @@ twistlock-traceability:on-schedule:
     - echo "Using the last tagged version ${LAST_TAG_VERSION}"
     - export IMAGE_NAME=ghcr.io/axway/apigee_traceability_agent:${LAST_TAG_VERSION}
     - docker pull ${IMAGE_NAME}
-
-# # overridden from csrjobs.yml because mirror repos like this one don't get merge events
-# fortify:
-#   rules:
-#     - !reference [.mirror-branch-csr-rules, rules]
-
-# fetch-fortify:
-#   rules:
-#     - !reference [.mirror-branch-csr-rules, rules]
-
-# blackduck-rapid:
-#   rules:
-#     - !reference [.mirror-branch-csr-rules, rules]
-
-# blackduck:on-schedule:
-#   rules:
-#     - !reference [.mirror-schedule-csr-rules, rules]
-#   before_script:
-#     - !reference [.get-agent-last-tag, script]
-
-# run-csr:
-#   rules:
-#     - !reference [.mirror-branch-csr-rules, rules]
-
-# ####################
-# # CSR - overridden from csrjobs.yml to effectively not see these jobs ever. For some reason, probably multi-level
-# # extends and overrides, using only-never for these csr jobs doesn't work. Had to do it like this.
-# ####################
-# fetch-iriusrisk:
-#   rules:
-#     - !reference [.only-never-rule, rules]
-
-# fetch-iriusrisk:on-schedule:
-#   rules:
-#     - !reference [.only-never-rule, rules]
-
-# twistlock:
-#   rules:
-#     - !reference [.only-never-rule, rules]
-#   dependencies:
-
-# twistlock:on-schedule:
-#   rules:
-#     - !reference [.only-never-rule, rules]

From 1d13f1e090ee1a627f64e60bdbd4bf8dc06ddcfd Mon Sep 17 00:00:00 2001
From: dfeldick <dfeldick@axway.com>
Date: Wed, 4 Sep 2024 14:21:13 -0700
Subject: [PATCH 3/3] APIGOV-28133 - fix beano ref

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b07d490..ff50ac1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -53,7 +53,7 @@ include:
       - "/.gitlab-ci-blackduck.yml"
       - "/.gitlab-ci-csr.yml"
   - project: "apigov/beano_cicd"
-    ref: APIGOV-28133
+    ref: $BEANO_CICD_LATEST
     # the order of these include files is important
     file:
       - "/gitlabci/csrjobs.yml"