Add an additional pass through project templates
In order to find project templates that need to be expanded from job matchers that are not project specific, we need to make a pass through all of the projects assuming all templates need to be expanded. We then look at the result of the expansion to see if anything was actually done. As part of this, we also collect same-expansions on a job basis to track if a given job always has the same matcher expansion. If it does, we can apply that to the job definition and not to the project-pipeline defintion, which could lower the number of templates that need to be expanded. This may be the ugliest code I've ever written. I'm sorry. Also fix a bash bug in the run-migration script that caused final to always get run regardless of flag setting. Whoops. Change-Id: I523909e5242e0db125b7560cbdcd9ac41ca6c72f
This commit is contained in:
@@ -47,12 +47,12 @@ done
|
||||
|
||||
BASE_DIR=$(cd $(dirname $0)/../..; pwd)
|
||||
cd $BASE_DIR/project-config
|
||||
if [[ $FINAL ]] ; then
|
||||
if [[ $FINAL = 1 ]] ; then
|
||||
git reset --hard
|
||||
fi
|
||||
python3 $BASE_DIR/zuul/zuul/cmd/migrate.py --mapping=zuul/mapping.yaml \
|
||||
zuul/layout.yaml jenkins/jobs nodepool/nodepool.yaml . $VERBOSE
|
||||
if [[ $FINAL ]] ; then
|
||||
if [[ $FINAL = 1 ]] ; then
|
||||
find ../openstack-zuul-jobs/playbooks/legacy -maxdepth 1 -mindepth 1 \
|
||||
-type d | xargs rm -rf
|
||||
mv zuul.d/zuul-legacy-* ../openstack-zuul-jobs/zuul.d/
|
||||
|
||||
Reference in New Issue
Block a user