Merge: CI: Enable pipelines for rt variant

MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/2127

Upstream Status: RHEL-only

Bugzilla: INTERNAL

Depends: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/1743

Signed-off-by: Michael Hofmann <mhofmann@redhat.com>

Approved-by: Tino Calancha <tino.calancha@gmail.com>
Approved-by: Serhii Turivnyi <sturivny@redhat.com>
Approved-by: Patrick Talbert <ptalbert@redhat.com>

Signed-off-by: Jan Stancek <jstancek@redhat.com>

Author: jstancek

.gitlab-ci.yml

@@ -33,32 +33,12 @@ workflow: !reference [.workflow]
     builder_image: quay.io/cki/builder-rhel9
     kpet_tree_family: rhel9
 
-.realtime_check_c9s:
-  trigger:
-    branch: c9s-rt
-  variables:
-    name: kernel-rt-c9s
-    kpet_tree_family: c9s-rt
-
-.realtime_check_rhel9:
-  trigger:
-    branch: rhel9-rt
-  variables:
-    name: kernel-rt-rhel9
-    kpet_tree_family: rhel9-rt
-
 .trigger_rhel9_build:
   extends: .trigger_rhel9_pipeline
   variables:
     skip_test: 'true'
     skip_results: 'true'
 
-.realtime_full_c9s:
-  variables:
-    name: kernel-rt-c9s
-    kpet_tree_family: c9s-rt
-    RUN_ONLY_FOR_RT: 'true'
-
 .automotive_full_c9s:
   variables:
     name: kernel-automotive-c9s
@@ -67,11 +47,15 @@ workflow: !reference [.workflow]
     AWS_UPT_IMAGE_NAME_FILTER: 'auto-osbuild-qemu-cs9-cki-ostree-*'
     RUN_ONLY_FOR_AUTOMOTIVE: 'true'
 
-.realtime_full_rhel9:
+.rt_full_c9s:
+  variables:
+    name: kernel-rt-c9s
+    kpet_tree_family: c9s-rt
+
+.rt_full_rhel9:
   variables:
     name: kernel-rt-rhel9
     kpet_tree_family: rhel9-rt
-    RUN_ONLY_FOR_RT: 'true'
 
 .64k_full_c9s:
   variables:
@@ -87,16 +71,18 @@ workflow: !reference [.workflow]
   variables:
     RUN_ONLY_FOR_AUTOMOTIVE: 'false'
 
-.automotive_check_realtime_overrides:
-  variables:
-    RUN_ONLY_FOR_RT: 'true'
-    merge_branch: main-automotive  # Can't use CI_MERGE_REQUEST_TARGET_BRANCH_NAME due to -rt suffix
-
 # c9s CI
 c9s_merge_request:
   extends: [.trusted, .merge_request, .rhel_common,
             .9-common, .trigger_c9s_pipeline]
 
+c9s_rt_merge_request:
+  # Don't add .rhel_common as we overwrite those configs
+  extends: [.trusted, .merge_request,
+            .9-common, .trigger_c9s_pipeline,
+            .rt_common,
+            .rt_full_c9s]
+
 c9s_64k_merge_request:
   # Don't add .rhel_common as we overwrite those configs
   extends: [.trusted, .merge_request,
@@ -109,12 +95,6 @@ c9s_automotive_check_merge_request:
             .9-common, .trigger_c9s_pipeline, .automotive_full_c9s, .automotive_check_c9s_overrides,
             .automotive_check_common]
 
-c9s_realtime_check_merge_request:
-  extends: [.trusted, .merge_request,
-            .9-common,
-            .realtime_check_common,
-            .trigger_c9s_pipeline, .realtime_check_c9s]
-
 c9s_baseline_coverage_build:
   extends: [.trusted, .baseline, .rhel_common, .only_build_and_publish, .coverage,
             .9-common, .trigger_c9s_pipeline]
@@ -123,20 +103,6 @@ c9s_rhel9_compat_merge_request:
   extends: [.centos_stream_rhel_internal, .merge_request, .rhel_common, .with_notifications,
             .9-common, .trigger_rhel9_build]
 
-# c9s realtime branch CI
-c9s_realtime_merge_request:
-  extends: [.trusted, .merge_request,
-            .9-common,
-            .realtime_pipeline_common,
-            .trigger_c9s_pipeline, .realtime_full_c9s]
-
-c9s_realtime_automotive_check_merge_request:
-  extends: [.trusted, .merge_request,
-            .9-common,
-            .trigger_c9s_pipeline, .automotive_full_c9s, .automotive_check_c9s_overrides,
-            .automotive_check_common,
-            .automotive_check_realtime_overrides]
-
 # c9s automotive branch CI
 c9s_automotive_merge_request:
   extends: [.trusted, .merge_request,
@@ -155,50 +121,39 @@ rhel9_merge_request:
   extends: [.internal, .merge_request, .rhel_common, .with_notifications,
             .9-common, .trigger_rhel9_pipeline]
 
+rhel9_rt_merge_request:
+  # Don't add .rhel_common as we overwrite those configs
+  extends: [.internal, .merge_request, .with_notifications,
+            .9-common, .trigger_rhel9_pipeline,
+            .rt_common,
+            .rt_full_rhel9]
+
 rhel9_64k_merge_request:
   # Don't add .rhel_common as we overwrite those configs
   extends: [.internal, .merge_request, .with_notifications,
             .9-common, .trigger_rhel9_pipeline,
             .64k_common,
-            .64k_full_c9s]
-
-rhel9_realtime_check_merge_request:
-  extends: [.internal, .merge_request,
-            .9-common,
-            .realtime_check_common,
-            .trigger_rhel9_pipeline, .realtime_check_rhel9]
+            .64k_full_rhel9]
 
 rhel9_baseline_coverage_build:
   extends: [.internal, .baseline, .rhel_common, .only_build_and_publish, .coverage,
             .9-common, .trigger_rhel9_pipeline]
 
-# RHEL9 realtime branch CI
-rhel9_realtime_merge_request:
-  extends: [.internal, .merge_request,
-            .9-common,
-            .realtime_pipeline_common,
-            .trigger_rhel9_pipeline, .realtime_full_rhel9]
-
 # RHEL9 private CI (including RT branches)
 rhel9_merge_request_private:
   extends: [.scratch, .merge_request, .rhel_common,
             .9-common, .trigger_rhel9_pipeline]
 
-rhel9_64k_merge_request_private:
+rhel9_rt_merge_request_private:
   # Don't add .rhel_common as we overwrite those configs
   extends: [.scratch, .merge_request,
             .9-common, .trigger_rhel9_pipeline,
-            .64k_common,
-            .64k_full_c9s]
+            .rt_common,
+            .rt_full_rhel9]
 
-rhel9_realtime_check_merge_request_private:
-  extends: [.scratch, .merge_request,
-            .9-common,
-            .realtime_check_common,
-            .trigger_rhel9_pipeline, .realtime_check_rhel9]
-
-rhel9_realtime_merge_request_private:
+rhel9_64k_merge_request_private:
+  # Don't add .rhel_common as we overwrite those configs
   extends: [.scratch, .merge_request,
-            .9-common,
-            .realtime_pipeline_common,
-            .trigger_rhel9_pipeline, .realtime_full_rhel9]
+            .9-common, .trigger_rhel9_pipeline,
+            .64k_common,
+            .64k_full_rhel9]