Merge: redhat: introduce RELEASE_LOCALVERSION variable

MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/7553

JIRA: INTERNAL
Upstream Status: RHEL only

Sometimes we run into situation where people forget to set proper
localversion during official builds and end up with .test in NVR.

Introduce a new variable to Makefile.variables, which will be persisted
in source-git as well (contrast to localversion) and take priority when
used for dist-rtg targets. The scenarios where we need custom localversion
for official build should be very rare, meaning that the maintainer doesn't
need to touch this variable and default (empty localversion) will be used
instead of whatever may be left in 'localversion' (or DISTLOCALVERSION).

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

Approved-by: Scott Weaver <scweaver@redhat.com>
Approved-by: Patrick Talbert <ptalbert@redhat.com>
Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com>

Merged-by: CKI GitLab Kmaint Pipeline Bot <26919896-cki-kmaint-pipeline-bot@users.noreply.gitlab.com>

Author: CKI KWF Bot

redhat/Makefile

@@ -93,6 +93,13 @@ ifndef RHJOBS
 	  fi)
 endif
 
+# for official builds use RELEASE_LOCALVERSION persisted in Makefile.variables
+ifneq ($(filter $(MAKECMDGOALS),dist-release dist-release-tag dist-release-git dist-rtg dist-get-tag),)
+  DISTLOCALVERSION:=$(RELEASE_LOCALVERSION)
+  ifeq (,$(findstring s,$(firstword -$(MAKEFLAGS))))
+    $(info DISTLOCALVERSION is "$(DISTLOCALVERSION)".)
+  endif
+else
 LOCVERFILE:=../localversion
 # create an empty localversion file if you don't want a local buildid
 ifneq ($(wildcard $(LOCVERFILE)),)
@@ -110,6 +117,7 @@ else
   endif
   $(info DISTLOCALVERSION is "$(DISTLOCALVERSION)".)
 endif
+endif # MAKECMDGOALS
 
 # options for process_configs.sh script
 ifdef NO_CONFIGCHECKS

redhat/Makefile.variables

@@ -114,6 +114,10 @@ NO_CONFIGCHECKS ?=
 # considered stable and may be changed or removed without warning.
 RHSELFTESTDATA ?=
 
+# Local version to be used for official (non-scratch) builds. Makefile
+# dist-{release/tag/git} targets will ignore localversion and DISTLOCALVERSION
+RELEASE_LOCALVERSION:=
+
 # This variable is used by the redhat/self-tests.  It should not be
 # considered stable and my be changed or removed without warning.
 RHDISTDATADIR ?=

redhat/self-test/data/centos-6161a435c191.el7

@@ -43,6 +43,7 @@ PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
 PROCESS_CONFIGS_OPTS=-n -w -c 
 REDHAT=../redhat 
 RELEASETAG=kernel-5.12.0-0.rc4.6.test 
+RELEASE_LOCALVERSION= 
 RHDISTGIT_BRANCH=c9s 
 RHDISTGIT_USER="shadowman" 
 RHEL_MAJOR=9 

redhat/self-test/data/centos-6161a435c191.fc25

@@ -43,6 +43,7 @@ PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
 PROCESS_CONFIGS_OPTS=-n -w -c 
 REDHAT=../redhat 
 RELEASETAG=kernel-5.12.0-0.rc4.6.test 
+RELEASE_LOCALVERSION= 
 RHDISTGIT_BRANCH=c9s 
 RHDISTGIT_USER="shadowman" 
 RHEL_MAJOR=9 

redhat/self-test/data/centos-9f4ad9e425a1.el7

@@ -43,6 +43,7 @@ PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
 PROCESS_CONFIGS_OPTS=-n -w -c 
 REDHAT=../redhat 
 RELEASETAG=kernel-5.12.0-6.test 
+RELEASE_LOCALVERSION= 
 RHDISTGIT_BRANCH=c9s 
 RHDISTGIT_USER="shadowman" 
 RHEL_MAJOR=9 

redhat/self-test/data/centos-9f4ad9e425a1.fc25

@@ -43,6 +43,7 @@ PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
 PROCESS_CONFIGS_OPTS=-n -w -c 
 REDHAT=../redhat 
 RELEASETAG=kernel-5.12.0-6.test 
+RELEASE_LOCALVERSION= 
 RHDISTGIT_BRANCH=c9s 
 RHDISTGIT_USER="shadowman" 
 RHEL_MAJOR=9 

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

@@ -43,6 +43,7 @@ PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
 PROCESS_CONFIGS_OPTS=-n -w -c 
 REDHAT=../redhat 
 RELEASETAG=kernel-5.12.0-0.rc5.6.test 
+RELEASE_LOCALVERSION= 
 RHDISTGIT_BRANCH=c9s 
 RHDISTGIT_USER="shadowman" 
 RHEL_MAJOR=9 

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

@@ -43,6 +43,7 @@ PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
 PROCESS_CONFIGS_OPTS=-n -w -c 
 REDHAT=../redhat 
 RELEASETAG=kernel-5.12.0-0.rc5.6.test 
+RELEASE_LOCALVERSION= 
 RHDISTGIT_BRANCH=c9s 
 RHDISTGIT_USER="shadowman" 
 RHEL_MAJOR=9 

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

@@ -43,6 +43,7 @@ PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
 PROCESS_CONFIGS_OPTS=-n -w -c 
 REDHAT=../redhat 
 RELEASETAG=kernel-5.12.0-6.test 
+RELEASE_LOCALVERSION= 
 RHDISTGIT_BRANCH=c9s 
 RHDISTGIT_USER="shadowman" 
 RHEL_MAJOR=9 

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

@@ -43,6 +43,7 @@ PROCESS_CONFIGS_CHECK_OPTS=-n -t -c
 PROCESS_CONFIGS_OPTS=-n -w -c 
 REDHAT=../redhat 
 RELEASETAG=kernel-5.12.0-6.test 
+RELEASE_LOCALVERSION= 
 RHDISTGIT_BRANCH=c9s 
 RHDISTGIT_USER="shadowman" 
 RHEL_MAJOR=9