Merge branch 'simplify-pipeline-rules-4' into 'main'

Improve interaction between scheduled and docker pipelines

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

Merged-by: Evan Read <eread@gitlab.com>
Approved-by: Evan Read <eread@gitlab.com>
Co-authored-by: Marcel Amirault <mamirault@gitlab.com>

4 files changed, 5 insertions, 25 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a48958ef..36939a2b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,11 +10,11 @@ include:
       - '/ci/danger-review.yml'
 
 stages:
-  - build-images
   - build
   - security
   - test
   - pre-deploy
+  - build-images
   - deploy
   - post-deploy
 
diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml
index 44f40883..30a3fb13 100644
--- a/.gitlab/ci/rules.gitlab-ci.yml
+++ b/.gitlab/ci/rules.gitlab-ci.yml
@@ -63,14 +63,13 @@ default:
 #
 .rules_docker_images:
   rules:
-    - if: '$DOCS_PROJECT_PIPELINE_TYPE == "Cleanup chores pipeline"'
-      when: never
-    - if: '$CI_PIPELINE_SOURCE == "schedule"'
+    - if: '$DOCS_PROJECT_PIPELINE_TYPE == "Build docker images pipeline"'
       when: manual
       allow_failure: true
 
 .rules_docker_image_tests:
   rules:
+    - if: '$DOCS_PROJECT_PIPELINE_TYPE == "Build docker images pipeline"'
     - if: '$DOCS_PROJECT_PIPELINE_TYPE =~ /^MR pipeline.*/'
       changes:
         - $DOCKERFILE
@@ -83,23 +82,13 @@ default:
 
 .rules_site_tests:
   rules:
-    - if: '$DOCS_PROJECT_PIPELINE_TYPE == "Cleanup chores pipeline"'
-      when: never
-    # Don't run site tests for review apps.
-    - if: '$DOCS_PROJECT_PIPELINE_TYPE == "Upstream review app pipeline"'
-      when: never
-    - if: '$CI_PIPELINE_SOURCE == "schedule"'
+    - if: '$DOCS_PROJECT_PIPELINE_TYPE == "Hourly site deployment pipeline"'
     - if: '$DOCS_PROJECT_PIPELINE_TYPE =~ /^MR pipeline.*/'
     - if: '$DOCS_PROJECT_PIPELINE_TYPE == "Default branch pipeline"'
     - if: '$DOCS_PROJECT_PIPELINE_TYPE == "Stable branch pipeline"'
 
 .rules_prod:
   rules:
-    - if: '$DOCS_PROJECT_PIPELINE_TYPE == "Cleanup chores pipeline"'
-      when: never
-    # Don't deploy to production for trigerred pipelines (usually review apps)
-    - if: '$DOCS_PROJECT_PIPELINE_TYPE == "Upstream review app pipeline"'
-      when: never
     - if: '$DOCS_PROJECT_PIPELINE_TYPE == "Hourly site deployment pipeline"'
     - if: '$DOCS_PROJECT_PIPELINE_TYPE == "Default branch pipeline"'
     - if: '$DOCS_PROJECT_PIPELINE_TYPE == "Stable branch pipeline"'
@@ -116,8 +105,6 @@ default:
 
 .rules_pages:
   rules:
-    - if: '$DOCS_PROJECT_PIPELINE_TYPE == "Cleanup chores pipeline"'
-      when: never
     # Don't deploy to production for trigerred pipelines (usually review apps)
     - if: '$DOCS_PROJECT_PIPELINE_TYPE == "Upstream review app pipeline"'
       when: never
diff --git a/.gitlab/ci/test.gitlab-ci.yml b/.gitlab/ci/test.gitlab-ci.yml
index aafffe72..dea9dcd8 100644
--- a/.gitlab/ci/test.gitlab-ci.yml
+++ b/.gitlab/ci/test.gitlab-ci.yml
@@ -227,10 +227,3 @@ lint_dockerfiles:
   script:
     - apk add make
     - make hadolint-tests
-
-#
-# eslint-sast scans html too, so run in security stage after html files are generated
-#
-
-eslint-sast:
-  stage: security
diff --git a/doc/releases.md b/doc/releases.md
index 33ba4bad..1496ef1c 100644
--- a/doc/releases.md
+++ b/doc/releases.md
@@ -177,7 +177,7 @@ _Do this after the release post is live._
    has passed and created a [Docker image](https://gitlab.com/gitlab-org/gitlab-docs/container_registry/631635?orderBy=NAME&sort=desc&search[]=).
 1. Merge the [release merge request](#create-release-merge-request).
 1. Go to the [scheduled pipelines page](https://gitlab.com/gitlab-org/gitlab-docs/-/pipeline_schedules)
-   and run the `Build docker images weekly` pipeline.
+   and run the `Build docker images manually` pipeline.
 1. In the scheduled pipeline you just started, manually run the **image:docs-latest** job that builds the `:latest` Docker image.
 1. When the pipeline is complete, run the `Build docs.gitlab.com every hour` scheduled pipeline to deploy all new versions to the public documentation site.
    You don't need to run any jobs manually for this second pipeline.