From: David Galloway <dgallowa@redhat.com>
Date: Tue, 31 Oct 2017 17:01:42 +0000 (-0400)
Subject: jenkins-job-builder: Set JJB_CONFIG var back after looping through jobs
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f26d9020cd6a311cbda2bc1de56b56e8b17c03a8;p=ceph-build.git

jenkins-job-builder: Set JJB_CONFIG var back after looping through jobs

Signed-off-by: David Galloway <dgallowa@redhat.com>
---

diff --git a/jenkins-job-builder/build/build b/jenkins-job-builder/build/build
index 5bda963d..05488d37 100644
--- a/jenkins-job-builder/build/build
+++ b/jenkins-job-builder/build/build
@@ -62,6 +62,9 @@ for dir in `find . -maxdepth 1 -path ./.git -prune -o -type d -print`; do
     fi
 done
 
+# Set JJB_CONFIG back to the one our master wrote so the var can be used in the deletion task below
+JJB_CONFIG="$HOME/.jenkins_jobs.$JENKINS_FQDN.ini"
+
 # Delete jobs our master has that didn't get job xml written during `jenkins-jobs test`
 # jenkins-job-builder doesn't get a config written so we `grep -v it` so it doesn't get deleted.
 for JOB in $(curl -s https://$JENKINS_FQDN/api/json | jq -r '.jobs[].name' | grep -v jenkins-job-builder | sort); do