From 749546d95b78c3b2a8e1ff4adff877b546dffa35 Mon Sep 17 00:00:00 2001
From: dfeldick <dfeldick@axway.com>
Date: Wed, 6 Nov 2024 08:02:05 -0700
Subject: [PATCH 1/9] APIGOV-28746 - SRM integration

---
 .csr-profile.json | 5 ++---
 .gitlab-ci.yml    | 4 ++++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.csr-profile.json b/.csr-profile.json
index 464de8a7..50f65945 100644
--- a/.csr-profile.json
+++ b/.csr-profile.json
@@ -6,8 +6,8 @@
       "fortify": true,
       "irius-risk": false,
       "pentest": false,
-      "twistlock": true,
-      "blackduck": true,
+      "twistlock": false,
+      "blackduck": false,
       "third-party-policy-violation": false,
       "appspider": false,
       "insightvm": false
@@ -15,4 +15,3 @@
     "suppressions": [
   ]
 }
-  
\ No newline at end of file
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5d77bccc..194f5a47 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,6 +13,10 @@ variables:
   # Blackduck
   BLACKDUCK_PROJECT_NAME: "Amplify - APIC Apigee Agents"
 
+  # SRM
+  SRM_PROJECT_NAME: "${BLACKDUCK_PROJECT_NAME}"
+  SRM_PROJECT_ID: "228"
+
   # these needed for go workspace
   GOWORK: ${CI_PROJECT_DIR}/go.work
   GOFLAGS: "-mod=readonly"

From 10cde799b66ed38b026b268da536c27b915a81ac Mon Sep 17 00:00:00 2001
From: dfeldick <dfeldick@axway.com>
Date: Wed, 6 Nov 2024 08:15:28 -0700
Subject: [PATCH 2/9] APIGOV-28746 - test

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 194f5a47..cd89acfd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,8 +13,7 @@ variables:
   # Blackduck
   BLACKDUCK_PROJECT_NAME: "Amplify - APIC Apigee Agents"
 
-  # SRM
-  SRM_PROJECT_NAME: "${BLACKDUCK_PROJECT_NAME}"
+  # SRM CT_NAME: "${BLACKDUCK_PROJECT_NAME}"
   SRM_PROJECT_ID: "228"
 
   # these needed for go workspace

From 7b025c3a55b8416d454fb1234d6732e9e0701bfa Mon Sep 17 00:00:00 2001
From: dfeldick <dfeldick@axway.com>
Date: Wed, 6 Nov 2024 08:45:01 -0700
Subject: [PATCH 3/9] APIGOV-28746 - test

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cd89acfd..194f5a47 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,7 +13,8 @@ variables:
   # Blackduck
   BLACKDUCK_PROJECT_NAME: "Amplify - APIC Apigee Agents"
 
-  # SRM CT_NAME: "${BLACKDUCK_PROJECT_NAME}"
+  # SRM
+  SRM_PROJECT_NAME: "${BLACKDUCK_PROJECT_NAME}"
   SRM_PROJECT_ID: "228"
 
   # these needed for go workspace

From ce5f4e84c190423a6cfce062433536236fdb62cd Mon Sep 17 00:00:00 2001
From: dfeldick <dfeldick@axway.com>
Date: Wed, 6 Nov 2024 11:00:25 -0700
Subject: [PATCH 4/9] APIGOV-28746 - test

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 194f5a47..2ffa9e69 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,7 +13,7 @@ variables:
   # Blackduck
   BLACKDUCK_PROJECT_NAME: "Amplify - APIC Apigee Agents"
 
-  # SRM
+  #  SRM
   SRM_PROJECT_NAME: "${BLACKDUCK_PROJECT_NAME}"
   SRM_PROJECT_ID: "228"
 

From f9b27da74332ec6b5c30eecb0fbe44c9854f08cc Mon Sep 17 00:00:00 2001
From: dfeldick <dfeldick@axway.com>
Date: Wed, 6 Nov 2024 11:10:53 -0700
Subject: [PATCH 5/9] APIGOV-28746 - teste

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2ffa9e69..194f5a47 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,7 +13,7 @@ variables:
   # Blackduck
   BLACKDUCK_PROJECT_NAME: "Amplify - APIC Apigee Agents"
 
-  #  SRM
+  # SRM
   SRM_PROJECT_NAME: "${BLACKDUCK_PROJECT_NAME}"
   SRM_PROJECT_ID: "228"
 

From 74000c6fc3fec904b6041d4104e77595e71bf4ad Mon Sep 17 00:00:00 2001
From: dfeldick <dfeldick@axway.com>
Date: Wed, 6 Nov 2024 11:17:34 -0700
Subject: [PATCH 6/9] APIGOV-28746 - test

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 194f5a47..2ffa9e69 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,7 +13,7 @@ variables:
   # Blackduck
   BLACKDUCK_PROJECT_NAME: "Amplify - APIC Apigee Agents"
 
-  # SRM
+  #  SRM
   SRM_PROJECT_NAME: "${BLACKDUCK_PROJECT_NAME}"
   SRM_PROJECT_ID: "228"
 

From 7655199a7721b78bd8df251ab91333be5034fbbf Mon Sep 17 00:00:00 2001
From: dfeldick <dfeldick@axway.com>
Date: Wed, 6 Nov 2024 13:39:29 -0700
Subject: [PATCH 7/9] APIGOV-28746 - srm

---
 .gitlab-ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2ffa9e69..00d934e3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,7 +13,7 @@ variables:
   # Blackduck
   BLACKDUCK_PROJECT_NAME: "Amplify - APIC Apigee Agents"
 
-  #  SRM
+  # SRM
   SRM_PROJECT_NAME: "${BLACKDUCK_PROJECT_NAME}"
   SRM_PROJECT_ID: "228"
 
@@ -72,7 +72,6 @@ stages:
   - security-review
 
 twistlock-discovery:
-  extends: .twistlock
   rules:
     - !reference [.mirror-branch-csr-rules, rules]
   before_script:
@@ -80,9 +79,9 @@ twistlock-discovery:
     - cd discovery && make docker-build
     - export IMAGE_NAME=apigee-discovery-agent:latest
     - cd ..
+    - echo "TL_DA=true" >> build.env
 
 twistlock-traceability:
-  extends: .twistlock
   rules:
     - !reference [.mirror-branch-csr-rules, rules]
   before_script:
@@ -90,6 +89,7 @@ twistlock-traceability:
     - cd traceability && make docker-build
     - export IMAGE_NAME=apigee-traceability-agent:latest
     - cd ..
+    - echo "TL_TA=true" >> build.env
 
 twistlock-discovery:on-schedule:
   variables:

From e19fcc160fcc0386e734e7cc026fb95f8f307cb4 Mon Sep 17 00:00:00 2001
From: dfeldick <dfeldick@axway.com>
Date: Wed, 6 Nov 2024 13:41:51 -0700
Subject: [PATCH 8/9] APIGOV-28746 - t

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 00d934e3..c271d869 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,7 +13,7 @@ variables:
   # Blackduck
   BLACKDUCK_PROJECT_NAME: "Amplify - APIC Apigee Agents"
 
-  # SRM
+  #  SRM
   SRM_PROJECT_NAME: "${BLACKDUCK_PROJECT_NAME}"
   SRM_PROJECT_ID: "228"
 

From 31b6e71055db1698812ee8256b6765b8eb8d4c28 Mon Sep 17 00:00:00 2001
From: dfeldick <dfeldick@axway.com>
Date: Wed, 6 Nov 2024 14:14:18 -0700
Subject: [PATCH 9/9] APIGOV-28746 - remove override

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c271d869..b4d4b6f9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,7 +2,6 @@ image: docker:dind
 
 variables:
   PROJECT: "agents-apigee"
-  CSR_SUPPRESSION_LIST: "/tmp/csr-suppressions/amplify-central/golang-agents-common.json"
 
   # Fortify
   FORTIFY_PROJECT: "10716"