[OS-BUILD PATCH 0/5] Adjust ARK CI pipelines to be closer to the baseline trigger

[Michael Hofmann (via Email Bridge)]

From: Michael Hofmann on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2575

Signed-off-by: Michael Hofmann

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

[OS-BUILD PATCH 1/5] Simplify ARK pipeline rules

[Michael Hofmann (via Email Bridge)]

From: Michael Hofmann

Simplify ARK pipeline rules

Signed-off-by: Michael Hofmann

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index blahblah..blahblah 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -47,18 +47,17 @@ workflow:
     skip_test: 'true'
     skip_results: 'true'
   rules:
-    # Do a full build for non-automated bot config contributions
-    - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "os-build" &&
-           $CI_COMMIT_AUTHOR != "Fedora Kernel Team "'
-      variables:
-        architectures: 'x86_64 aarch64 s390x ppc64le'
-        skip_build: 'false'
-        skip_publish: 'false'
-    # Default build - srpm only
-    - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "os-build"'
+    - if: $CI_MERGE_REQUEST_TARGET_BRANCH_NAME != "os-build"
+      when: never
+    # automated commits - srpm only
+    - if: $CI_COMMIT_AUTHOR == "Fedora Kernel Team "
+    - when: on_success
       variables:
         skip_build: 'true'
         skip_publish: 'true'
+    - when: on_success
+      variables:
+        architectures: 'x86_64 aarch64 s390x ppc64le'

.trigger_eln_pipeline:
   stage: test

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

[OS-BUILD PATCH 2/5] Move ARK pipeline variables into job template

[Michael Hofmann (via Email Bridge)]

From: Michael Hofmann

Move ARK pipeline variables into job template

Signed-off-by: Michael Hofmann

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index blahblah..blahblah 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -41,7 +41,6 @@ workflow:
     name: kernel-ark
     builder_image: quay.io/cki/builder-rawhide
     srpm_make_target: dist-srpm
-    rpmbuild_with: 'up'
     run_redhat_self_test: 'true'
     skip_setup: 'true'
     skip_test: 'true'
@@ -55,9 +54,8 @@ workflow:
       variables:
         skip_build: 'true'
         skip_publish: 'true'
+        architectures: ''
     - when: on_success
-      variables:
-        architectures: 'x86_64 aarch64 s390x ppc64le'

.trigger_eln_pipeline:
   stage: test
@@ -84,6 +82,10 @@ workflow:
 # ARK CI
 ark_merge_request:
   extends: [.trusted-ark, .merge_request, .trigger_ark_pipeline]
+  variables:
+    rpmbuild_with: up
+    package_name: kernel
+    architectures: x86_64 aarch64 s390x ppc64le

# ELN CI
 eln_merge_request:

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

[OS-BUILD PATCH 3/5] Enable ARK pipeline native tools

[Michael Hofmann (via Email Bridge)]

From: Michael Hofmann

Enable ARK pipeline native tools

Signed-off-by: Michael Hofmann

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index blahblah..blahblah 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -42,6 +42,7 @@ workflow:
     builder_image: quay.io/cki/builder-rawhide
     srpm_make_target: dist-srpm
     run_redhat_self_test: 'true'
+    native_tools: 'true'
     skip_setup: 'true'
     skip_test: 'true'
     skip_results: 'true'

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

[OS-BUILD PATCH 4/5] Extract common parts of child pipeline job

[Michael Hofmann (via Email Bridge)]

From: Michael Hofmann

Extract common parts of child pipeline job

Signed-off-by: Michael Hofmann

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index blahblah..blahblah 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -33,19 +33,23 @@ workflow:
     PIPELINE_TYPE: 'ark-ci'
     kernel_type: 'upstream'

-.trigger_ark_pipeline:
+.pipeline:
   stage: test
-  trigger:
-    branch: kernel-ark
   variables:
-    name: kernel-ark
-    builder_image: quay.io/cki/builder-rawhide
     srpm_make_target: dist-srpm
-    run_redhat_self_test: 'true'
     native_tools: 'true'
     skip_setup: 'true'
     skip_test: 'true'
     skip_results: 'true'
+
+.trigger_ark_pipeline:
+  extends: .pipeline
+  trigger:
+    branch: kernel-ark
+  variables:
+    name: kernel-ark
+    builder_image: quay.io/cki/builder-rawhide
+    run_redhat_self_test: 'true'
   rules:
     - if: $CI_MERGE_REQUEST_TARGET_BRANCH_NAME != "os-build"
       when: never
@@ -59,18 +63,13 @@ workflow:
     - when: on_success

.trigger_eln_pipeline:
-  stage: test
+  extends: .pipeline
   trigger:
     branch: eln
   variables:
     name: ark-eln
     builder_image: quay.io/cki/builder-eln
-    srpm_make_target: dist-srpm
-    native_tools: 'true'
     disttag_override: '.eln'
-    skip_setup: 'true'
-    skip_test: 'true'
-    skip_results: 'true'
   rules:
     - if: $CI_MERGE_REQUEST_TARGET_BRANCH_NAME != "os-build"
       when: never

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

[OS-BUILD PATCH 5/5] Add ARK debug pipeline

[Michael Hofmann (via Email Bridge)]

From: Michael Hofmann

Add ARK debug pipeline

Looking at Koji, debug variants are only enabled for aarch64/x86_64.

https://koji.fedoraproject.org/koji/buildinfo?buildID=2220061
Signed-off-by: Michael Hofmann

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index blahblah..blahblah 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -87,6 +87,13 @@ ark_merge_request:
     package_name: kernel
     architectures: x86_64 aarch64 s390x ppc64le

+ark_debug_merge_request:
+  extends: [.trusted-ark, .merge_request, .trigger_ark_pipeline]
+  variables:
+    rpmbuild_with: up dbgonly
+    package_name: kernel-debug
+    architectures: x86_64 aarch64
+
 # ELN CI
 eln_merge_request:
   extends: [.trusted-ark, .merge_request, .trigger_eln_pipeline]

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