Merge branch 'pguinoiseau/revert-gitlab-scanners-ds-workaround' into 'main'

fix: revert "fix: workaround for the outdated ds template"

See merge request gitlab-com/gl-infra/common-ci-tasks!927

gitlab-scanners.yml

@@ -8,17 +8,6 @@ include:
   - template: Jobs/Secret-Detection.latest.gitlab-ci.yml
   - template: Jobs/Dependency-Scanning.latest.gitlab-ci.yml
-  # TEMPORARY WORKAROUND: ops.gitlab.net does not have the updated Dependency-Scanning.latest.gitlab-ci.yml
-  #                       template yet so the "dependency-scanning" job is not extending the intended job leading to
-  #                       a "jobs:dependency-scanning config should contain either a trigger or a needs:pipeline" error.
-  #                       Once ops.gitlab.net has the updated template, we can copy the contents of
-  #                       gitlab-scanners-ds.yml back into this file and remove this include.
-  - local: internal/gitlab-scanners/ds.yml
-    rules:
-      - if: $CI_SERVER_HOST == "gitlab.com"
-    inputs:
-      stage: $[[ inputs.stage ]]
-
 sast:
   stage: $[[ inputs.stage ]]
   needs: []
@@ -31,3 +20,7 @@ sast:
 dependency_scanning:
   stage: $[[ inputs.stage ]]
   needs: []
+
+dependency-scanning:
+  stage: $[[ inputs.stage ]]
+  needs: []

internal/gitlab-scanners/ds.yml

-spec:
-  inputs:
-    stage:
----
-
-dependency-scanning:
-  stage: $[[ inputs.stage ]]
-  needs: []