[OS-BUILD PATCH 0/4] CI: c9s updates

[Veronika Kabátová (via Email Bridge)]

From: Veronika Kabátová on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1313

Bugzilla: INTERNAL
Upstream Status: RHEL-only

Signed-off-by: Veronika Kabatova <vkabatov(a)redhat.com&gt;

---
 .gitlab-ci.yml |  50 ++++++++++++++++++++++++++++++++++----------------
 1 files changed, 34 insertions(+), 16 deletions(-)

[OS-BUILD PATCH 1/4] CI: use more templates

[Veronika Kabátová (via Email Bridge)]

From: Veronika Kabatova <vkabatov(a)redhat.com&gt;

CI: use more templates

Since the initial implementation, we've added a few more common options
and anchors into the kernel templates. Relevant here is .rhel_common
which we can now use, so we don't forget to update any of the options.

Also split the lines of the "extends" lists to make a visual distinction
between the common (imported) anchors and the ones defined in this CI
file.

Bugzilla: INTERNAL
Upstream Status: RHEL-only

Signed-off-by: Veronika Kabatova <vkabatov(a)redhat.com&gt;

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index blahblah..blahblah 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -60,9 +60,6 @@ workflow:
   variables:
     builder_image_tag: latest
     srpm_make_target: dist-srpm
-    build_kabi_stablelist: 'true'
-    tree_yaml_name: rhel
-    publish_elsewhere: 'true'
     native_tools: 'true'
 
 .trigger_c9s_pipeline:
@@ -73,6 +70,7 @@ workflow:
     builder_image: registry.gitlab.com/cki-project/containers/builder-stream9
     architectures: 'x86_64 ppc64le aarch64 s390x'
     kpet_tree_family: c9s
+    kernel_type: 'upstream'  # Needs to be overriden due to inheriting from
.rhel_common
 
 .trigger_rhel9_pipeline:
   trigger:
@@ -88,16 +86,20 @@ ark_merge_request:
 
 # Only enable c9s pipelines once we have the composes available in Beaker
 # c9s_merge_request:
-#   extends: [.trusted, .merge_request, .9-common, .trigger_c9s_pipeline]
+#   extends: [.trusted, .merge_request, .rhel_common,
+#             .9-common, .trigger_c9s_pipeline]
 # 
 # c9s_baseline:
-#   extends: [.trusted, .baseline, .9-common, .trigger_c9s_pipeline]
+#   extends: [.trusted, .baseline, .rhel_common,
+#             .9-common, .trigger_c9s_pipeline]
 
 rhel9_merge_request:
-  extends: [.internal, .merge_request, .9-common, .trigger_rhel9_pipeline]
+  extends: [.internal, .merge_request, .rhel_common,
+            .9-common, .trigger_rhel9_pipeline]
 
 rhel9_baseline:
-  extends: [.internal, .baseline, .9-common, .trigger_rhel9_pipeline]
+  extends: [.internal, .baseline, .rhel_common,
+            .9-common, .trigger_rhel9_pipeline]
 
 
 # scheduled job

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1313

[OS-BUILD PATCH 2/4] CI: Update ppc64le config

[Veronika Kabátová (via Email Bridge)]

From: Veronika Kabatova <vkabatov(a)redhat.com&gt;

CI: Update ppc64le config

The RHEL container is now available so we can unify the architecture
list. We also need to specify which CKI power builder should be used,
as CKI has more of them and not all are supported for c9s/RHEL9.

Bugzilla: INTERNAL
Upstream Status: RHEL-only

Signed-off-by: Veronika Kabatova <vkabatov(a)redhat.com&gt;

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index blahblah..blahblah 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -61,6 +61,8 @@ workflow:
     builder_image_tag: latest
     srpm_make_target: dist-srpm
     native_tools: 'true'
+    architectures: 'x86_64 ppc64le aarch64 s390x'
+    POWER_BUILDER_SUFFIX: '-p9'
 
 .trigger_c9s_pipeline:
   trigger:
@@ -68,7 +70,6 @@ workflow:
   variables:
     name: centos-stream-9
     builder_image: registry.gitlab.com/cki-project/containers/builder-stream9
-    architectures: 'x86_64 ppc64le aarch64 s390x'
     kpet_tree_family: c9s
     kernel_type: 'upstream'  # Needs to be overriden due to inheriting from
.rhel_common
 
@@ -78,7 +79,6 @@ workflow:
   variables:
     name: rhel9
     builder_image: quay.io/cki/builder-rhel9
-    architectures: 'x86_64 aarch64 s390x'   #ppc64le container is not available
yet
     kpet_tree_family: rhel9
 
 ark_merge_request:

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1313

[OS-BUILD PATCH 3/4] CI: Finish up c9s config

[Veronika Kabátová (via Email Bridge)]

From: Veronika Kabatova <vkabatov(a)redhat.com&gt;

CI: Finish up c9s config

The configuration for c9s was, up till now, a commented out placeholder.
The plans are finished now so we can also update the config accordingly.

We want two pipelines:

- A full c9s pipeline (build and test), publicly available
- A build for RHEL9 (RH internal only), to ensure nothing breaks (this
  should not happen, but better be safe)

Add a new anchor for RHEL build-only and the extra pipelines. As we now
have a lot of pipelines defined in this file, add comments to mark where
the actual definitions start for easier orientation.

Bugzilla: INTERNAL
Upstream Status: RHEL-only

Signed-off-by: Veronika Kabatova <vkabatov(a)redhat.com&gt;

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index blahblah..blahblah 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,7 +27,7 @@ workflow:
         REQUESTED_PIPELINE_TYPE: 'internal'
     - if: '$CI_MERGE_REQUEST_PROJECT_PATH =~ /^redhat.centos-stream/ ||
$CI_PROJECT_PATH =~ /^redhat.centos-stream/'
       variables:
-        REQUESTED_PIPELINE_TYPE: 'trusted'
+        REQUESTED_PIPELINE_TYPE: '/^(trusted|centos-rhel)$/'
 
 # We need to differentiate between the pipeline types that are triggered from this
 # single file. Once the mirroring to c9s stops this anchor can be dropped and the
@@ -81,18 +81,34 @@ workflow:
     builder_image: quay.io/cki/builder-rhel9
     kpet_tree_family: rhel9
 
+.trigger_rhel9_build:
+  extends: .trigger_rhel9_pipeline
+  variables:
+    skip_test: 'true'
+    skip_results: 'true'
+
+# ARK CI
 ark_merge_request:
   extends: [.trusted-ark, .merge_request, .trigger_ark_pipeline]
 
-# Only enable c9s pipelines once we have the composes available in Beaker
-# c9s_merge_request:
-#   extends: [.trusted, .merge_request, .rhel_common,
-#             .9-common, .trigger_c9s_pipeline]
-# 
-# c9s_baseline:
-#   extends: [.trusted, .baseline, .rhel_common,
-#             .9-common, .trigger_c9s_pipeline]
+# c9s CI
+c9s_merge_request:
+  extends: [.trusted, .merge_request, .rhel_common,
+            .9-common, .trigger_c9s_pipeline]
+
+c9s_baseline:
+  extends: [.trusted, .baseline, .rhel_common,
+            .9-common, .trigger_c9s_pipeline]
+
+c9s_rhel9_compat_merge_request:
+  extends: [.centos_stream_rhel_internal, .merge_request, .rhel_common,
+            .9-common, .trigger_rhel9_build]
+
+c9s_rhel9_compat_baseline:
+  extends: [.centos_stream_rhel_internal, .baseline, .rhel_common,
+            .9-common, .trigger_rhel9_build]
 
+# RHEL9 CI
 rhel9_merge_request:
   extends: [.internal, .merge_request, .rhel_common,
             .9-common, .trigger_rhel9_pipeline]

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1313

[OS-BUILD PATCH 4/4] CI: Rename ARK CI pipeline type

[Veronika Kabátová (via Email Bridge)]

From: Veronika Kabatova <vkabatov(a)redhat.com&gt;

CI: Rename ARK CI pipeline type

To enable CentOS Stream double pipelines, the pipeline type check now
uses regexes. This means that both "trusted" (c9s) and "trusted-ark"
(ARK) pipelines would get picked and be executed for ARK MRs which is
not what we want. Rename the ARK pipeline type to avoid this.

Bugzilla: INTERNAL
Upstream Status: RHEL-only

Signed-off-by: Veronika Kabatova <vkabatov(a)redhat.com&gt;

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index blahblah..blahblah 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,7 +19,7 @@ workflow:
     - if: '$CI_PIPELINE_SOURCE == "schedule"'   # ARK release
pipelines
     - if: '$CI_MERGE_REQUEST_PROJECT_PATH =~ /^cki-project.kernel-ark/'   # ARK
MR CI
       variables:
-        REQUESTED_PIPELINE_TYPE: 'trusted-ark'
+        REQUESTED_PIPELINE_TYPE: 'ark-ci'
     # We cannot merge rules through !reference and have to copy them over from the
     # CKI pipeline: https://gitlab.com/gitlab-org/gitlab/-/issues/322992
     - if: '$CI_MERGE_REQUEST_PROJECT_PATH =~ /^redhat.rhel/ || $CI_PROJECT_PATH =~
/^redhat.rhel/'
@@ -38,7 +38,7 @@ workflow:
     project:
redhat/red-hat-ci-tools/kernel/cki-internal-pipelines/cki-trusted-contributors
     strategy: depend
   variables:
-    PIPELINE_TYPE: 'trusted-ark'
+    PIPELINE_TYPE: 'ark-ci'
     kernel_type: 'upstream'
 
 .trigger_ark_pipeline:

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1313

[Veronika Kabátová (via Email Bridge)]

From: Veronika Kabátová on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1313#note_6529...

Potential infra issues: c9s distro is not yet imported into Beaker, and we're
lacking the ppc64le RHEL container. As nobody should be developing against
those repos the MR should be safe to merge, but I want the current limitations
to be clear. Neither of those two problems would need CI changes to be
resolved, the fixes would go in through different parts of the pipeline.

[Herton R. Krzesinski (via Email Bridge)]

From: Herton R. Krzesinski on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1313#note_6529...

Acked-by: Herton R. Krzesinski <herton(a)redhat.com&gt;
(via approve button)

[Iñaki Malerba (via Email Bridge)]

From: Iñaki Malerba on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1313#note_6530...

Acked-by: Iñaki Malerba <imalerba(a)redhat.com&gt;
(via approve button)

[Don Zickus (via Email Bridge)]

From: Don Zickus on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1313#note_6543...

I trust @veruu :-)

[Don Zickus (via Email Bridge)]

From: Don Zickus on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1313#note_6543...

Acked-by: Don Zickus <dzickus(a)redhat.com&gt;
(via approve button)