diff options
author | william.soula <william.soula@drillinginfo.com> | 2012-11-27 10:23:10 -0600 |
---|---|---|
committer | Jenkins <jenkins@review.openstack.org> | 2012-12-19 03:18:32 +0000 |
commit | eb210845e43bd8a788f4f604721d23b4722c3032 (patch) | |
tree | 03cb220bff521e51c37a9cc54d36d21f8fd58768 /tools | |
parent | 899ab4a98070ba9e4c0a8e891e9d73fd6e05437d (diff) | |
download | python-jenkins-job-builder-eb210845e43bd8a788f4f604721d23b4722c3032.tar.gz python-jenkins-job-builder-eb210845e43bd8a788f4f604721d23b4722c3032.tar.xz python-jenkins-job-builder-eb210845e43bd8a788f4f604721d23b4722c3032.zip |
Adding ability to specify the JDK to use. This change moves the top level config from builder.py into a separate file called general.py. This change also moves the assigned node work as well as the log rotator work into the general.py file. This change also adds the ability to specify the JDK for the build to use.
Change-Id: I0e2b43d889593e01d6ad0761960c93472990af1e
Reviewed-on: https://review.openstack.org/16983
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Reviewed-by: James E. Blair <corvus@inaugust.com>
Approved: Jeremy Stanley <fungi@yuggoth.org>
Reviewed-by: Jeremy Stanley <fungi@yuggoth.org>
Tested-by: Jenkins
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/run-compare-xml.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/run-compare-xml.sh b/tools/run-compare-xml.sh index d1eee667..7124b185 100755 --- a/tools/run-compare-xml.sh +++ b/tools/run-compare-xml.sh @@ -22,9 +22,9 @@ mkdir -p .test/old/out mkdir -p .test/new/config mkdir -p .test/new/out cd .test -git clone https://review.openstack.org/p/openstack/openstack-ci-puppet --depth 1 -cp openstack-ci-puppet/modules/openstack_project/files/jenkins_job_builder/config/* old/config -cp openstack-ci-puppet/modules/openstack_project/files/jenkins_job_builder/config/* new/config +git clone https://review.openstack.org/p/openstack-infra/config --depth 1 +cp config/modules/openstack_project/files/jenkins_job_builder/config/* old/config +cp config/modules/openstack_project/files/jenkins_job_builder/config/* new/config cd .. GITHEAD=`git rev-parse HEAD` |