diff options
| -rw-r--r-- | build-gluster-org/jobs/build-job.yml | 4 | ||||
| -rw-r--r-- | build-gluster-org/scripts/build-jobs.sh | 2 | ||||
| -rw-r--r-- | requirements.txt | 2 | ||||
| -rw-r--r-- | tox.ini | 7 |
4 files changed, 9 insertions, 6 deletions
diff --git a/build-gluster-org/jobs/build-job.yml b/build-gluster-org/jobs/build-job.yml index 9e5b5b8..8aac8a6 100644 --- a/build-gluster-org/jobs/build-job.yml +++ b/build-gluster-org/jobs/build-job.yml @@ -54,3 +54,7 @@ wrappers: - timestamps + - credentials-binding: + - file: + credential-id: jenkins_jobs.ini + variable: JJB_CONFIG diff --git a/build-gluster-org/scripts/build-jobs.sh b/build-gluster-org/scripts/build-jobs.sh index 96992d0..0386c8b 100644 --- a/build-gluster-org/scripts/build-jobs.sh +++ b/build-gluster-org/scripts/build-jobs.sh @@ -3,4 +3,4 @@ set -e source /opt/rh/python27/enable || true virtualenv --system-site-packages env env/bin/pip install tox -env/bin/tox jjb +env/bin/tox diff --git a/requirements.txt b/requirements.txt index 6b700dc..78bbf75 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ -jenkins-job-builder +-e git+git://git.openstack.org/openstack-infra/jenkins-job-builder#egg=jenkins_jobs @@ -3,8 +3,7 @@ # test suite on all supported python versions. To use it, "pip install tox" # and then run "tox" from this directory. -[testenv] -deps = -r{toxinidir}/requirements.txt - [testenv:jjb] -commands = jenkins-jobs test {toxinidir}/build-gluster-org/jobs +deps = -r{toxinidir}/requirements.txt +passenv = $JJB_CONFIG +commands = jenkins-jobs --conf {env:JJB_CONFIG:toxinidir/build-gluster.org/jobs/jenkins_jobs.ini} test {toxinidir}/build-gluster-org/jobs |