Merge: redhat: update brew target for RHEL scratch builds

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

JIRA: INTERNAL
Upstream Status: RHEL Only

The newest target is ahead, already at 10.1 and currently also has broken
dist tag. Use the same target we use for official builds.

Signed-off-by: Jan Stancek <jstancek@redhat.com>

Approved-by: Eder Zulian <ezulian@redhat.com>
Approved-by: Herton R. Krzesinski <herton@redhat.com>
Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com>

Merged-by: Jan Stancek <jstancek@redhat.com>

Author: jstancek

redhat/Makefile

@@ -311,7 +311,7 @@ else
     else
       # This value is used by the dist[g]-targets.  Changing this value has significant
       # consequences for all of RHEL kernel engineering.
-      BUILD_TARGET:=rhel-$(RHEL_MAJOR)-newest-test-pesign
+      BUILD_TARGET:=rhel-$(RHEL_MAJOR).$(RHEL_MINOR)-test-pesign
     endif
   endif
   ifeq ("$(DIST)", ".eln")

redhat/self-test/data/centos-2585cf9dfaad.el7

@@ -8,7 +8,6 @@ BUILD=6
 BUILD_FLAGS=
 BUILD_PROFILE=-p stream
 BUILD_PROFILE_USERDEF=
-BUILD_TARGET=c10s-candidate
 BUILD_TARGET_USERDEF=
 BUMP_RELEASE=yes
 CHANGELOG_EXT=changelog-10.0

redhat/self-test/data/centos-2585cf9dfaad.fc25

@@ -8,7 +8,6 @@ BUILD=6
 BUILD_FLAGS=
 BUILD_PROFILE=-p stream
 BUILD_PROFILE_USERDEF=
-BUILD_TARGET=c10s-candidate
 BUILD_TARGET_USERDEF=
 BUMP_RELEASE=yes
 CHANGELOG_EXT=changelog-10.0

redhat/self-test/data/centos-78e36f3b0dae.el7

@@ -8,7 +8,6 @@ BUILD=6
 BUILD_FLAGS=
 BUILD_PROFILE=-p stream
 BUILD_PROFILE_USERDEF=
-BUILD_TARGET=c10s-candidate
 BUILD_TARGET_USERDEF=
 BUMP_RELEASE=yes
 CHANGELOG_EXT=changelog-10.0

redhat/self-test/data/centos-78e36f3b0dae.fc25

@@ -8,7 +8,6 @@ BUILD=6
 BUILD_FLAGS=
 BUILD_PROFILE=-p stream
 BUILD_PROFILE_USERDEF=
-BUILD_TARGET=c10s-candidate
 BUILD_TARGET_USERDEF=
 BUMP_RELEASE=yes
 CHANGELOG_EXT=changelog-10.0

redhat/self-test/data/centos-df0cc57e057f.el7

@@ -8,7 +8,6 @@ BUILD=6
 BUILD_FLAGS=
 BUILD_PROFILE=-p stream
 BUILD_PROFILE_USERDEF=
-BUILD_TARGET=c10s-candidate
 BUILD_TARGET_USERDEF=
 BUMP_RELEASE=yes
 CHANGELOG_EXT=changelog-10.0

redhat/self-test/data/centos-df0cc57e057f.fc25

@@ -8,7 +8,6 @@ BUILD=6
 BUILD_FLAGS=
 BUILD_PROFILE=-p stream
 BUILD_PROFILE_USERDEF=
-BUILD_TARGET=c10s-candidate
 BUILD_TARGET_USERDEF=
 BUMP_RELEASE=yes
 CHANGELOG_EXT=changelog-10.0

redhat/self-test/data/centos-fce15c45d3fb.el7

@@ -8,7 +8,6 @@ BUILD=6
 BUILD_FLAGS=
 BUILD_PROFILE=-p stream
 BUILD_PROFILE_USERDEF=
-BUILD_TARGET=c10s-candidate
 BUILD_TARGET_USERDEF=
 BUMP_RELEASE=yes
 CHANGELOG_EXT=changelog-10.0

redhat/self-test/data/centos-fce15c45d3fb.fc25

@@ -8,7 +8,6 @@ BUILD=6
 BUILD_FLAGS=
 BUILD_PROFILE=-p stream
 BUILD_PROFILE_USERDEF=
-BUILD_TARGET=c10s-candidate
 BUILD_TARGET_USERDEF=
 BUMP_RELEASE=yes
 CHANGELOG_EXT=changelog-10.0

redhat/self-test/data/create-data.sh

@@ -46,6 +46,7 @@ do
 			echo "building ${destdir}/$varfilename"
 
 			# Ignored Makefile variables:
+                        # BUILD_TARGET changes every minor release
 			# CURDIR is a make special target and cannot be easily changed.
 			# UPSTREAM is the base merge commit and can change from day-to-day as
 			# the tree is changed.
@@ -56,6 +57,7 @@ do
 			# VARS is a list of variables added for the 'dist-dump-variables' target
 			# and can be ignored.
 			make RHSELFTESTDATA=1 DIST="${DIST}" DISTRO="${DISTRO}" HEAD=${commit} dist-dump-variables | grep "=" |\
+				grep -v -w BUILD_TARGET |\
 				grep -v -w CURDIR |\
 				grep -v -w UPSTREAM |\
 				grep -v -w RHEL_RELEASE |\