From: Michael Hofmann on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2538
Part of https://gitlab.com/cki-project/kernel-ark/-/issues/113
Signed-off-by: Michael Hofmann mhofmann@redhat.com
--- .gitlab-ci.yml | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 70 insertions(+), 2 deletions(-)
From: Michael Hofmann mhofmann@redhat.com
Fix linter warnings in .gitlab-ci.yml
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index blahblah..blahblah 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,3 +1,4 @@ +--- # This CI will only work for project members. CI for public contributors # runs via a webhook on the merge requests. There's nothing you have to do if # you want your changes tested -- created pipeline will be automatically @@ -39,7 +40,7 @@ workflow: builder_image_tag: latest srpm_make_target: dist-srpm rpmbuild_with: 'up' - run_redhat_self_test : 'true' + run_redhat_self_test: 'true' skip_setup: 'true' skip_test: 'true' skip_results: 'true'
-- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2538
From: Michael Hofmann mhofmann@redhat.com
Remove obsolete unused trigger variable
The :production tag is used by default.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index blahblah..blahblah 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -37,7 +37,6 @@ workflow: variables: name: kernel-ark builder_image: quay.io/cki/builder-rawhide - builder_image_tag: latest srpm_make_target: dist-srpm rpmbuild_with: 'up' run_redhat_self_test: 'true'
-- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2538
From: Michael Hofmann mhofmann@redhat.com
Allow to auto-cancel redundant pipelines
This was already set in the project settings, but for this to work it needs `interruptible: true` as well.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index blahblah..blahblah 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,6 +15,9 @@ stages: - build - deploy
+default: + interruptible: true + workflow: rules: - if: '$CI_PIPELINE_SOURCE == "schedule"' # ARK release pipelines
-- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2538
From: Michael Hofmann mhofmann@redhat.com
Enable cs-like CI
Part of https://gitlab.com/cki-project/kernel-ark/-/issues/113
Signed-off-by: Michael Hofmann mhofmann@redhat.com
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index blahblah..blahblah 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -60,10 +60,74 @@ workflow: skip_build: 'true' skip_publish: 'true'
+.trigger_eln_pipeline: + stage: test + 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 + - if: $CI_COMMIT_AUTHOR == "Fedora Kernel Team kernel-team@fedoraproject.org" + when: manual + allow_failure: true + - when: on_success + # ARK CI ark_merge_request: extends: [.trusted-ark, .merge_request, .trigger_ark_pipeline]
+# ELN CI +eln_merge_request: + extends: [.trusted-ark, .merge_request, .trigger_eln_pipeline] + variables: + rpmbuild_with: up + package_name: kernel + architectures: x86_64 aarch64 s390x ppc64le + +eln_debug_merge_request: + extends: [.trusted-ark, .merge_request, .trigger_eln_pipeline] + variables: + rpmbuild_with: up dbgonly + package_name: kernel-debug + architectures: x86_64 aarch64 s390x ppc64le + +eln_realtime_merge_request: + extends: [.trusted-ark, .merge_request, .trigger_eln_pipeline] + variables: + rpmbuild_with: realtime + package_name: kernel-rt + architectures: x86_64 + +eln_realtime_debug_merge_request: + extends: [.trusted-ark, .merge_request, .trigger_eln_pipeline] + variables: + rpmbuild_with: realtime dbgonly + package_name: kernel-rt-debug + architectures: x86_64 + +eln_64k_merge_request: + extends: [.trusted-ark, .merge_request, .trigger_eln_pipeline] + variables: + rpmbuild_with: arm64_64k + package_name: kernel-64k + architectures: aarch64 + +eln_64k_debug_merge_request: + extends: [.trusted-ark, .merge_request, .trigger_eln_pipeline] + variables: + rpmbuild_with: arm64_64k dbgonly + package_name: kernel-64k-debug + architectures: aarch64 + # scheduled job .scheduled_setup: image: quay.io/cki/builder-rawhide:production
-- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2538
From: Michael Hofmann mhofmann@redhat.com
Allow ELN pipelines failures
Failures will still be surfaced in the bot comments.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index blahblah..blahblah 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -80,6 +80,7 @@ workflow: when: manual allow_failure: true - when: on_success + allow_failure: true
# ARK CI ark_merge_request:
-- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2538
From: Michael Hofmann on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2538#note_1450117...
@jmflinuxtx could you take a look whether this (esp the trigger conditions) look good to you? While I'm at it, are there any additional rawhide child pipelines I should add, e.g. for kernel-debug?
From: Jan Stancek on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2538#note_1451166...
The issue with depmod appears to be filter-modules, because it moves drivers/platform to kernel-modules, while intel_rapl_tpmi stays in -core, but depends on tpmi (which is in drivers/platform). Looking at reproducing/fixing this locally.
From: Jan Stancek on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2538#note_1452288...
fix merged in https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2551
From: Michael Hofmann on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2538#note_1452482...
@scweaver @jstancek the only remaining issue seems to be the cross-compiled debug builds for s390x/ppc64le 🤔
From: Jan Stancek on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2538#note_1452487...
Are these the first pipelines that try to cross-compile ARK? Is this same toolchain used in c9s builds? I'm trying to understand what's new/changed or how is this different from c9s builds.
From: Jan Stancek on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2538#note_1452522...
nvm, it's spec issue, dbgonly disables with_cross for some reason, so target flags end up in host CFLAGS for fixdep
From: Michael Hofmann on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2538#note_1452524...
Currently, no CKI pipelines have non-x86_64 debug builds.
This was requested in https://gitlab.com/cki-project/pipeline- definition/-/issues/133, and we worked on it as a PoC in https://gitlab.com/redhat/centos-stream/src/kernel/centos- stream-9/-/merge_requests/2130.
At that time, the debug pipeline was able to run successfully: https://gitlab.com/redhat/red-hat-ci-tools/kernel/cki-internal-pipelines/cki... trusted-contributors/-/pipelines/797892297. It used `CROSS_COMPILE=powerpc64le-linux-gnu-` and `rpmbuild --rebuild --target ppc64le --with cross --with debug --without bpftool --without selftests --without ipaclones --without perf --without tools --without trace --without up --without zfcpdump --without realtime --without arm64_64k`. This was on a CentOS stream builder container.
For ARK/ELN, as far as I know, it was never enabled before.
From: Jan Stancek on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2538#note_1452603...
opened https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2552
From: Jan Stancek on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2538#note_1454560...
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2552 is merged now
From: Jan Stancek on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2538#note_1454824...
I haven't check artefacts in latest pipeline, but it's all green now.
kernel@lists.fedoraproject.org