From: Don Zickus <dzickus(a)redhat.com>
I created an optimization to speed up the automated scripts when there was
nothing to merge in redhat/scripts/ci/ark-update-configs.sh under
2d1d129bbe310da5a8751e8e8ff4dc2209337d22
The thought was, if 'master' wasn't updated or needed merging, how can there
be
any new configs to add?
Well it turns out that when merge conflicts arise, the merge of master into
os-build has to be done by hand and pushed manually. This usually skips the
new config generation.
The above optimization then skips the config generation on later cron jobs
because the merge already happened (until the master is actually updated).
There is nothing wrong with re-running the config generation script even if
there is nothing to do. Just undo the optimization.
Signed-off-by: Don Zickus <dzickus(a)redhat.com>
---
redhat/scripts/ci/ark-update-configs.sh | 5 -----
1 file changed, 5 deletions(-)
diff --git a/redhat/scripts/ci/ark-update-configs.sh
b/redhat/scripts/ci/ark-update-configs.sh
index e8baacdb929e..cf6d201bcaf7 100755
--- a/redhat/scripts/ci/ark-update-configs.sh
+++ b/redhat/scripts/ci/ark-update-configs.sh
@@ -33,7 +33,6 @@ To resolve this, do the following:
git checkout os-build
BRANCH="$(git branch --show-current)"
-HEAD="$(git describe)"
if ! git merge -m "Merge '$UPSTREAM_REF' into '$BRANCH'"
"$UPSTREAM_REF"; then
git merge --abort
printf "Merge conflict; halting!\n"
@@ -48,10 +47,6 @@ if ! git merge -m "Merge '$UPSTREAM_REF' into
'$BRANCH'" "$UPSTREAM_REF"; then
fi
exit 1
fi
-NEW_HEAD="$(git describe)"
-
-# Merge is already up to date, nothing to do.
-test "$HEAD" != "$NEW_HEAD" || exit 0
# Generates and commits all the pending configs
make FLAVOR=fedora dist-configs-commit
--
GitLab