From: Don Zickus <dzickus(a)redhat.com&gt; [Scheduled job] Catch config mismatches early during upstream merge When merging the upstream git tree, the process commits all the new configs to the -pending directory. However, it needs another pass to catch any new mismatches resulting in those new config settings. This just adds another step, 'make dist-configs-check' to catch those problems before we blindly merge the upstream tree. Signed-off-by: Don Zickus <dzickus(a)redhat.com&gt; diff --git a/redhat/scripts/ci/ark-update-configs.sh b/redhat/scripts/ci/ark-update-configs.sh index blahblah..blahblah 100755 --- a/redhat/scripts/ci/ark-update-configs.sh +++ b/redhat/scripts/ci/ark-update-configs.sh @@ -67,6 +67,9 @@ old_head="$(git rev-parse HEAD)" make FLAVOR=rhel dist-configs-commit new_head="$(git rev-parse HEAD)" +# check for config mismatches after setting configs in the commit step above +make dist-configs-check + # Converts each new pending config from above into its finalized git # configs/<date>/<config> branch. These commits are used for Merge # Requests. -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2768