Merge: [redhat] gitlab-ci: change automotive_disttag to .el9_6iv

MR: https://gitlab.com/redhat/rhel/src/kernel/rhel-9/-/merge_requests/3499

JIRA: INTERNAL
Upstream status: RHEL only

The pipeline unfortunately bumped into a `redhat/self-test/2001-dist-r‎elease.bats` bug addressed in cki-project/kernel-ark!2142+ and cki-project/kernel-ark!2837+. I've pulled them in here to get this MR across the line.

Signed-off-by: Patrick Talbert <[email protected]>

Approved-by: Michael Hofmann <[email protected]>
Approved-by: Bruno Goncalves <[email protected]>
Approved-by: Jan Stancek <[email protected]>
Approved-by: CKI KWF Bot <[email protected]>

Merged-by: CKI KWF Bot <[email protected]>

Author: CKI KWF Bot

.gitlab-ci.yml

@@ -44,7 +44,7 @@ workflow: !reference [.workflow]
 
 .automotive_disttag:
   variables:
-    disttag_override: '.el9iv'
+    disttag_override: '.el9_6iv'
 
 .automotive_branch:
   variables:

redhat/self-test/2001-dist-release.bats

@@ -2,6 +2,8 @@
 # Purpose: These are general dist-release tests.  They are run from a git
 # worktree created by the first test.
 
+DIST_RELEASE_REGEX="^\[redhat\] kernel-[0-9.]*"
+
 load test-lib.bash
 
 @test "dist-release setup worktree" {
@@ -36,7 +38,7 @@ _dist-release_test_2() {
 	# release number in Makefile.rhelver.
 	# and above in prologue.
 	cd $BATS_TMPDIR/distrelease
-	title="$(git log --oneline --all  --grep "\[redhat\] kernel" -n 1 --pretty="format:%s")"
+	title="$(git log --oneline --grep "${DIST_RELEASE_REGEX}" -n 1 --pretty="format:%s")"
 	# title = ... [redhat] kernel-5.11.0-0.rc0.20201220git467f8165a2b0.104
 	# Just the title message part AFTER "[redhat] ":
 	title=${title##*\[redhat\] }
@@ -60,15 +62,20 @@ _dist-release_test_3() {
 	# Test whether the version in the commit message matches
 	# the version in the change log.
 	cd $BATS_TMPDIR/distrelease
+
 	# Extract just the version part (the part between [ ]) on the first line of
 	# the change log:
 	changelog=$(head -1 ./redhat/kernel.changelog-${RHEL_MAJOR}.${RHEL_MINOR} | sed -e 's/.*\[\(.*\)\].*/\1/')
-	commit="$(git log --oneline --all  --grep "\[redhat\] kernel" -n 1 --pretty="format:%s")"
+
+	# Extract the tag in the latest [redhat] kernel commit message
+	commit="$(git log --oneline --grep "${DIST_RELEASE_REGEX}" -n 1 --pretty="format:%s")"
 	# Extract just the commit message part AFTER "[redhat] ":
 	gitlog=${commit##*\[redhat\] }
 	# This time, strip off "kernel-" also:
 	gitlog=${gitlog/kernel-/}
+
 	echo "The kernel version in the changelog-${RHEL_MAJOR}.${RHEL_MINOR} ("${changelog}") differs from the version in the git log ($gitlog)"
+
 	run _dist-release_test_3
 	check_status
 }