Merge branch...

Merge branch '441437-e-version-0-7-1-1-deb11u1-for-shellcheck-was-not-found-in-templates-shellcheck-job' into 'master' 

ci: Fix shellcheck version installed on bookworm

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/144466



Merged-by: David Dieulivol <ddieulivol@gitlab.com>
Approved-by: Peter Leitzen <pleitzen@gitlab.com>
Approved-by: David Dieulivol <ddieulivol@gitlab.com>
Co-authored-by: Rémy Coutable <remy@rymai.me>

.gitlab/ci/ci-templates.gitlab-ci.yml

-templates-shellcheck:
-  extends:
-    - .ci-templates:rules:shellcheck
-    - .default-before_script
-    - .default-retry
-    - .ruby-cache
-    - .use-pg15
-  stage: test
-  needs:
-    - setup-test-env
-  script:
-    # Try bullseye (0.7) first and then bookworm (0.9)
-    - apt update && apt install -y shellcheck=0.7.1-1+deb11u1 || apt install -y shellcheck=0.9.0-1
-    - bundle exec scripts/lint_templates_bash.rb

.gitlab/ci/rules.gitlab-ci.yml

@@ -191,6 +191,7 @@
   - "{,ee/,jh/}{bin,config}/**/*.rb"
 
 .ci-templates-patterns: &ci-templates-patterns
+  - ".gitlab/ci/static-analysis.gitlab-ci.yml"
   - "lib/gitlab/ci/templates/**/*.gitlab-ci.yml"
 
 .ci-qa-patterns: &ci-qa-patterns

.gitlab/ci/static-analysis.gitlab-ci.yml

@@ -200,6 +200,20 @@ audit-event-types-verify:
   script:
     - bundle exec rake gitlab:audit_event_types:check_docs
 
+templates-shellcheck:
+  extends:
+    - .ci-templates:rules:shellcheck
+    - .default-before_script
+    - .default-retry
+    - .ruby-cache
+    - .use-pg15
+  stage: lint
+  needs:
+    - setup-test-env
+  script:
+    - apt update && apt install -y shellcheck=0.9.0-1
+    - bundle exec scripts/lint_templates_bash.rb
+
 ping-appsec-for-sast-findings:
   stage: lint
   image: alpine:latest