Merge branch 'deprecate-x-y-stable-secure-images' into 'master'

Drop x-y-stable Secure image pinning

See merge request gitlab-org/gitlab!29603

changelogs/unreleased/deprecate-x-y-stable-secure-images.yml

+---
+title: Drop x-y-stable version pinning for Secure templates
+merge_request: 29603
+author:
+type: removed

lib/gitlab/ci/templates/Security/Dependency-Scanning.gitlab-ci.yml

@@ -21,7 +21,6 @@ dependency_scanning:
   services:
     - docker:stable-dind
   script:
-    - export DS_VERSION=${SP_VERSION:-$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')}
     - |
       if ! docker info &>/dev/null; then
         if [ -z "$DOCKER_HOST" -a "$KUBERNETES_PORT" ]; then
@@ -68,7 +67,7 @@ dependency_scanning:
         ) \
         --volume "$PWD:/code" \
         --volume /var/run/docker.sock:/var/run/docker.sock \
-        "$SECURITY_SCANNER_IMAGE_PREFIX/dependency-scanning:$DS_VERSION" /code
+        "$SECURITY_SCANNER_IMAGE_PREFIX/dependency-scanning:$DS_MAJOR_VERSION" /code
   artifacts:
     reports:
       dependency_scanning: gl-dependency-scanning-report.json

lib/gitlab/ci/templates/Security/License-Management.gitlab-ci.yml

@@ -3,11 +3,12 @@
 
 variables:
   LICENSE_MANAGEMENT_SETUP_CMD: ''  # If needed, specify a command to setup your environment with a custom package manager.
+  LICENSE_MANAGEMENT_VERSION: 3
 
 license_management:
   stage: test
   image:
-    name: "registry.gitlab.com/gitlab-org/security-products/license-management:$CI_SERVER_VERSION_MAJOR-$CI_SERVER_VERSION_MINOR-stable"
+    name: "registry.gitlab.com/gitlab-org/security-products/license-management:$LICENSE_MANAGEMENT_VERSION"
     entrypoint: [""]
   variables:
     SETUP_CMD: $LICENSE_MANAGEMENT_SETUP_CMD

lib/gitlab/ci/templates/Security/License-Scanning.gitlab-ci.yml

@@ -6,11 +6,12 @@
 
 variables:
   LICENSE_MANAGEMENT_SETUP_CMD: ''  # If needed, specify a command to setup your environment with a custom package manager.
+  LICENSE_MANAGEMENT_VERSION: 3
 
 license_scanning:
   stage: test
   image:
-    name: "registry.gitlab.com/gitlab-org/security-products/license-management:$CI_SERVER_VERSION_MAJOR-$CI_SERVER_VERSION_MINOR-stable"
+    name: "registry.gitlab.com/gitlab-org/security-products/license-management:$LICENSE_MANAGEMENT_VERSION"
     entrypoint: [""]
   variables:
     SETUP_CMD: $LICENSE_MANAGEMENT_SETUP_CMD

lib/gitlab/ci/templates/Security/SAST.gitlab-ci.yml

@@ -29,7 +29,6 @@ sast:
   services:
     - docker:stable-dind
   script:
-    - export SAST_VERSION=${SP_VERSION:-$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')}
     - |
       if ! docker info &>/dev/null; then
         if [ -z "$DOCKER_HOST" -a "$KUBERNETES_PORT" ]; then
@@ -41,7 +40,7 @@ sast:
         $(awk 'BEGIN{for(v in ENVIRON) print v}' | grep -v -E '^(DOCKER_|CI|GITLAB_|FF_|HOME|PWD|OLDPWD|PATH|SHLVL|HOSTNAME)' | awk '{printf " -e %s", $0}') \
         --volume "$PWD:/code" \
         --volume /var/run/docker.sock:/var/run/docker.sock \
-        "registry.gitlab.com/gitlab-org/security-products/sast:$SAST_VERSION" /app/bin/run /code
+        "registry.gitlab.com/gitlab-org/security-products/sast:$SAST_ANALYZER_IMAGE_TAG" /app/bin/run /code
   except:
     variables:
       - $SAST_DISABLED