From bcf2cd69614e6c8f21dfce434cfc7dbe334a294f Mon Sep 17 00:00:00 2001 From: dfeldick Date: Mon, 4 Nov 2024 09:53:07 -0700 Subject: [PATCH 1/5] APIGOV-28746 - SRM integration --- .csr-profile.json | 2 +- .gitlab-ci.yml | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.csr-profile.json b/.csr-profile.json index d75898297..2ea0e4d8f 100644 --- a/.csr-profile.json +++ b/.csr-profile.json @@ -7,7 +7,7 @@ "irius-risk": false, "pentest": false, "twistlock": false, - "blackduck": true, + "blackduck": false, "third-party-policy-violation": false, "appspider": false, "insightvm": false diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4dcca9c19..4b28ee289 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,6 +19,10 @@ variables: # Blackduck BLACKDUCK_PROJECT_NAME: "Amplify - APIC Agent SDK" + # SRM + SRM_PROJECT_NAME: "$BLACKDUCK_PROJECT_NAME" + SRM_PROJECT_ID: "225" + # just to be sure we don't do vendoring GOFLAGS: "-mod=mod" From 86213420dff62d0f135eb99c6ec09e4568a054b7 Mon Sep 17 00:00:00 2001 From: dfeldick Date: Mon, 4 Nov 2024 10:04:35 -0700 Subject: [PATCH 2/5] 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 4b28ee289..951e8d6f9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -64,7 +64,7 @@ stages: - security-review - update-dep -############################################################ +################ ############################################ # Section for triggering agent updates ############################################################ .trigger-downstream-agent: From 848c281d732fc4c47ff2cb53ba375a8012d7583d Mon Sep 17 00:00:00 2001 From: dfeldick Date: Mon, 4 Nov 2024 10:30:40 -0700 Subject: [PATCH 3/5] 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 951e8d6f9..4b28ee289 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -64,7 +64,7 @@ stages: - security-review - update-dep -################ ############################################ +############################################################ # Section for triggering agent updates ############################################################ .trigger-downstream-agent: From 1ace6d3bc835d569aaa2451969ecd6f2bb6823ca Mon Sep 17 00:00:00 2001 From: dfeldick Date: Mon, 4 Nov 2024 13:39:25 -0700 Subject: [PATCH 4/5] APIGOV-28746 - test --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4b28ee289..233755c5e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -34,7 +34,7 @@ include: ref: master file: "/.gitlab-ci-sonar.yml" - project: "apigov/beano_cicd" - ref: $BEANO_CICD_LATEST + ref: APIGOV-28747 # the order of these include files is important file: - "/gitlabci/variables.yml" @@ -49,7 +49,7 @@ include: - "/.gitlab-ci-blackduck.yml" - "/.gitlab-ci-csr.yml" - project: "apigov/beano_cicd" - ref: $BEANO_CICD_LATEST + ref: APIGOV-28747 # this one MUST be after the scurity jobs in order for overrides to work correctly! file: - "/gitlabci/csrjobs.yml" From e14c015bf72cf72707325663668585e25f822090 Mon Sep 17 00:00:00 2001 From: dfeldick Date: Tue, 5 Nov 2024 15:31:47 -0700 Subject: [PATCH 5/5] APIGOV-28746 - SRM integration --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 233755c5e..4b28ee289 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -34,7 +34,7 @@ include: ref: master file: "/.gitlab-ci-sonar.yml" - project: "apigov/beano_cicd" - ref: APIGOV-28747 + ref: $BEANO_CICD_LATEST # the order of these include files is important file: - "/gitlabci/variables.yml" @@ -49,7 +49,7 @@ include: - "/.gitlab-ci-blackduck.yml" - "/.gitlab-ci-csr.yml" - project: "apigov/beano_cicd" - ref: APIGOV-28747 + ref: $BEANO_CICD_LATEST # this one MUST be after the scurity jobs in order for overrides to work correctly! file: - "/gitlabci/csrjobs.yml"