From c2a847fc2e5050ca266dde398c5f233d3193b0d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=BC=D0=B8=D1=82=D1=80=D0=B8=D0=B9=20=D0=A1=D0=BE?= =?UTF-8?q?=D0=BB=D0=BE=D0=B2=D1=8C=D0=B5=D0=B2?= Date: Tue, 9 Jun 2026 14:55:04 +0300 Subject: [PATCH] =?UTF-8?q?ci:=20=D1=80=D1=83=D0=B1=D0=B8=D0=BB=D1=8C?= =?UTF-8?q?=D0=BD=D0=B8=D0=BA=20RUN=5FALL=20=D0=B4=D0=BB=D1=8F=20=D0=BF?= =?UTF-8?q?=D1=80=D0=BE=D0=B3=D0=BE=D0=BD=D0=B0=20=D0=B2=D1=81=D0=B5=D1=85?= =?UTF-8?q?=20gradle-=D1=81=D0=B5=D1=80=D0=B2=D0=B8=D1=81=D0=BE=D0=B2=20(?= =?UTF-8?q?=D0=BA=D1=80=D0=BE=D0=BC=D0=B5=20pcp-tgu-ui-service)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Run pipeline + RUN_ALL=true прогоняет test/build/package всех бэкендов независимо от changes; deploy:dev остаётся ручным. Обычный пуш по-прежнему собирает только изменившийся сервис. pcp-tgu-ui-service source-guard-нут (только push), чтобы не попадать в RUN_ALL/web-пайплайны. --- .gitlab-ci.yml | 3 +++ .gitlab/ci/pcp-ballistics-service.yml | 4 ++++ .gitlab/ci/pcp-complex-mission-service-tle.yml | 8 ++++++++ .gitlab/ci/pcp-coverage-scheme-service.yml | 4 ++++ .gitlab/ci/pcp-dynamic-plan-service.yml | 4 ++++ .gitlab/ci/pcp-mission-planing-service.yml | 4 ++++ .gitlab/ci/pcp-request-service.yml | 4 ++++ .gitlab/ci/pcp-satellite-catalog-service.yml | 4 ++++ .gitlab/ci/pcp-spring-boot-admin-server.yml | 4 ++++ .gitlab/ci/pcp-stations-service.yml | 4 ++++ .gitlab/ci/pcp-tgu-service.yml | 4 ++++ .gitlab/ci/pcp-tgu-ui-service.yml | 12 ++++++------ .gitlab/ci/pcp-ui-service.yml | 4 ++++ .gitlab/ci/slots-service.yml | 4 ++++ .gitlab/ci/spring-cloud-config-server.yml | 4 ++++ 15 files changed, 65 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bcb63bf..a12e74f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,8 @@ workflow: rules: + # Аварийный рубильник: «Run pipeline» c переменной RUN_ALL=true прогоняет + # все gradle-сервисы (кроме pcp-tgu-ui-service) независимо от изменений. + - if: '$RUN_ALL == "true"' - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' changes: - services/pcp-ballistics-service/**/* diff --git a/.gitlab/ci/pcp-ballistics-service.yml b/.gitlab/ci/pcp-ballistics-service.yml index abee5d4..3933de7 100644 --- a/.gitlab/ci/pcp-ballistics-service.yml +++ b/.gitlab/ci/pcp-ballistics-service.yml @@ -30,6 +30,7 @@ variables: .ballistics:rules:build-and-image: rules: + - if: '$RUN_ALL == "true"' - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' changes: *ballistics_changes - if: '$CI_COMMIT_BRANCH == "dev"' @@ -40,6 +41,7 @@ variables: .ballistics:rules:test: rules: + - if: '$RUN_ALL == "true"' - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' changes: *ballistics_changes - if: '$CI_COMMIT_BRANCH == "dev"' @@ -51,6 +53,8 @@ variables: .ballistics:rules:deploy-dev: rules: + - if: '$RUN_ALL == "true"' + when: manual - if: '$CI_COMMIT_BRANCH == "dev"' changes: *ballistics_changes when: manual diff --git a/.gitlab/ci/pcp-complex-mission-service-tle.yml b/.gitlab/ci/pcp-complex-mission-service-tle.yml index f92710d..8d843ec 100644 --- a/.gitlab/ci/pcp-complex-mission-service-tle.yml +++ b/.gitlab/ci/pcp-complex-mission-service-tle.yml @@ -39,6 +39,7 @@ variables: .complex-mission-service:rules:build-and-image: rules: + - if: '$RUN_ALL == "true"' - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' changes: *complex_mission_service_changes - if: '$CI_COMMIT_BRANCH == "dev"' @@ -49,6 +50,7 @@ variables: .complex-mission-service:rules:test: rules: + - if: '$RUN_ALL == "true"' - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' changes: *complex_mission_service_changes - if: '$CI_COMMIT_BRANCH == "dev"' @@ -60,6 +62,8 @@ variables: .complex-mission-service:rules:deploy-dev: rules: + - if: '$RUN_ALL == "true"' + when: manual - if: '$CI_COMMIT_BRANCH == "dev"' changes: *complex_mission_service_changes when: manual @@ -74,6 +78,7 @@ variables: .tle-monitoring:rules:build-and-image: rules: + - if: '$RUN_ALL == "true"' - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' changes: *tle_monitoring_changes - if: '$CI_COMMIT_BRANCH == "dev"' @@ -84,6 +89,7 @@ variables: .tle-monitoring:rules:test: rules: + - if: '$RUN_ALL == "true"' - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' changes: *tle_monitoring_changes - if: '$CI_COMMIT_BRANCH == "dev"' @@ -95,6 +101,8 @@ variables: .tle-monitoring:rules:deploy-dev: rules: + - if: '$RUN_ALL == "true"' + when: manual - if: '$CI_COMMIT_BRANCH == "dev"' changes: *tle_monitoring_changes when: manual diff --git a/.gitlab/ci/pcp-coverage-scheme-service.yml b/.gitlab/ci/pcp-coverage-scheme-service.yml index 8eb58ee..3815ac4 100644 --- a/.gitlab/ci/pcp-coverage-scheme-service.yml +++ b/.gitlab/ci/pcp-coverage-scheme-service.yml @@ -21,6 +21,7 @@ variables: .coverage_scheme:rules:build-and-image: rules: + - if: '$RUN_ALL == "true"' - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' changes: *coverage_scheme_changes - if: '$CI_COMMIT_BRANCH == "dev"' @@ -31,6 +32,7 @@ variables: .coverage_scheme:rules:test: rules: + - if: '$RUN_ALL == "true"' - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' changes: *coverage_scheme_changes - if: '$CI_COMMIT_BRANCH == "dev"' @@ -42,6 +44,8 @@ variables: .coverage_scheme:rules:deploy-dev: rules: + - if: '$RUN_ALL == "true"' + when: manual - if: '$CI_COMMIT_BRANCH == "dev"' changes: *coverage_scheme_changes when: manual diff --git a/.gitlab/ci/pcp-dynamic-plan-service.yml b/.gitlab/ci/pcp-dynamic-plan-service.yml index 34fc694..8670456 100644 --- a/.gitlab/ci/pcp-dynamic-plan-service.yml +++ b/.gitlab/ci/pcp-dynamic-plan-service.yml @@ -22,6 +22,7 @@ variables: .dynamic_plan:rules:build-and-image: rules: + - if: '$RUN_ALL == "true"' - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' changes: *dynamic_plan_changes - if: '$CI_COMMIT_BRANCH == "dev"' @@ -32,6 +33,7 @@ variables: .dynamic_plan:rules:test: rules: + - if: '$RUN_ALL == "true"' - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' changes: *dynamic_plan_changes - if: '$CI_COMMIT_BRANCH == "dev"' @@ -43,6 +45,8 @@ variables: .dynamic_plan:rules:deploy-dev: rules: + - if: '$RUN_ALL == "true"' + when: manual - if: '$CI_COMMIT_BRANCH == "dev"' changes: *dynamic_plan_changes when: manual diff --git a/.gitlab/ci/pcp-mission-planing-service.yml b/.gitlab/ci/pcp-mission-planing-service.yml index 81d76a1..7bce7d2 100644 --- a/.gitlab/ci/pcp-mission-planing-service.yml +++ b/.gitlab/ci/pcp-mission-planing-service.yml @@ -21,6 +21,7 @@ variables: .mission-planing:rules:build-and-image: rules: + - if: '$RUN_ALL == "true"' - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' changes: *mission_planing_changes - if: '$CI_COMMIT_BRANCH == "dev"' @@ -31,6 +32,7 @@ variables: .mission-planing:rules:test: rules: + - if: '$RUN_ALL == "true"' - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' changes: *mission_planing_changes - if: '$CI_COMMIT_BRANCH == "dev"' @@ -42,6 +44,8 @@ variables: .mission-planing:rules:deploy-dev: rules: + - if: '$RUN_ALL == "true"' + when: manual - if: '$CI_COMMIT_BRANCH == "dev"' changes: *mission_planing_changes when: manual diff --git a/.gitlab/ci/pcp-request-service.yml b/.gitlab/ci/pcp-request-service.yml index c1321b3..b227846 100644 --- a/.gitlab/ci/pcp-request-service.yml +++ b/.gitlab/ci/pcp-request-service.yml @@ -22,6 +22,7 @@ variables: .request:rules:build-and-image: rules: + - if: '$RUN_ALL == "true"' - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' changes: *request_changes - if: '$CI_COMMIT_BRANCH == "dev"' @@ -32,6 +33,7 @@ variables: .request:rules:test: rules: + - if: '$RUN_ALL == "true"' - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' changes: *request_changes - if: '$CI_COMMIT_BRANCH == "dev"' @@ -43,6 +45,8 @@ variables: .request:rules:deploy-dev: rules: + - if: '$RUN_ALL == "true"' + when: manual - if: '$CI_COMMIT_BRANCH == "dev"' changes: *request_changes when: manual diff --git a/.gitlab/ci/pcp-satellite-catalog-service.yml b/.gitlab/ci/pcp-satellite-catalog-service.yml index f794eb8..e1a2845 100644 --- a/.gitlab/ci/pcp-satellite-catalog-service.yml +++ b/.gitlab/ci/pcp-satellite-catalog-service.yml @@ -20,6 +20,7 @@ variables: .satellite-catalog:rules:build-and-image: rules: + - if: '$RUN_ALL == "true"' - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' changes: *satellite_catalog_changes - if: '$CI_COMMIT_BRANCH == "dev"' @@ -30,6 +31,7 @@ variables: .satellite-catalog:rules:test: rules: + - if: '$RUN_ALL == "true"' - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' changes: *satellite_catalog_changes - if: '$CI_COMMIT_BRANCH == "dev"' @@ -41,6 +43,8 @@ variables: .satellite-catalog:rules:deploy-dev: rules: + - if: '$RUN_ALL == "true"' + when: manual - if: '$CI_COMMIT_BRANCH == "dev"' changes: *satellite_catalog_changes when: manual diff --git a/.gitlab/ci/pcp-spring-boot-admin-server.yml b/.gitlab/ci/pcp-spring-boot-admin-server.yml index 9e274c9..503b831 100644 --- a/.gitlab/ci/pcp-spring-boot-admin-server.yml +++ b/.gitlab/ci/pcp-spring-boot-admin-server.yml @@ -18,6 +18,7 @@ variables: .spring-boot-admin:rules:build-and-image: rules: + - if: '$RUN_ALL == "true"' - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' changes: *spring_boot_admin_changes - if: '$CI_COMMIT_BRANCH == "dev"' @@ -28,6 +29,7 @@ variables: .spring-boot-admin:rules:test: rules: + - if: '$RUN_ALL == "true"' - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' changes: *spring_boot_admin_changes - if: '$CI_COMMIT_BRANCH == "dev"' @@ -39,6 +41,8 @@ variables: .spring-boot-admin:rules:deploy-dev: rules: + - if: '$RUN_ALL == "true"' + when: manual - if: '$CI_COMMIT_BRANCH == "dev"' changes: *spring_boot_admin_changes when: manual diff --git a/.gitlab/ci/pcp-stations-service.yml b/.gitlab/ci/pcp-stations-service.yml index 3a9619b..04445ca 100644 --- a/.gitlab/ci/pcp-stations-service.yml +++ b/.gitlab/ci/pcp-stations-service.yml @@ -20,6 +20,7 @@ variables: .stations:rules:build-and-image: rules: + - if: '$RUN_ALL == "true"' - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' changes: *stations_changes - if: '$CI_COMMIT_BRANCH == "dev"' @@ -30,6 +31,7 @@ variables: .stations:rules:test: rules: + - if: '$RUN_ALL == "true"' - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' changes: *stations_changes - if: '$CI_COMMIT_BRANCH == "dev"' @@ -41,6 +43,8 @@ variables: .stations:rules:deploy-dev: rules: + - if: '$RUN_ALL == "true"' + when: manual - if: '$CI_COMMIT_BRANCH == "dev"' changes: *stations_changes when: manual diff --git a/.gitlab/ci/pcp-tgu-service.yml b/.gitlab/ci/pcp-tgu-service.yml index 539ea63..4a1f47c 100644 --- a/.gitlab/ci/pcp-tgu-service.yml +++ b/.gitlab/ci/pcp-tgu-service.yml @@ -18,6 +18,7 @@ variables: .tgu:rules:build-and-image: rules: + - if: '$RUN_ALL == "true"' - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' changes: *tgu_changes - if: '$CI_COMMIT_BRANCH == "dev"' @@ -28,6 +29,7 @@ variables: .tgu:rules:test: rules: + - if: '$RUN_ALL == "true"' - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' changes: *tgu_changes - if: '$CI_COMMIT_BRANCH == "dev"' @@ -39,6 +41,8 @@ variables: .tgu:rules:deploy-dev: rules: + - if: '$RUN_ALL == "true"' + when: manual - if: '$CI_COMMIT_BRANCH == "dev"' changes: *tgu_changes when: manual diff --git a/.gitlab/ci/pcp-tgu-ui-service.yml b/.gitlab/ci/pcp-tgu-ui-service.yml index 841b348..5504d80 100644 --- a/.gitlab/ci/pcp-tgu-ui-service.yml +++ b/.gitlab/ci/pcp-tgu-ui-service.yml @@ -21,9 +21,9 @@ variables: rules: - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' changes: *tgu_ui_changes - - if: '$CI_COMMIT_BRANCH == "dev"' + - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "dev"' changes: *tgu_ui_changes - - if: '$CI_COMMIT_BRANCH == "master"' + - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "master"' changes: *tgu_ui_changes - when: never @@ -31,23 +31,23 @@ variables: rules: - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' changes: *tgu_ui_changes - - if: '$CI_COMMIT_BRANCH == "dev"' + - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "dev"' changes: *tgu_ui_changes when: manual - - if: '$CI_COMMIT_BRANCH == "master"' + - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "master"' changes: *tgu_ui_changes - when: never .tgu-ui:rules:deploy-dev: rules: - - if: '$CI_COMMIT_BRANCH == "dev"' + - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "dev"' changes: *tgu_ui_changes when: manual - when: never .tgu-ui:rules:deploy-master: rules: - - if: '$CI_COMMIT_BRANCH == "master"' + - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "master"' changes: *tgu_ui_changes when: manual - when: never diff --git a/.gitlab/ci/pcp-ui-service.yml b/.gitlab/ci/pcp-ui-service.yml index 4a8b407..e3b432c 100644 --- a/.gitlab/ci/pcp-ui-service.yml +++ b/.gitlab/ci/pcp-ui-service.yml @@ -21,6 +21,7 @@ variables: .ui:rules:build-and-image: rules: + - if: '$RUN_ALL == "true"' - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' changes: *ui_changes - if: '$CI_COMMIT_BRANCH == "dev"' @@ -31,6 +32,7 @@ variables: .ui:rules:test: rules: + - if: '$RUN_ALL == "true"' - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' changes: *ui_changes - if: '$CI_COMMIT_BRANCH == "dev"' @@ -42,6 +44,8 @@ variables: .ui:rules:deploy-dev: rules: + - if: '$RUN_ALL == "true"' + when: manual - if: '$CI_COMMIT_BRANCH == "dev"' changes: *ui_changes when: manual diff --git a/.gitlab/ci/slots-service.yml b/.gitlab/ci/slots-service.yml index a4e7f22..bb14020 100644 --- a/.gitlab/ci/slots-service.yml +++ b/.gitlab/ci/slots-service.yml @@ -21,6 +21,7 @@ variables: .slots:rules:build-and-image: rules: + - if: '$RUN_ALL == "true"' - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' changes: *slots_changes - if: '$CI_COMMIT_BRANCH == "dev"' @@ -31,6 +32,7 @@ variables: .slots:rules:test: rules: + - if: '$RUN_ALL == "true"' - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' changes: *slots_changes - if: '$CI_COMMIT_BRANCH == "dev"' @@ -42,6 +44,8 @@ variables: .slots:rules:deploy-dev: rules: + - if: '$RUN_ALL == "true"' + when: manual - if: '$CI_COMMIT_BRANCH == "dev"' changes: *slots_changes when: manual diff --git a/.gitlab/ci/spring-cloud-config-server.yml b/.gitlab/ci/spring-cloud-config-server.yml index c8b835c..0d62908 100644 --- a/.gitlab/ci/spring-cloud-config-server.yml +++ b/.gitlab/ci/spring-cloud-config-server.yml @@ -24,6 +24,7 @@ variables: .config-server:rules:build-and-image: rules: + - if: '$RUN_ALL == "true"' - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' changes: *config_server_changes - if: '$CI_COMMIT_BRANCH == "dev"' @@ -34,6 +35,7 @@ variables: .config-server:rules:test: rules: + - if: '$RUN_ALL == "true"' - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' changes: *config_server_changes - if: '$CI_COMMIT_BRANCH == "dev"' @@ -45,6 +47,8 @@ variables: .config-server:rules:deploy-dev: rules: + - if: '$RUN_ALL == "true"' + when: manual - if: '$CI_COMMIT_BRANCH == "dev"' changes: *config_server_changes when: manual