From a7ece8e0bdde529831c5f271e488c34c66ff8a71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= Date: Fri, 29 Mar 2024 08:27:49 +0100 Subject: [PATCH] Restore consistency in YAML anchor names Commit a4e9ce500a42d596e64c477df66c9bcdd692b06b added "pipelines" to CI job trigger lists without updating the names of the YAML anchors containing those lists accordingly. Update YAML anchor names so that they are consistent with their own contents. --- .gitlab-ci.yml | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bee2ebbcb1..303fdc552a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -219,7 +219,7 @@ stages: ### Job Templates -.api-schedules-tags-triggers-web-triggering-rules: &api_schedules_tags_triggers_web_triggering_rules +.api-pipelines-schedules-tags-triggers-web-triggering-rules: &api_pipelines_schedules_tags_triggers_web_triggering_rules only: - api - pipelines @@ -228,7 +228,7 @@ stages: - triggers - web -.api-schedules-triggers-web-triggering-rules: &api_schedules_triggers_web_triggering_rules +.api-pipelines-schedules-triggers-web-triggering-rules: &api_pipelines_schedules_triggers_web_triggering_rules only: - api - pipelines @@ -347,7 +347,7 @@ stages: .shotgun: &shotgun_job <<: *base_image - <<: *api_schedules_tags_triggers_web_triggering_rules + <<: *api_pipelines_schedules_tags_triggers_web_triggering_rules stage: performance script: - if [ -z "$CI_COMMIT_TAG" ]; then export SHOTGUN_ROUNDS=1; else export SHOTGUN_ROUNDS=3; fi @@ -806,12 +806,12 @@ gcc:8fips:amd64: EXTRA_CONFIGURE: "--with-libidn2 --enable-fips-mode --disable-tracing" <<: *oraclelinux_8fips_amd64_image <<: *build_job - <<: *api_schedules_tags_triggers_web_triggering_rules + <<: *api_pipelines_schedules_tags_triggers_web_triggering_rules system:gcc:8fips:amd64: <<: *oraclelinux_8fips_amd64_image <<: *system_test_job - <<: *api_schedules_tags_triggers_web_triggering_rules + <<: *api_pipelines_schedules_tags_triggers_web_triggering_rules needs: - job: gcc:8fips:amd64 artifacts: true @@ -819,7 +819,7 @@ system:gcc:8fips:amd64: unit:gcc:8fips:amd64: <<: *oraclelinux_8fips_amd64_image <<: *unit_test_job - <<: *api_schedules_tags_triggers_web_triggering_rules + <<: *api_pipelines_schedules_tags_triggers_web_triggering_rules needs: - job: gcc:8fips:amd64 artifacts: true @@ -831,12 +831,12 @@ gcc:9fips:amd64: EXTRA_CONFIGURE: "--with-libidn2 --enable-fips-mode --disable-leak-detection --disable-tracing" <<: *oraclelinux_9fips_amd64_image <<: *build_job - <<: *api_schedules_tags_triggers_web_triggering_rules + <<: *api_pipelines_schedules_tags_triggers_web_triggering_rules system:gcc:9fips:amd64: <<: *oraclelinux_9fips_amd64_image <<: *system_test_job - <<: *api_schedules_tags_triggers_web_triggering_rules + <<: *api_pipelines_schedules_tags_triggers_web_triggering_rules needs: - job: gcc:9fips:amd64 artifacts: true @@ -844,7 +844,7 @@ system:gcc:9fips:amd64: unit:gcc:9fips:amd64: <<: *oraclelinux_9fips_amd64_image <<: *unit_test_job - <<: *api_schedules_tags_triggers_web_triggering_rules + <<: *api_pipelines_schedules_tags_triggers_web_triggering_rules needs: - job: gcc:9fips:amd64 artifacts: true @@ -1014,7 +1014,7 @@ system:gcc:out-of-tree: artifacts: true <<: *base_image <<: *system_test_job - <<: *api_schedules_tags_triggers_web_triggering_rules + <<: *api_pipelines_schedules_tags_triggers_web_triggering_rules unit:gcc:out-of-tree: variables: @@ -1024,7 +1024,7 @@ unit:gcc:out-of-tree: artifacts: true <<: *base_image <<: *unit_test_job - <<: *api_schedules_tags_triggers_web_triggering_rules + <<: *api_pipelines_schedules_tags_triggers_web_triggering_rules # Jobs for tarball GCC builds on Debian 12 "bookworm" (amd64) @@ -1044,7 +1044,7 @@ gcc:tarball: system:gcc:tarball: <<: *base_image <<: *system_test_job - <<: *api_schedules_tags_triggers_web_triggering_rules + <<: *api_pipelines_schedules_tags_triggers_web_triggering_rules before_script: - cd bind-* - *setup_interfaces @@ -1058,7 +1058,7 @@ system:gcc:tarball: unit:gcc:tarball: <<: *base_image <<: *unit_test_job - <<: *api_schedules_tags_triggers_web_triggering_rules + <<: *api_pipelines_schedules_tags_triggers_web_triggering_rules before_script: - cd bind-* needs: @@ -1577,7 +1577,7 @@ respdiff-short:tsan: respdiff-long: <<: *respdiff_job - <<: *api_schedules_tags_triggers_web_triggering_rules + <<: *api_pipelines_schedules_tags_triggers_web_triggering_rules <<: *respdiff_debian_bookworm_amd64_image variables: CC: gcc @@ -1588,7 +1588,7 @@ respdiff-long: respdiff-long:asan: <<: *respdiff_job - <<: *api_schedules_tags_triggers_web_triggering_rules + <<: *api_pipelines_schedules_tags_triggers_web_triggering_rules <<: *debian_bookworm_amd64_image variables: CC: gcc @@ -1601,7 +1601,7 @@ respdiff-long:asan: respdiff-long:tsan: <<: *respdiff_job - <<: *api_schedules_tags_triggers_web_triggering_rules + <<: *api_pipelines_schedules_tags_triggers_web_triggering_rules <<: *tsan_debian_bookworm_amd64_image variables: CC: gcc @@ -1619,7 +1619,7 @@ respdiff-long:tsan: respdiff-long-third-party: <<: *respdiff_job - <<: *api_schedules_tags_triggers_web_triggering_rules + <<: *api_pipelines_schedules_tags_triggers_web_triggering_rules <<: *debian_bookworm_amd64_image variables: CC: gcc