gitlab-ci: provide consistent kcidb_tree_name

Part of https://gitlab.com/cki-project/pipeline-data/-/issues/9

JIRA: INTERNAL

Upstream Status: RHEL-only

Signed-off-by: Michael Hofmann <mhofmann@redhat.com>
This commit is contained in:
Michael Hofmann 2024-10-29 15:17:05 +01:00
parent 181997db3b
commit 66593df99d
No known key found for this signature in database
GPG Key ID: 6FA2623D1460BF6D
1 changed files with 7 additions and 26 deletions

View File

@ -22,7 +22,7 @@ workflow: !reference [.workflow]
trigger:
branch: c9s
variables:
name: c9s
kcidb_tree_name: c9s
builder_image: quay.io/cki/builder-stream9
kpet_tree_name: c9s
run_redhat_self_test: 'true'
@ -31,7 +31,7 @@ workflow: !reference [.workflow]
trigger:
branch: rhel9
variables:
name: rhel9
kcidb_tree_name: rhel-9
builder_image: quay.io/cki/builder-rhel9
run_redhat_self_test: 'true'
@ -43,7 +43,6 @@ workflow: !reference [.workflow]
.automotive_full_c9s:
variables:
name: kernel-automotive-c9s
kpet_tree_name: autosd
disttag_override: '.el9iv'
AWS_UPT_IMAGE_NAME_FILTER: 'auto-osbuild-qemu-cs9-cki-ostree-*'
@ -51,21 +50,8 @@ workflow: !reference [.workflow]
.rt_full_c9s:
variables:
name: kernel-rt-c9s
kpet_tree_name: c9s
.rt_full_rhel9:
variables:
name: kernel-rt-rhel9
.64k_full_c9s:
variables:
name: kernel-64k-c9s
.64k_full_rhel9:
variables:
name: kernel-64k-rhel9
.automotive_check_c9s_overrides:
trigger:
branch: c9s-automotive
@ -88,8 +74,7 @@ c9s_64k_merge_request:
# Don't add .rhel_common as we overwrite those configs
extends: [.trusted, .merge_request,
.9-common, .trigger_c9s_pipeline,
.64k_common,
.64k_full_c9s]
.64k_common]
c9s_automotive_check_merge_request:
extends: [.trusted, .merge_request,
@ -126,15 +111,13 @@ rhel9_rt_merge_request:
# Don't add .rhel_common as we overwrite those configs
extends: [.internal, .merge_request, .with_notifications,
.9-common, .trigger_rhel9_pipeline,
.rt_common,
.rt_full_rhel9]
.rt_common]
rhel9_64k_merge_request:
# Don't add .rhel_common as we overwrite those configs
extends: [.internal, .merge_request, .with_notifications,
.9-common, .trigger_rhel9_pipeline,
.64k_common,
.64k_full_rhel9]
.64k_common]
rhel9_baseline_coverage_build:
extends: [.internal, .baseline, .rhel_common, .only_build_and_publish,
@ -149,12 +132,10 @@ rhel9_rt_merge_request_private:
# Don't add .rhel_common as we overwrite those configs
extends: [.scratch, .merge_request,
.9-common, .trigger_rhel9_pipeline,
.rt_common,
.rt_full_rhel9]
.rt_common]
rhel9_64k_merge_request_private:
# Don't add .rhel_common as we overwrite those configs
extends: [.scratch, .merge_request,
.9-common, .trigger_rhel9_pipeline,
.64k_common,
.64k_full_rhel9]
.64k_common]