Commit d45a7685 authored by Lucas Charles's avatar Lucas Charles

fix: Reintroduce top-level SAST_ANALYZER_IMAGE_TAG for SCS

Previous MR that added deprecation shim for Security Code Scan v2 to v3
moved the default variable definition into the `rules:variables` block.
This is not always present when customers have overridden the entire
`rules` block leading to failures to pull images

Relates to https://gitlab.com/gitlab-org/gitlab/-/issues/350935

Changelog: fixed
parent 68e91614
...@@ -221,6 +221,7 @@ security-code-scan-sast: ...@@ -221,6 +221,7 @@ security-code-scan-sast:
image: image:
name: "$SAST_ANALYZER_IMAGE" name: "$SAST_ANALYZER_IMAGE"
variables: variables:
SAST_ANALYZER_IMAGE_TAG: '2'
SAST_ANALYZER_IMAGE: "$SECURE_ANALYZERS_PREFIX/security-code-scan:$SAST_ANALYZER_IMAGE_TAG" SAST_ANALYZER_IMAGE: "$SECURE_ANALYZERS_PREFIX/security-code-scan:$SAST_ANALYZER_IMAGE_TAG"
rules: rules:
- if: $SAST_DISABLED - if: $SAST_DISABLED
...@@ -230,8 +231,6 @@ security-code-scan-sast: ...@@ -230,8 +231,6 @@ security-code-scan-sast:
# This rule shim will be removed in %15.0, # This rule shim will be removed in %15.0,
# See https://gitlab.com/gitlab-org/gitlab/-/issues/350935 # See https://gitlab.com/gitlab-org/gitlab/-/issues/350935
- if: $CI_COMMIT_BRANCH && $CI_SERVER_VERSION_MAJOR == '14' - if: $CI_COMMIT_BRANCH && $CI_SERVER_VERSION_MAJOR == '14'
variables:
SAST_ANALYZER_IMAGE_TAG: '2'
exists: exists:
- '**/*.csproj' - '**/*.csproj'
- '**/*.vbproj' - '**/*.vbproj'
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment