APIGOV-29656 - changes for SSG

.gitlab-ci.yml

@@ -34,22 +34,22 @@ include:
     ref: master
     file: "/.gitlab-ci-sonar.yml"
   - project: "apigov/beano_cicd"
-    ref: $BEANO_CICD_BLUE
+    ref: $BEANO_CICD_GREEN
     # the order of these include files is important
     file:
       - "/gitlabci/variables.yml"
       - "/gitlabci/restrictions.yml"
       - "/gitlabci/jobs.yml"
   - project: "scurity/gitlabci"
-    ref: $SCURITY_BLUE
+    ref: $SCURITY_GREEN
     file:
       - "/.gitlab-ci-fortify.yml"
       - "/.gitlab-ci-twistlock.yml"
       - "/.gitlab-ci-iriusrisk.yml"
       - "/.gitlab-ci-blackduck.yml"
       - "/.gitlab-ci-security.yml"
   - project: "apigov/beano_cicd"
-    ref: $BEANO_CICD_BLUE
+    ref: $BEANO_CICD_GREEN
     # this one MUST be after the scurity jobs in order for overrides to work correctly!
     file:
       - "/gitlabci/securityjobs.yml"
@@ -106,16 +106,12 @@ upload-files-to-srm:
   rules:
     - !reference [.only-never-rule, rules]
 
-upload-files-to-srm:on-schedule:
-  rules:
-    - !reference [.only-never-rule, rules]
-
 # For these 2, override the 'needs' from base
-report-main:
+report-latest:
   needs:
-    - fetch-fortify
+    - fetch-blackduck:on-schedule
 
-report-latest-and-push:
+report-snapshot-and-push:
   needs:
-    - fetch-fortify:on-schedule
-    - fetch-third-party:on-schedule
+    - fetch-fortify
+    - fetch-third-party