summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrevor Bramwell <tbramwell@linuxfoundation.org>2017-09-11 14:12:34 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-09-11 14:12:34 +0000
commit23bd33c54e69205afb5349aee9ee310f2f66ed6c (patch)
treeef66b991b75152e7793319dcd60ac53246b3fb7e
parente19f03540368a5d3f78e6a2d856a91cf52892414 (diff)
parent7b9736eba9b56ffba4bdb302ba6767f68de6df2f (diff)
Merge "Fix Expermental JJB Job Diff Commenting"
-rwxr-xr-xjjb/releng/generate-job-list.sh8
-rw-r--r--jjb/releng/releng-ci-jobs.yml8
2 files changed, 5 insertions, 11 deletions
diff --git a/jjb/releng/generate-job-list.sh b/jjb/releng/generate-job-list.sh
index 0e35eaad4..583cbb126 100755
--- a/jjb/releng/generate-job-list.sh
+++ b/jjb/releng/generate-job-list.sh
@@ -9,7 +9,6 @@
##############################################################################
set -o errexit
-set -o nounset
set -o pipefail
# Job Number Formatter
@@ -22,8 +21,11 @@ function JOBS {
fi
}
-# We expect job_output to exist prior to this being run and contain the
-# output from jenkins-jobs test
+# Activiate the virtualenv so we have access to 'jenkins-jobs'
+source /opt/virtualenv/jenkins-job-builder/bin/activate
+
+echo "> Generating list of current JJB jobs..."
+jenkins-jobs -l ERROR test -r jjb -o job_output
echo "> Generating list of previous JJB jobs..."
git checkout -q -b previous-commit HEAD^
diff --git a/jjb/releng/releng-ci-jobs.yml b/jjb/releng/releng-ci-jobs.yml
index 42d88fb7a..fd58ef2b8 100644
--- a/jjb/releng/releng-ci-jobs.yml
+++ b/jjb/releng/releng-ci-jobs.yml
@@ -72,14 +72,6 @@
files: 'jjb/**'
builders:
- - copyartifact:
- project: releng-merge-jjb
- filter: "job_output/*"
- which-build: last-successful
- stable: true
- optional: false
- flatten: false
- do-not-fingerprint: true
- shell:
!include-raw-escape: generate-job-list.sh
- report-build-result-to-gerrit