From d815becad87517050d41c5937de5bcc95ad7a627 Mon Sep 17 00:00:00 2001
From: Fatih Degirmenci <fdegir@gmail.com>
Date: Fri, 19 Oct 2018 14:51:12 +0200
Subject: [PATCH] Add execute-shell for infra-jjb-verify

Change-Id: I95da23aac584bd1924b1a77035f4af4b1d875d6b
Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>
---
 jjb/infra/jjb-verify.sh   | 25 +++++++++++++++++++++++++
 jjb/infra/jjb-verify.yaml |  6 ++----
 2 files changed, 27 insertions(+), 4 deletions(-)
 create mode 100755 jjb/infra/jjb-verify.sh

diff --git a/jjb/infra/jjb-verify.sh b/jjb/infra/jjb-verify.sh
new file mode 100755
index 00000000..2921910b
--- /dev/null
+++ b/jjb/infra/jjb-verify.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+set -o errexit
+set -o nounset
+set -o pipefail
+
+# workaround for https://github.com/pypa/virtualenv/issues/1029
+export PS1=${PS1:-}
+
+cd $WORKSPACE
+echo "Info: Installing OpenStack Jenkins Job Builder (JJB) version $JJB_VERSION from source in venv"
+echo "----------------------------------------------------"
+git clone -q $JJB_GIT_REPO -b $JJB_VERSION > /dev/null 2>&1
+virtualenv .venv -q
+source .venv/bin/activate
+cd jenkins-job-builder && pip install -q -r test-requirements.txt -e .
+echo "Info: Installed JJB"
+jenkins-jobs --version
+echo "----------------------------------------------------"
+echo "Info: Proceeding with verifying job templates"
+echo "----------------------------------------------------"
+cd $WORKSPACE
+jenkins-jobs --conf jjb/global/jenkins_jobs.ini --user $JJB_USERNAME --password $JJB_USERTOKEN \
+	test --recursive jjb/
+echo "----------------------------------------------------"
+echo "Info: Done"
diff --git a/jjb/infra/jjb-verify.yaml b/jjb/infra/jjb-verify.yaml
index 61a0f0ad..41113a99 100644
--- a/jjb/infra/jjb-verify.yaml
+++ b/jjb/infra/jjb-verify.yaml
@@ -39,7 +39,5 @@
           files: 'jjb/**'
 
     builders:
-      - shell: |
-          #!/bin/bash
-
-          echo "Hello World!"
+      - shell:
+          !include-raw-escape: ./jjb-verify.sh
-- 
2.25.1