From: Kefu Chai <kchai@redhat.com>
Date: Fri, 26 Jul 2019 12:39:55 +0000 (+0800)
Subject: ceph-build-pull-requests: ping jjb to 2.10.1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=647f72e2b29943bb37f5f6592b935d5e89c23dba;p=ceph-build.git

ceph-build-pull-requests: ping jjb to 2.10.1

jjb 3.0 brings some incompatible behavior:

* it tries to expand the strings like ${FOO} using the parameters,
  so if we continue using include-raw, jjb test will fail like

```
Failure formatting job
....
ERROR:root:Failure formatting job '{
with itself
Traceback (most recent call last):
...
  File
"/tmp/venv.Pa7CUfDCFK/local/lib/python2.7/site-packages/jenkins_jobs/formatter.py",
line 43, in deep_format
    raise JenkinsJobsException(desc)
jenkins_jobs.errors.JenkinsJobsException:
...
...
TEMPVENV=$(mktemp -td venv.XXXXXXXXXX)
```
* also, it fails to pass down some parameters to the build job, for
  instance, the `WORKSPACE` is not passed anymore.

both these change break the "test" job, as we are using `include-raw`
everywhere, and we also use `${WORKSAPCE}` in some yml files.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/ceph-build-pull-requests/build/build b/ceph-build-pull-requests/build/build
index 45454f87..fd3ec8ed 100644
--- a/ceph-build-pull-requests/build/build
+++ b/ceph-build-pull-requests/build/build
@@ -5,7 +5,7 @@ set -e
 # the following two methods exist in scripts/build_utils.sh
 # must pin urllib3 to 1.22 because 1.23 is incompatible with requests, which
 # is used by jenkins-job-builder
-pkgs=( "ansible" "jenkins-job-builder" "urllib3==1.22" "pyopenssl" "ndg-httpsclient" "pyasn1" )
+pkgs=( "ansible" "jenkins-job-builder==2.10.1" "urllib3==1.22" "pyopenssl" "ndg-httpsclient" "pyasn1" )
 install_python_packages "pkgs[@]"