Merge: gitlab-ci: set automotive dist-tag

MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-10/-/merge_requests/706

JIRA: INTERNAL
Upstream Status: RHEL only

Automotive rpms should use the .el10iv dist-tag.

Signed-off-by: Scott Weaver <scweaver@redhat.com>

Approved-by: Michael Hofmann <mhofmann@redhat.com>
Approved-by: sbertram <sbertram@redhat.com>
Approved-by: Jan Stancek <jstancek@redhat.com>
Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com>

Merged-by: Julio Faracco <jfaracco@redhat.com>

Author: jcfaracco

.gitlab-ci.yml

@@ -40,6 +40,10 @@ workflow: !reference [.workflow]
 .gcov:
   extends: [.only_build_and_publish, .coverage]
 
+.automotive_disttag:
+  variables:
+    disttag_override: '.el10iv'
+
 # c10s CI
 c10s_merge_request:
   extends: [.trigger_trusted_pipeline, .merge_request, .variant_up]
@@ -60,10 +64,10 @@ c10s_rt_64k_debug_merge_request:
   extends: [.trigger_trusted_pipeline, .merge_request, .variant_rt_64k_debug]
 
 c10s_automotive_merge_request:
-  extends: [.trigger_trusted_pipeline, .merge_request, .variant_automotive]
+  extends: [.trigger_trusted_pipeline, .merge_request, .variant_automotive, .automotive_disttag]
 
 c10s_automotive_debug_merge_request:
-  extends: [.trigger_trusted_pipeline, .merge_request, .variant_automotive_debug]
+  extends: [.trigger_trusted_pipeline, .merge_request, .variant_automotive_debug, .automotive_disttag]
 
 c10s_64k_merge_request:
   extends: [.trigger_trusted_pipeline, .merge_request, .variant_64k]

redhat/Makefile

@@ -83,6 +83,11 @@ BUILD_TARGET_USERDEF:=$(BUILD_TARGET)
 
 ifndef DIST
   DIST := $(shell $(RPMBUILD) --eval '%{?dist}')
+else
+  # automotive uses a different dist tag
+  ifeq ($(DIST)iv, $(shell $(RPMBUILD) --eval '%{?dist}'))
+    DIST:=$(shell $(RPMBUILD) --eval '%{?dist}')
+  endif
 endif
 
 ifndef DISTRO