diff --git a/.csr-profile.json b/.csr-profile.json index 464de8a..50f6594 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 5d77bcc..b4d4b6f 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" @@ -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,7 +71,6 @@ stages: - security-review twistlock-discovery: - extends: .twistlock rules: - !reference [.mirror-branch-csr-rules, rules] before_script: @@ -76,9 +78,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: @@ -86,6 +88,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: