Merge pull request #296 from Axway/APIGOV-28746

APIGOV-28746 - SRM integration
Axway · Nov 6, 2024 · f949bd3 · f949bd3
2 parents de149dd + 31b6e71
commit f949bd3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/.csr-profile.json b/.csr-profile.json
@@ -6,13 +6,12 @@
       "fortify": true,
       "irius-risk": false,
       "pentest": false,
-      "twistlock": true,
-      "blackduck": true,
+      "twistlock": false,
+      "blackduck": false,
       "third-party-policy-violation": false,
       "appspider": false,
       "insightvm": false
     },
     "suppressions": [
   ]
 }
-
diff --git 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"
@@ -13,6 +12,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"
@@ -68,24 +71,24 @@ stages:
   - security-review
 
 twistlock-discovery:
-  extends: .twistlock
   rules:
     - !reference [.mirror-branch-csr-rules, rules]
   before_script:
     - apk --no-cache update && apk add make
     - 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:
     - apk --no-cache update && apk add make
     - cd traceability && make docker-build
     - export IMAGE_NAME=apigee-traceability-agent:latest
     - cd ..
+    - echo "TL_TA=true" >> build.env
 
 twistlock-discovery:on-schedule:
   variables: