diff options
| -rw-r--r-- | .gitlab-ci.yml | 10 | ||||
| -rw-r--r-- | .gitlab/ci/build-and-deploy.gitlab-ci.yml | 11 | ||||
| -rw-r--r-- | .gitlab/ci/docker-images.gitlab-ci.yml | 4 | ||||
| -rw-r--r-- | .gitlab/ci/rules.gitlab-ci.yml | 54 | ||||
| -rw-r--r-- | .gitlab/ci/security.gitlab-ci.yml | 4 | ||||
| -rw-r--r-- | .gitlab/ci/test.gitlab-ci.yml | 2 |
6 files changed, 50 insertions, 35 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 36939a2b..301428be 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -40,14 +40,6 @@ workflow: - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' variables: DOCS_PROJECT_PIPELINE_TYPE: "MR pipeline: branch $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" - - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_COMMIT_REF_NAME =~ /algolia/' - variables: - DOCS_PROJECT_PIPELINE_TYPE: "MR pipeline (Algolia): branch $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" - SEARCH_BACKEND: 'algolia' - - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_COMMIT_REF_NAME =~ /gps/' - variables: - DOCS_PROJECT_PIPELINE_TYPE: "MR pipeline (Google): branch $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" - SEARCH_BACKEND: 'google' - if: '$CI_PIPELINE_SOURCE == "schedule" && $PIPELINE_SCHEDULE_TIMING == "monthly"' variables: DOCS_PROJECT_PIPELINE_TYPE: "Monthly stopped environments cleanup pipeline" @@ -65,7 +57,7 @@ workflow: DOCS_PROJECT_PIPELINE_TYPE: "Pipeline source = pipeline" - if: '$CI_PIPELINE_SOURCE == "trigger"' variables: - DOCS_PROJECT_PIPELINE_TYPE: "Upstream review app pipeline" + DOCS_PROJECT_PIPELINE_TYPE: "Review app pipeline" # Allow branch pipelines for the default branch and stable branches named XX.X - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' variables: diff --git a/.gitlab/ci/build-and-deploy.gitlab-ci.yml b/.gitlab/ci/build-and-deploy.gitlab-ci.yml index a61648bc..5028214c 100644 --- a/.gitlab/ci/build-and-deploy.gitlab-ci.yml +++ b/.gitlab/ci/build-and-deploy.gitlab-ci.yml @@ -115,8 +115,8 @@ review: when: manual - if: '$CI_PROJECT_PATH !~ /^gitlab-org/' when: never - - if: '$DOCS_PROJECT_PIPELINE_TYPE =~ /^MR pipeline.*/' - - if: '$DOCS_PROJECT_PIPELINE_TYPE == "Upstream review app pipeline"' + - if: '$CI_MERGE_REQUEST_ID' + - if: '$CI_PIPELINE_SOURCE == "pipeline" || $CI_PIPELINE_SOURCE == "trigger"' - if: '$CI_COMMIT_BRANCH =~ /docs-preview/' # TODO: Remove once no projects create such branch # @@ -143,10 +143,7 @@ review_stop: when: manual - if: '$CI_PROJECT_PATH !~ /^gitlab-org/' when: never - - if: '$DOCS_PROJECT_PIPELINE_TYPE =~ /^MR pipeline.*/' - allow_failure: true - when: manual - - if: '$DOCS_PROJECT_PIPELINE_TYPE == "Upstream review app pipeline"' + - if: '$CI_MERGE_REQUEST_ID || $CI_PIPELINE_SOURCE == "pipeline"|| $CI_PIPELINE_SOURCE == "trigger"' allow_failure: true when: manual # TODO: Remove once no projects create such branch @@ -164,7 +161,7 @@ delete_stopped_environments: before_script: [] dependencies: [] rules: - - if: '$DOCS_PROJECT_PIPELINE_TYPE == "Monthly stopped environments cleanup pipeline"' + - if: $CI_PIPELINE_SOURCE == "schedule" && $PIPELINE_SCHEDULE_TIMING == "monthly" stage: test script: - apk --update add curl jq diff --git a/.gitlab/ci/docker-images.gitlab-ci.yml b/.gitlab/ci/docker-images.gitlab-ci.yml index af0938b3..1c9ded55 100644 --- a/.gitlab/ci/docker-images.gitlab-ci.yml +++ b/.gitlab/ci/docker-images.gitlab-ci.yml @@ -166,7 +166,7 @@ image:docs-single: - docker push $IMAGE_NAME # Only branches with versions like 10.4 rules: - - if: '$DOCS_PROJECT_PIPELINE_TYPE == "Stable branch pipeline"' + - if: '$CI_COMMIT_BRANCH =~ /^\d{1,2}\.\d{1,2}$/' # # Test the GitLab docs single version Docker image if changes made to its Dockerfile @@ -219,7 +219,7 @@ image:docs-single-lunrjs: - docker push $IMAGE_NAME # Only branches with versions like 10.4 rules: - - if: '$DOCS_PROJECT_PIPELINE_TYPE == "Stable branch pipeline"' + - if: '$CI_COMMIT_BRANCH =~ /^\d{1,2}\.\d{1,2}$/' # # Test the GitLab docs single version Docker image with lunr.js enabled diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml index 30a3fb13..a61f8a3e 100644 --- a/.gitlab/ci/rules.gitlab-ci.yml +++ b/.gitlab/ci/rules.gitlab-ci.yml @@ -63,50 +63,76 @@ default: # .rules_docker_images: rules: +<<<<<<< HEAD - if: '$DOCS_PROJECT_PIPELINE_TYPE == "Build docker images pipeline"' +======= + - if: $CHORES_PIPELINE == "true" + when: never + - if: '$CI_PIPELINE_SOURCE == "schedule"' +>>>>>>> parent of bc4bcd6e (Start using pipelines names in rules) when: manual allow_failure: true .rules_docker_image_tests: rules: +<<<<<<< HEAD - if: '$DOCS_PROJECT_PIPELINE_TYPE == "Build docker images pipeline"' - if: '$DOCS_PROJECT_PIPELINE_TYPE =~ /^MR pipeline.*/' +======= + - if: $CI_PIPELINE_SOURCE == "merge_request_event" +>>>>>>> parent of bc4bcd6e (Start using pipelines names in rules) changes: - $DOCKERFILE .rules_chores: rules: - - if: '$DOCS_PROJECT_PIPELINE_TYPE == "Cleanup chores pipeline"' + - if: '$CI_PIPELINE_SOURCE == "schedule" && $CHORES_PIPELINE == "true"' when: manual allow_failure: true .rules_site_tests: rules: - - 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"' + - if: $CHORES_PIPELINE == "true" + when: never + # Don't run site tests for review apps. + - if: '$CI_PIPELINE_SOURCE == "pipeline" || $CI_PIPELINE_SOURCE == "trigger"' + when: never + - if: '$CI_PIPELINE_SOURCE == "schedule"' + - if: '$CI_MERGE_REQUEST_ID' + - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' + - if: '$CI_COMMIT_BRANCH =~ /^\d{1,2}\.\d{1,2}$/' .rules_prod: rules: - - 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"' + - if: $CHORES_PIPELINE == "true" + when: never + # Don't deploy to production for trigerred pipelines (usually review apps) + - if: '$CI_PIPELINE_SOURCE == "pipeline" || $CI_PIPELINE_SOURCE == "trigger"' + when: never + - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' + - if: '$CI_COMMIT_BRANCH =~ /^\d{1,2}\.\d{1,2}$/' .rules_dev: rules: - - if: '$DOCS_PROJECT_PIPELINE_TYPE =~ /^MR pipeline.*/' + - if: $CI_MERGE_REQUEST_ID && $CI_COMMIT_REF_NAME =~ /algolia/ + variables: + SEARCH_BACKEND: 'algolia' + - if: $CI_MERGE_REQUEST_ID && $CI_COMMIT_REF_NAME =~ /gps/ + variables: + SEARCH_BACKEND: 'google' + - if: '$CI_MERGE_REQUEST_ID' - if: '$CI_COMMIT_BRANCH =~ /docs-preview/' # TODO: Remove once no projects create such branch - - if: '$DOCS_PROJECT_PIPELINE_TYPE == "Cleanup chores pipeline"' + - if: '$CI_PIPELINE_SOURCE == "schedule" && $CHORES_PIPELINE == "true"' .rules_upstream_review_app: rules: - - if: '$DOCS_PROJECT_PIPELINE_TYPE == "Upstream review app pipeline"' + - if: '$CI_PIPELINE_SOURCE == "pipeline" || $CI_PIPELINE_SOURCE == "trigger"' .rules_pages: rules: + - if: $CHORES_PIPELINE == "true" + when: never # Don't deploy to production for trigerred pipelines (usually review apps) - - if: '$DOCS_PROJECT_PIPELINE_TYPE == "Upstream review app pipeline"' + - if: '$CI_PIPELINE_SOURCE == "pipeline"|| $CI_PIPELINE_SOURCE == "trigger"' when: never - - if: '$DOCS_PROJECT_PIPELINE_TYPE == "Hourly site deployment pipeline"' - - if: '$DOCS_PROJECT_PIPELINE_TYPE == "Default branch pipeline"' + - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' diff --git a/.gitlab/ci/security.gitlab-ci.yml b/.gitlab/ci/security.gitlab-ci.yml index 53b1f94e..e8ec2837 100644 --- a/.gitlab/ci/security.gitlab-ci.yml +++ b/.gitlab/ci/security.gitlab-ci.yml @@ -59,7 +59,7 @@ secret_detection: rules: - if: $SECRET_DETECTION_DISABLED when: never - - if: '$DOCS_PROJECT_PIPELINE_TYPE == "Default branch pipeline"' - - if: '$DOCS_PROJECT_PIPELINE_TYPE =~ /^MR pipeline.*/' + - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + - if: $CI_PIPELINE_SOURCE == "merge_request_event" script: - /analyzer run diff --git a/.gitlab/ci/test.gitlab-ci.yml b/.gitlab/ci/test.gitlab-ci.yml index 3749162b..b3c79854 100644 --- a/.gitlab/ci/test.gitlab-ci.yml +++ b/.gitlab/ci/test.gitlab-ci.yml @@ -65,7 +65,7 @@ check_asdf_installation: - make setup-asdf - make install-asdf-dependencies rules: - - if: '$DOCS_PROJECT_PIPELINE_TYPE =~ /^MR pipeline.*/' + - if: $CI_PIPELINE_SOURCE == "merge_request_event" changes: - .tool-versions |