[OS-BUILD PATCHv2 1/6] CI: use job templates for variant variables

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



From: Michael Hofmann <mhofmann@xxxxxxxxxx>

CI: use job templates for variant variables

This will allow to override them later on.

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index blahblah..blahblah 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -126,211 +126,228 @@ workflow:
     - *only-ark-latest-head
     - *on-success
 
-.variants:
-  rawhide-up: &rawhide-up
+# variants
+.rawhide_up:
+  variables:
     rpmbuild_with: up base
     package_name: kernel
     architectures: x86_64 aarch64 s390x ppc64le
     run_redhat_self_test: 'true'
-  rawhide-up-debug: &rawhide-up-debug
+.rawhide_up_debug:
+  variables:
     rpmbuild_with: up debug
     package_name: kernel-debug
     architectures: x86_64 aarch64
-  rawhide-16k: &rawhide-16k
+.rawhide_16k:
+  variables:
     rpmbuild_with: arm64_16k base
     package_name: kernel-16k
     architectures: aarch64
-  rawhide-16k-debug: &rawhide-16k-debug
+.rawhide_16k_debug:
+  variables:
     rpmbuild_with: arm64_16k debug
     package_name: kernel-16k-debug
     architectures: aarch64
-  rawhide-clang-up: &rawhide-clang-up
+.rawhide_clang_up:
+  variables:
     rpmbuild_with: up base
     package_name: kernel
     architectures: x86_64 aarch64 s390x ppc64le
     compiler: clang
-  rawhide-clang-up-debug: &rawhide-clang-up-debug
+.rawhide_clang_up_debug:
+  variables:
     rpmbuild_with: up debug
     package_name: kernel-debug
     architectures: x86_64 aarch64
     compiler: clang
-  rawhide-clanglto-up: &rawhide-clanglto-up
+.rawhide_clanglto_up:
+  variables:
     rpmbuild_with: clang_lto up base
     package_name: kernel
     architectures: x86_64 aarch64
     compiler: clang
-  rawhide-clanglto-up-debug: &rawhide-clanglto-up-debug
+.rawhide_clanglto_up_debug:
+  variables:
     rpmbuild_with: clang_lto up debug
     package_name: kernel-debug
     architectures: x86_64 aarch64
     compiler: clang
-  eln-up: &eln-up
+.eln_up:
+  variables:
     rpmbuild_with: up base
     package_name: kernel
     architectures: x86_64 aarch64 s390x ppc64le
     run_redhat_self_test: 'true'
-  eln-up-debug: &eln-up-debug
+.eln_up_debug:
+  variables:
     rpmbuild_with: up debug
     package_name: kernel-debug
     architectures: x86_64 aarch64 s390x ppc64le
-  eln-clang-up: &eln-clang-up
+.eln_clang_up:
+  variables:
     rpmbuild_with: up base
     package_name: kernel
     architectures: x86_64 aarch64 s390x ppc64le
     compiler: clang
-  eln-clang-up-debug: &eln-clang-up-debug
+.eln_clang_up_debug:
+  variables:
     rpmbuild_with: up debug
     package_name: kernel-debug
     architectures: x86_64 aarch64 s390x ppc64le
     compiler: clang
   eln-rt: &eln-rt
+.eln_rt:
+  variables:
     rpmbuild_with: realtime base
     package_name: kernel-rt
     architectures: x86_64
-  eln-rt-debug: &eln-rt-debug
+.eln_rt_debug:
+  variables:
     rpmbuild_with: realtime debug
     package_name: kernel-rt-debug
     architectures: x86_64
-  eln-64k: &eln-64k
+.eln_64k:
+  variables:
     rpmbuild_with: arm64_64k base
     package_name: kernel-64k
     architectures: aarch64
-  eln-64k-debug: &eln-64k-debug
+.eln_64k_debug:
+  variables:
     rpmbuild_with: arm64_64k debug
     package_name: kernel-64k-debug
     architectures: aarch64
 
 # Rawhide CI
 ark_merge_request:
-  extends: [.merge_request, .trigger_rawhide, .no_tests, .srpm_for_bot]
-  variables: *rawhide-up
+  extends: [.merge_request, .trigger_rawhide, .no_tests, .srpm_for_bot,
+            .rawhide_up]
 
 ark_debug_merge_request:
-  extends: [.merge_request, .trigger_rawhide, .no_tests, .manual_for_bot]
-  variables: *rawhide-up-debug
+  extends: [.merge_request, .trigger_rawhide, .no_tests, .manual_for_bot,
+            .rawhide_up_debug]
 
 ark_16k_merge_request:
-  extends: [.merge_request, .trigger_rawhide, .no_tests, .manual_for_bot]
-  variables: *rawhide-16k
+  extends: [.merge_request, .trigger_rawhide, .no_tests, .manual_for_bot,
+            .rawhide_16k]
 
 ark_16k_debug_merge_request:
-  extends: [.merge_request, .trigger_rawhide, .no_tests, .manual_for_bot]
-  variables: *rawhide-16k-debug
+  extends: [.merge_request, .trigger_rawhide, .no_tests, .manual_for_bot,
+            .rawhide_16k_debug]
 
 ark_clang_merge_request:
-  extends: [.merge_request, .trigger_rawhide, .no_tests, .manual_for_bot]
-  variables: *rawhide-clang-up
+  extends: [.merge_request, .trigger_rawhide, .no_tests, .manual_for_bot,
+            .rawhide_clang_up]
 
 ark_clang_debug_merge_request:
-  extends: [.merge_request, .trigger_rawhide, .no_tests, .manual_for_bot]
-  variables: *rawhide-clang-up-debug
+  extends: [.merge_request, .trigger_rawhide, .no_tests, .manual_for_bot,
+            .rawhide_clang_up_debug]
 
 ark_clanglto_merge_request:
-  extends: [.merge_request, .trigger_rawhide, .no_tests, .manual_for_bot]
-  variables: *rawhide-clanglto-up
+  extends: [.merge_request, .trigger_rawhide, .no_tests, .manual_for_bot,
+            .rawhide_clanglto_up]
 
 ark_clanglto_debug_merge_request:
-  extends: [.merge_request, .trigger_rawhide, .no_tests, .manual_for_bot]
-  variables: *rawhide-clanglto-up-debug
+  extends: [.merge_request, .trigger_rawhide, .no_tests, .manual_for_bot,
+            .rawhide_clanglto_up_debug]
 
 # Rawhide baselines
 ark_baseline:
-  extends: [.baseline, .trigger_rawhide, .reported_tests, .ark_latest_head]
-  variables: *rawhide-up
+  extends: [.baseline, .trigger_rawhide, .reported_tests, .ark_latest_head,
+            .rawhide_up]
 
 ark_debug_baseline:
-  extends: [.baseline, .trigger_rawhide, .reported_tests, .ark_latest_head]
-  variables: *rawhide-up-debug
+  extends: [.baseline, .trigger_rawhide, .reported_tests, .ark_latest_head,
+            .rawhide_up_debug]
 
 ark_16k_baseline:
-  extends: [.baseline, .trigger_rawhide, .no_tests, .ark_latest_head]
-  variables: *rawhide-16k
+  extends: [.baseline, .trigger_rawhide, .no_tests, .ark_latest_head,
+            .rawhide_16k]
 
 ark_16k_debug_baseline:
-  extends: [.baseline, .trigger_rawhide, .no_tests, .ark_latest_head]
-  variables: *rawhide-16k-debug
+  extends: [.baseline, .trigger_rawhide, .no_tests, .ark_latest_head,
+            .rawhide_16k_debug]
 
 ark_clang_baseline:
-  extends: [.baseline, .trigger_rawhide, .reported_tests_clang, .ark_latest_head]
-  variables: *rawhide-clang-up
+  extends: [.baseline, .trigger_rawhide, .reported_tests_clang, .ark_latest_head,
+            .rawhide_clang_up]
 
 ark_clang_debug_baseline:
-  extends: [.baseline, .trigger_rawhide, .reported_tests_clang, .ark_latest_head]
-  variables: *rawhide-clang-up-debug
+  extends: [.baseline, .trigger_rawhide, .reported_tests_clang, .ark_latest_head,
+            .rawhide_clang_up_debug]
 
 ark_clanglto_baseline:
-  extends: [.baseline, .trigger_rawhide, .reported_tests_clang, .ark_latest_head]
-  variables: *rawhide-clanglto-up
+  extends: [.baseline, .trigger_rawhide, .reported_tests_clang, .ark_latest_head,
+            .rawhide_clanglto_up]
 
 ark_clanglto_debug_baseline:
-  extends: [.baseline, .trigger_rawhide, .reported_tests_clang, .ark_latest_head]
-  variables: *rawhide-clanglto-up-debug
+  extends: [.baseline, .trigger_rawhide, .reported_tests_clang, .ark_latest_head,
+            .rawhide_clanglto_up_debug]
 
 # ELN CI
 eln_merge_request:
-  extends: [.merge_request, .trigger_eln, .no_tests, .srpm_for_bot]
-  variables: *eln-up
+  extends: [.merge_request, .trigger_eln, .no_tests, .srpm_for_bot,
+            .eln_up]
 
 eln_debug_merge_request:
-  extends: [.merge_request, .trigger_eln, .no_tests, .manual_for_bot]
-  variables: *eln-up-debug
+  extends: [.merge_request, .trigger_eln, .no_tests, .manual_for_bot,
+            .eln_up_debug]
 
 # eln_clang_merge_request:
-#   extends: [.merge_request, .trigger_eln, .no_tests, .manual_for_bot]
-#   variables: *eln-clang-up
+#   extends: [.merge_request, .trigger_eln, .no_tests, .manual_for_bot,
+#             .eln_clang_up]
 #
 # eln_clang_debug_merge_request:
-#   extends: [.merge_request, .trigger_eln, .no_tests, .manual_for_bot]
-#   variables: *eln-clang-up-debug
+#   extends: [.merge_request, .trigger_eln, .no_tests, .manual_for_bot,
+#             .eln_clang_up_debug]
 
 eln_realtime_merge_request:
-  extends: [.merge_request, .trigger_eln, .no_tests, .manual_for_bot]
-  variables: *eln-rt
+  extends: [.merge_request, .trigger_eln, .no_tests, .manual_for_bot,
+            .eln_rt]
 
 eln_realtime_debug_merge_request:
-  extends: [.merge_request, .trigger_eln, .no_tests, .manual_for_bot]
-  variables: *eln-rt-debug
+  extends: [.merge_request, .trigger_eln, .no_tests, .manual_for_bot,
+            .eln_rt_debug]
 
 eln_64k_merge_request:
-  extends: [.merge_request, .trigger_eln, .no_tests, .manual_for_bot]
-  variables: *eln-64k
+  extends: [.merge_request, .trigger_eln, .no_tests, .manual_for_bot,
+            .eln_64k]
 
 eln_64k_debug_merge_request:
-  extends: [.merge_request, .trigger_eln, .no_tests, .manual_for_bot]
-  variables: *eln-64k-debug
+  extends: [.merge_request, .trigger_eln, .no_tests, .manual_for_bot,
+            .eln_64k_debug]
 
 # ELN baselines
 eln_baseline:
-  extends: [.baseline, .trigger_eln, .reported_tests, .ark_latest_head]
-  variables: *eln-up
+  extends: [.baseline, .trigger_eln, .reported_tests, .ark_latest_head,
+            .eln_up]
 
 eln_debug_baseline:
-  extends: [.baseline, .trigger_eln, .reported_tests, .ark_latest_head]
-  variables: *eln-up-debug
+  extends: [.baseline, .trigger_eln, .reported_tests, .ark_latest_head,
+            .eln_up_debug]
 
 # eln_clang_baseline:
-#   extends: [.baseline, .trigger_eln, .reported_tests_clang, .ark_latest_head]
-#   variables: *eln-clang-up
+#   extends: [.baseline, .trigger_eln, .reported_tests_clang, .ark_latest_head,
+#             .eln_clang_up]
 #
 # eln_clang_debug_baseline:
-#   extends: [.baseline, .trigger_eln, .reported_tests_clang, .ark_latest_head]
-#   variables: *eln-clang-up-debug
+#   extends: [.baseline, .trigger_eln, .reported_tests_clang, .ark_latest_head,
+#             .eln_clang_up_debug]
 
 eln_realtime_baseline:  # no tests as realtime code not present upstream
-  extends: [.baseline, .trigger_eln, .no_tests, .ark_latest_head]
-  variables: *eln-rt
+  extends: [.baseline, .trigger_eln, .no_tests, .ark_latest_head,
+            .eln_rt]
 
 eln_realtime_debug_baseline:  # no tests as realtime code not present upstream
-  extends: [.baseline, .trigger_eln, .no_tests, .ark_latest_head]
-  variables: *eln-rt-debug
+  extends: [.baseline, .trigger_eln, .no_tests, .ark_latest_head,
+            .eln_rt_debug]
 
 eln_64k_baseline:
-  extends: [.baseline, .trigger_eln, .reported_tests, .ark_latest_head]
-  variables: *eln-64k
+  extends: [.baseline, .trigger_eln, .reported_tests, .ark_latest_head,
+            .eln_64k]
 
 eln_64k_debug_baseline:
-  extends: [.baseline, .trigger_eln, .reported_tests, .ark_latest_head]
-  variables: *eln-64k-debug
+  extends: [.baseline, .trigger_eln, .reported_tests, .ark_latest_head,
+            .eln_64k_debug]
 
 # scheduled job
 .scheduled_setup:

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2742
_______________________________________________
kernel mailing list -- kernel@xxxxxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to kernel-leave@xxxxxxxxxxxxxxxxxxxxxxx
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@xxxxxxxxxxxxxxxxxxxxxxx
Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue




[Index of Archives]     [Fedora General Discussion]     [Older Fedora Users Archive]     [Fedora Advisory Board]     [Fedora Security]     [Fedora Devel Java]     [Fedora Legacy]     [Fedora Desktop]     [ATA RAID]     [Fedora Marketing]     [Fedora Mentors]     [Fedora Package Announce]     [Fedora Package Review]     [Fedora Music]     [Fedora Packaging]     [Centos]     [Fedora SELinux]     [Coolkey]     [Yum Users]     [Tux]     [Yosemite News]     [KDE Users]     [Fedora Art]     [Fedora Docs]     [USB]     [Asterisk PBX]

  Powered by Linux