[OS-BUILD PATCH 0/2] Fixes for process_configs.sh now that things are being processed in parallel.

[Justin M. Forbes (via Email Bridge)]

From: Justin M. Forbes on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1643

Now that we are capable of processing multiple config files in parallel, we do
not know exactly which arch a failure is seen on. This is important as
frequently errors are specific to a single arch. This patch just prints the
arch before the variant on failure messages to help us determine the best way
to correct an issue.

While trying to figure out where the failure was, I tried passing make -j1 and
noticed that the call to process_configs.sh in make dist-configs-check did not
pass RHJOBS, so it would always use nproc --all. This is also fixed.

Signed-off-by: Justin M. Forbes <jforbes(a)fedoraproject.org&gt;

---
 redhat/configs/process_configs.sh |  6 +++---
 redhat/Makefile                   |  2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

[OS-BUILD PATCH 1/2] Pass RHJOBS to process_configs for dist-configs-check as well

[Justin M. Forbes (via Email Bridge)]

From: Justin M. Forbes <jforbes(a)fedoraproject.org&gt;

Pass RHJOBS to process_configs for dist-configs-check as well

Signed-off-by: Justin M. Forbes <jforbes(a)fedoraproject.org&gt;

diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -145,7 +145,7 @@ dist-rhel-configs: dist-configs
 rh-configs: dist-rhel-configs
 
 dist-configs-check: dist-configs-prep
-	+cd $(REDHAT)/configs; ./process_configs.sh $(PROCESS_CONFIGS_CHECK_OPTS)
$(PACKAGE_NAME)
+	+cd $(REDHAT)/configs; ./process_configs.sh $(PROCESS_CONFIGS_CHECK_OPTS)
$(PACKAGE_NAME) "" "" "" "$(RHJOBS)"
 
 dist-configs-prep: dist-clean-configs dist-buildreq-check
 	+cd $(REDHAT)/configs; ./build_configs.sh "partial" "$(ARCH_MACH)"
"snip" "$(RHJOBS)"

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1643

[OS-BUILD PATCH 2/2] Print arch with process_configs errors

[Justin M. Forbes (via Email Bridge)]

From: Justin M. Forbes <jforbes(a)fedoraproject.org&gt;

Print arch with process_configs errors

Now that we are capable of processing multiple config files in parallel,
we do not know exactly which arch a failure is seen on. This is
important as frequently errors are specific to a single arch. This patch
just prints the arch before the variant on failure messages to help us
determine the best way to correct an issue.

Signed-off-by: Justin M. Forbes <jforbes(a)fedoraproject.org&gt;

diff --git a/redhat/configs/process_configs.sh b/redhat/configs/process_configs.sh
index blahblah..blahblah 100755
--- a/redhat/configs/process_configs.sh
+++ b/redhat/configs/process_configs.sh
@@ -104,7 +104,7 @@ checkoptions()
 
 		! $checkoptions_error && return
 
-		sed -i "1s/^/Error: Mismatches found in configuration files for
${variant}\n/" .mismatches${count}
+		sed -i "1s/^/Error: Mismatches found in configuration files for ${arch}
${variant}\n/" .mismatches${count}
 		[ "$CONTINUEONERROR" ] || exit 1
 	else
 		rm -f .mismatches${count}
@@ -253,7 +253,7 @@ function process_config()
 	grep -E 'CONFIG_' .listnewconfig${count} > .newoptions${count}
 	if test -n "$NEWOPTIONS" && test -s .newoptions${count}
 	then
-		echo "Found unset config items in ${variant}, please set them to an appropriate
value" >> .errors${count}
+		echo "Found unset config items in ${arch} ${variant}, please set them to an
appropriate value" >> .errors${count}
 		cat .newoptions${count} >> .errors${count}
 		rm .newoptions${count}
 		RETURNCODE=1
@@ -264,7 +264,7 @@ function process_config()
 	grep -E 'config.*warning' .listnewconfig${count} > .warnings${count}
 	if test -n "$CHECKWARNINGS" && test -s .warnings${count}
 	then
-		echo "Found misconfigured config items in ${variant}, please set them to an
appropriate value" >> .errors${count}
+		echo "Found misconfigured config items in ${arch} ${variant}, please set them to
an appropriate value" >> .errors${count}
 		cat .warnings${count} >> .errors${count}
 		rm .warnings${count}
 		[ "$CONTINUEONERROR" ] || exit 1

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1643