ci: rename misleading *-postmerge stages to *-nightly

These stages are for the jobs that are skipped in merge pipelines,
automatically run in nightly pipelines, and are available to run
manually in other pipelines.

None of these ever run in post-merge pipelines.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34590>

.gitlab-ci.yml

@@ -169,23 +169,23 @@ stages:
   - build-only
   - code-validation
   - amd
-  - amd-postmerge
+  - amd-nightly
   - intel
-  - intel-postmerge
+  - intel-nightly
   - nouveau
-  - nouveau-postmerge
+  - nouveau-nightly
   - arm
-  - arm-postmerge
+  - arm-nightly
   - broadcom
-  - broadcom-postmerge
+  - broadcom-nightly
   - freedreno
-  - freedreno-postmerge
+  - freedreno-nightly
   - etnaviv
-  - etnaviv-postmerge
+  - etnaviv-nightly
   - software-renderer
-  - software-renderer-postmerge
+  - software-renderer-nightly
   - layered-backends
-  - layered-backends-postmerge
+  - layered-backends-nightly
   - performance
   - deploy
 

bin/ci/ci_run_n_monitor.py

@@ -426,9 +426,9 @@ def parse_args() -> argparse.Namespace:
         help="Job stages to exclude when searching for target jobs. "
              "For multiple targets, pass multiple values, eg. "
              "`--exclude-stage foo bar`. By default, performance and "
-             "post-merge jobs are excluded; pass --exclude-stage '' to "
+             "nightly jobs are excluded; pass --exclude-stage '' to "
              "include them for consideration.",
-        default=["performance", ".*-postmerge"],
+        default=["performance", ".*-postmerge", ".*-nightly"],
         nargs=argparse.ONE_OR_MORE,
     )
     parser.add_argument(

src/amd/ci/gitlab-ci-inc.yml

@@ -35,7 +35,7 @@
       when: on_success
 
 .radeonsi-manual-rules:
-  stage: amd-postmerge
+  stage: amd-nightly
   extends: .no-auto-retry
   rules:
     - !reference [.test, rules]
@@ -63,7 +63,7 @@
       when: on_success
 
 .radv-manual-rules:
-  stage: amd-postmerge
+  stage: amd-nightly
   rules:
     - !reference [.test, rules]
     - !reference [.vulkan-manual-rules, rules]
@@ -89,7 +89,7 @@
     - !reference [.radv-collabora-rules, rules]
 
 .radv-collabora-manual-rules:
-  stage: amd-postmerge
+  stage: amd-nightly
   extends: .no-auto-retry
   rules:
     - !reference [.test, rules]
@@ -104,7 +104,7 @@
     - !reference [.radv-rules, rules]
 
 .radv-valve-manual-rules:
-  stage: amd-postmerge
+  stage: amd-nightly
   extends: .no-auto-retry
   rules:
     - !reference [.test, rules]
@@ -129,7 +129,7 @@
       when: on_success
 
 .radeonsi-vaapi-manual-rules:
-  stage: amd-postmerge
+  stage: amd-nightly
   rules:
     - !reference [.test, rules]
     - !reference [.collabora-farm-manual-rules, rules]
@@ -146,7 +146,7 @@
     - !reference [.radeonsi-rules, rules]
 
 .radeonsi-valve-manual-rules:
-  stage: amd-postmerge
+  stage: amd-nightly
   rules:
     - !reference [.test, rules]
     - !reference [.valve-farm-manual-rules, rules]

src/broadcom/ci/gitlab-ci-inc.yml

@@ -43,7 +43,7 @@
       when: on_success
 
 .vc4-manual-rules:
-  stage: broadcom-postmerge
+  stage: broadcom-nightly
   extends: .no-auto-retry
   rules:
     - !reference [.test, rules]
@@ -70,7 +70,7 @@
       when: on_success
 
 .v3d-manual-rules:
-  stage: broadcom-postmerge
+  stage: broadcom-nightly
   extends: .no-auto-retry
   rules:
     - !reference [.test, rules]
@@ -88,7 +88,7 @@
     - !reference [.rusticl-rules, rules]
 
 .v3d-rusticl-manual-rules:
-  stage: broadcom-postmerge
+  stage: broadcom-nightly
   extends: .no-auto-retry
   rules:
     - !reference [.v3d-manual-rules, rules]
@@ -108,7 +108,7 @@
       when: on_success
 
 .v3dv-manual-rules:
-  stage: broadcom-postmerge
+  stage: broadcom-nightly
   extends: .no-auto-retry
   rules:
     - !reference [.test, rules]

src/etnaviv/ci/gitlab-ci.yml

@@ -21,7 +21,7 @@
       when: on_success
 
 .etnaviv-manual-rules:
-  stage: etnaviv-postmerge
+  stage: etnaviv-nightly
   extends: .no-auto-retry
   rules:
     - !reference [.test, rules]

src/freedreno/ci/gitlab-ci-inc.yml

@@ -80,7 +80,7 @@
     - !reference [.freedreno-rules, rules]
 
 .google-freedreno-manual-rules:
-  stage: freedreno-postmerge
+  stage: freedreno-nightly
   extends: .no-auto-retry
   rules:
     - !reference [.test, rules]
@@ -88,7 +88,7 @@
     - !reference [.freedreno-manual-rules, rules]
 
 .collabora-freedreno-manual-rules:
-  stage: freedreno-postmerge
+  stage: freedreno-nightly
   extends: .no-auto-retry
   rules:
     - !reference [.test, rules]
@@ -111,7 +111,7 @@
     - !reference [.turnip-rules, rules]
 
 .google-turnip-manual-rules:
-  stage: freedreno-postmerge
+  stage: freedreno-nightly
   extends: .no-auto-retry
   rules:
     - !reference [.test, rules]
@@ -119,7 +119,7 @@
     - !reference [.turnip-manual-rules, rules]
 
 .collabora-turnip-manual-rules:
-  stage: freedreno-postmerge
+  stage: freedreno-nightly
   extends: .no-auto-retry
   rules:
     - !reference [.test, rules]
@@ -135,7 +135,7 @@
     - !reference [.google-turnip-rules, rules]
 
 .google-freedreno-turnip-manual-rules:
-  stage: freedreno-postmerge
+  stage: freedreno-nightly
   extends: .no-auto-retry
   rules:
     - !reference [.test, rules]
@@ -150,7 +150,7 @@
     - !reference [.collabora-turnip-rules, rules]
 
 .collabora-freedreno-turnip-manual-rules:
-  stage: freedreno-postmerge
+  stage: freedreno-nightly
   extends: .no-auto-retry
   rules:
     - !reference [.test, rules]
@@ -158,7 +158,7 @@
     - !reference [.collabora-turnip-manual-rules, rules]
 
 .valve-freedreno-manual-rules:
-  stage: freedreno-postmerge
+  stage: freedreno-nightly
   extends: .no-auto-retry
   rules:
     - !reference [.test, rules]
@@ -166,7 +166,7 @@
     - !reference [.freedreno-manual-rules, rules]
 
 .valve-turnip-manual-rules:
-  stage: freedreno-postmerge
+  stage: freedreno-nightly
   extends: .no-auto-retry
   rules:
     - !reference [.test, rules]

src/gallium/drivers/llvmpipe/ci/gitlab-ci-inc.yml

@@ -23,7 +23,7 @@
       when: on_success
 
 .llvmpipe-manual-rules:
-  stage: software-renderer-postmerge
+  stage: software-renderer-nightly
   extends: .no-auto-retry
   rules:
     - !reference [.test, rules]

src/gallium/drivers/nouveau/ci/gitlab-ci-inc.yml

@@ -24,7 +24,7 @@
       when: on_success
 
 .nouveau-manual-rules:
-  stage: nouveau-postmerge
+  stage: nouveau-nightly
   extends: .no-auto-retry
   rules:
     - !reference [.test, rules]

src/gallium/drivers/r300/ci/gitlab-ci-inc.yml

@@ -17,7 +17,7 @@
       when: on_success
 
 .r300-manual-rules:
-  stage: amd-postmerge
+  stage: amd-nightly
   extends: .no-auto-retry
   rules:
     - !reference [.test, rules]
@@ -37,7 +37,7 @@
       when: on_success
 
 .r300-nine-manual-rules:
-  stage: amd-postmerge
+  stage: amd-nightly
   extends: .no-auto-retry
   rules:
     - !reference [.test, rules]

src/gallium/drivers/zink/ci/gitlab-ci-inc.yml

@@ -41,7 +41,7 @@
     - !reference [.zink-common-rules, rules]
 
 .zink-venus-lvp-manual-rules:
-  stage: layered-backends-postmerge
+  stage: layered-backends-nightly
   extends: .no-auto-retry
   rules:
     - !reference [.test, rules]
@@ -57,7 +57,7 @@
     - !reference [.zink-common-rules, rules]
 
 .zink-anv-manual-rules:
-  stage: layered-backends-postmerge
+  stage: layered-backends-nightly
   extends: .no-auto-retry
   rules:
     - !reference [.test, rules]
@@ -80,7 +80,7 @@
     - !reference [.zink-common-rules, rules]
 
 .zink-nvk-manual-rules:
-  stage: layered-backends-postmerge
+  stage: layered-backends-nightly
   extends: .no-auto-retry
   rules:
     - !reference [.test, rules]
@@ -97,7 +97,7 @@
     ZINK_DEBUG: optimal_keys
 
 .zink-turnip-collabora-manual-rules:
-  stage: layered-backends-postmerge
+  stage: layered-backends-nightly
   extends: .no-auto-retry
   rules:
     - !reference [.test, rules]
@@ -105,7 +105,7 @@
     - !reference [.zink-common-manual-rules, rules]
 
 .zink-turnip-valve-manual-rules:
-  stage: layered-backends-postmerge
+  stage: layered-backends-nightly
   extends: .no-auto-retry
   rules:
     - !reference [.test, rules]
@@ -120,7 +120,7 @@
     - !reference [.zink-common-rules, rules]
 
 .zink-radv-manual-rules:
-  stage: layered-backends-postmerge
+  stage: layered-backends-nightly
   extends: .no-auto-retry
   rules:
     - !reference [.test, rules]

src/gallium/frontends/lavapipe/ci/gitlab-ci-inc.yml

@@ -26,7 +26,7 @@
       when: on_success
 
 .lavapipe-manual-rules:
-  stage: software-renderer-postmerge
+  stage: software-renderer-nightly
   extends: .no-auto-retry
   rules:
     - !reference [.test, rules]

src/gallium/frontends/lavapipe/ci/gitlab-ci.yml

@@ -34,7 +34,7 @@ lavapipe-vk-asan:
     - debian-testing-asan
 
 lavapipe-vkd3d:
-  stage: software-renderer-postmerge
+  stage: software-renderer-nightly
   extends:
     - .lavapipe-test
     - .lavapipe-manual-rules

src/intel/ci/gitlab-ci-inc.yml

@@ -27,7 +27,7 @@
       when: on_success
 
 .intel-common-manual-rules:
-  stage: intel-postmerge
+  stage: intel-nightly
   rules:
     - changes:
         *intel_common_file_list
@@ -51,7 +51,7 @@
       when: on_success
 
 .i915g-manual-rules:
-  stage: intel-postmerge
+  stage: intel-nightly
   extends: .no-auto-retry
   rules:
     - !reference [.test, rules]
@@ -75,7 +75,7 @@
       when: on_success
 
 .crocus-manual-rules:
-  stage: intel-postmerge
+  stage: intel-nightly
   extends: .no-auto-retry
   rules:
     - !reference [.test, rules]
@@ -100,7 +100,7 @@
       when: on_success
 
 .iris-manual-rules:
-  stage: intel-postmerge
+  stage: intel-nightly
   extends: .no-auto-retry
   rules:
     - !reference [.test, rules]
@@ -147,7 +147,7 @@
       when: on_success
 
 .anv-manual-rules:
-  stage: intel-postmerge
+  stage: intel-nightly
   extends: .no-auto-retry
   rules:
     - !reference [.test, rules]
@@ -170,7 +170,7 @@
       when: on_success
 
 .hasvk-manual-rules:
-  stage: intel-postmerge
+  stage: intel-nightly
   extends: .no-auto-retry
   rules:
     - !reference [.test, rules]
@@ -190,7 +190,7 @@
     - !reference [.anv-rules, rules]
 
 .intel-manual-rules:
-  stage: intel-postmerge
+  stage: intel-nightly
   extends: .no-auto-retry
   rules:
     - !reference [.test, rules]

src/microsoft/ci/gitlab-ci-inc.yml

@@ -73,7 +73,7 @@
       when: on_success
 
 .dozen-manual-rules:
-  stage: layered-backends-postmerge
+  stage: layered-backends-nightly
   extends: .no-auto-retry
   rules:
     - !reference [.test, rules]

src/nouveau/ci/gitlab-ci-inc.yml

@@ -26,7 +26,7 @@
       when: on_success
 
 .nvk-valve-manual-rules:
-  stage: nouveau-postmerge
+  stage: nouveau-nightly
   extends: .no-auto-retry
   rules:
     - !reference [.test, rules]

src/panfrost/ci/gitlab-ci-inc.yml

@@ -28,7 +28,7 @@
       when: on_success
 
 .panfrost-midgard-manual-rules:
-  stage: arm-postmerge
+  stage: arm-nightly
   extends: .no-auto-retry
   rules:
     - !reference [.test, rules]
@@ -59,7 +59,7 @@
       when: on_success
 
 .panfrost-bifrost-gl-manual-rules:
-  stage: arm-postmerge
+  stage: arm-nightly
   extends: .no-auto-retry
   rules:
     - !reference [.test, rules]
@@ -92,7 +92,7 @@
       when: on_success
 
 .panfrost-vk-manual-rules:
-  stage: arm-postmerge
+  stage: arm-nightly
   extends: .no-auto-retry
   rules:
     - !reference [.test, rules]
@@ -125,7 +125,7 @@
       when: on_success
 
 .panfrost-valhall-gl-manual-rules:
-  stage: arm-postmerge
+  stage: arm-nightly
   extends: .no-auto-retry
   rules:
     - !reference [.test, rules]

src/virtio/ci/gitlab-ci-inc.yml

@@ -8,7 +8,7 @@
       when: on_success
 
 .venus-manual-rules:
-  stage: layered-backends-postmerge
+  stage: layered-backends-nightly
   extends: .no-auto-retry
   rules:
     - !reference [.test, rules]