From: Michael Hofmann <mhofm...@redhat.com> Simplify job templates
Signed-off-by: Michael Hofmann <mhofm...@redhat.com> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index blahblah..blahblah 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,8 +22,6 @@ workflow: rules: - 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: 'ark-ci' .rules: only-os-build: &only-os-build @@ -43,17 +41,13 @@ workflow: skip_publish: 'true' architectures: '' -.trusted-ark: +.pipeline: + stage: test trigger: project: redhat/red-hat-ci-tools/kernel/cki-internal-pipelines/cki-trusted-contributors strategy: depend variables: - PIPELINE_TYPE: 'ark-ci' kernel_type: 'upstream' - -.pipeline: - stage: test - variables: srpm_make_target: dist-srpm skip_setup: 'true' skip_test: 'true' @@ -91,14 +85,14 @@ workflow: # ARK CI ark_merge_request: - extends: [.trusted-ark, .merge_request, .trigger_ark, .srpm_for_bot] + extends: [.merge_request, .trigger_ark, .srpm_for_bot] variables: rpmbuild_with: up package_name: kernel architectures: x86_64 aarch64 s390x ppc64le ark_debug_merge_request: - extends: [.trusted-ark, .merge_request, .trigger_ark, .manual_for_bot] + extends: [.merge_request, .trigger_ark, .manual_for_bot] variables: rpmbuild_with: up dbgonly package_name: kernel-debug @@ -106,42 +100,42 @@ ark_debug_merge_request: # ELN CI eln_merge_request: - extends: [.trusted-ark, .merge_request, .trigger_eln, .manual_for_bot] + extends: [.merge_request, .trigger_eln, .manual_for_bot] variables: rpmbuild_with: up package_name: kernel architectures: x86_64 aarch64 s390x ppc64le eln_debug_merge_request: - extends: [.trusted-ark, .merge_request, .trigger_eln, .manual_for_bot] + extends: [.merge_request, .trigger_eln, .manual_for_bot] 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, .manual_for_bot] + extends: [.merge_request, .trigger_eln, .manual_for_bot] variables: rpmbuild_with: realtime package_name: kernel-rt architectures: x86_64 eln_realtime_debug_merge_request: - extends: [.trusted-ark, .merge_request, .trigger_eln, .manual_for_bot] + extends: [.merge_request, .trigger_eln, .manual_for_bot] variables: rpmbuild_with: realtime dbgonly package_name: kernel-rt-debug architectures: x86_64 eln_64k_merge_request: - extends: [.trusted-ark, .merge_request, .trigger_eln, .manual_for_bot] + extends: [.merge_request, .trigger_eln, .manual_for_bot] variables: rpmbuild_with: arm64_64k package_name: kernel-64k architectures: aarch64 eln_64k_debug_merge_request: - extends: [.trusted-ark, .merge_request, .trigger_eln, .manual_for_bot] + extends: [.merge_request, .trigger_eln, .manual_for_bot] variables: rpmbuild_with: arm64_64k dbgonly package_name: kernel-64k-debug -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2575 _______________________________________________ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue