From 42dc2ac8487bcb7bf7b47e57b60c2f9f4ad55d1f Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Thu, 9 Aug 2012 14:45:15 -0700 Subject: [PATCH] Change the name of the pypi tarball job. The pypi_jobs template defines a -tarball job which is different than the -tarball job in python_jobs template. That's confusing, and not supported by the version of job-builder in development. This changes the name of that job, updates the zuul layout, and removes the "upload" from the sdist command in the tarball job, which wasn't working anyway (and isn't wanted). This alse enables the reddwarf jobs, which are configured in zuul. Also, there's a hackish change to test.sh and the test output to write out xml files in a way that's compatible with the version of job-builder in development, so that they may be directly compared. The new version will not implement that in quite such a hackish way. Change-Id: Ice3f03b41e44e2979942f516febd059f4ab4cefa Reviewed-on: https://review.openstack.org/11108 Reviewed-by: Monty Taylor Approved: James E. Blair Tested-by: Jenkins --- modules/jenkins_jobs/files/jenkins_jobs.py | 4 +++- .../files/projects/openstack/gerritbot.yml | 4 ++-- .../files/projects/openstack/reddwarf.yml | 2 +- .../jenkins_jobs/files/templates/pypi_jobs.yml | 4 ++-- modules/jenkins_jobs/files/test.sh | 2 +- .../openstack_project/files/zuul/layout.yaml | 18 +++++++++--------- 6 files changed, 18 insertions(+), 16 deletions(-) diff --git a/modules/jenkins_jobs/files/jenkins_jobs.py b/modules/jenkins_jobs/files/jenkins_jobs.py index 92bce197af..1cdd90551a 100644 --- a/modules/jenkins_jobs/files/jenkins_jobs.py +++ b/modules/jenkins_jobs/files/jenkins_jobs.py @@ -257,7 +257,9 @@ def update_job(test = False): xml = yparse.get_next_xml() job = yparse.get_name() if test: - print xml.output() + f = open('/tmp/jenkins_jobs_test/saved/%s' % job, + 'w') + f.write(xml.output()) continue md5 = xml.md5() if remote_jenkins.is_job(job) and not cache.is_cached(job): diff --git a/modules/jenkins_jobs/files/projects/openstack/gerritbot.yml b/modules/jenkins_jobs/files/projects/openstack/gerritbot.yml index 222704563d..8d8ad93bf9 100644 --- a/modules/jenkins_jobs/files/projects/openstack/gerritbot.yml +++ b/modules/jenkins_jobs/files/projects/openstack/gerritbot.yml @@ -96,7 +96,7 @@ assignednode: --- # tarball main: - name: 'gerritbot-tarball' + name: 'gerritbot-sdist-tarball' review_site: 'review.openstack.org' github_org: 'openstack-ci' project: 'gerritbot' @@ -120,7 +120,7 @@ builders: BRANCH=$GERRIT_REFNAME BRANCH_PATH=`echo $BRANCH | tr / -` - tox -v -evenv python setup.py sdist upload + tox -v -evenv python setup.py sdist cp dist/* dist/gerritbot-$BRANCH_PATH.tar.gz post_build_actions: diff --git a/modules/jenkins_jobs/files/projects/openstack/reddwarf.yml b/modules/jenkins_jobs/files/projects/openstack/reddwarf.yml index 140ddf28ad..e9a650957a 100644 --- a/modules/jenkins_jobs/files/projects/openstack/reddwarf.yml +++ b/modules/jenkins_jobs/files/projects/openstack/reddwarf.yml @@ -3,7 +3,7 @@ project: values: name: 'reddwarf' - disabled: 'true' + disabled: 'false' github_org: 'stackforge' review_site: 'review.openstack.org' node: 'oneiric' diff --git a/modules/jenkins_jobs/files/templates/pypi_jobs.yml b/modules/jenkins_jobs/files/templates/pypi_jobs.yml index d2052d1694..7d3f953e49 100644 --- a/modules/jenkins_jobs/files/templates/pypi_jobs.yml +++ b/modules/jenkins_jobs/files/templates/pypi_jobs.yml @@ -42,7 +42,7 @@ assignednode: --- # tarball main: - name: '@NAME@-tarball' + name: '@NAME@-sdist-tarball' review_site: '@REVIEW_SITE@' github_org: '@GITHUB_ORG@' project: '@NAME@' @@ -69,7 +69,7 @@ builders: BRANCH=$GERRIT_REFNAME BRANCH_PATH=`echo $BRANCH | tr / -` - tox -v -evenv python setup.py sdist upload + tox -v -evenv python setup.py sdist cp dist/* dist/@NAME@-$BRANCH_PATH.tar.gz post_build_actions: diff --git a/modules/jenkins_jobs/files/test.sh b/modules/jenkins_jobs/files/test.sh index ce2bcb5d07..9489b61c11 100755 --- a/modules/jenkins_jobs/files/test.sh +++ b/modules/jenkins_jobs/files/test.sh @@ -13,7 +13,7 @@ then do echo $x BASENAME=`basename $x` - python jenkins_jobs.py test $x > /tmp/jenkins_jobs_test/saved/$BASENAME.xml + python jenkins_jobs.py test $x #> /tmp/jenkins_jobs_test/saved/$BASENAME.xml done else for x in `find projects/ -name *.yml` diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml index 98dd865029..310c8523e0 100644 --- a/modules/openstack_project/files/zuul/layout.yaml +++ b/modules/openstack_project/files/zuul/layout.yaml @@ -107,7 +107,7 @@ projects: - gate-gerritbot-pep8 - gate-gerritbot-pyflakes post: - - gerritbot-tarball + - gerritbot-sdist-tarball publish: - gerritbot-pypi @@ -323,7 +323,7 @@ projects: - gate-python-cinderclient-python26 - gate-python-cinderclient-python27 post: - - python-cinderclient-tarball + - python-cinderclient-sdist-tarball - python-cinderclient-coverage - python-cinderclient-docs publish: @@ -346,7 +346,7 @@ projects: - gate-python-glanceclient-python27 - gate-tempest-devstack-vm post: - - python-glanceclient-tarball + - python-glanceclient-sdist-tarball - python-glanceclient-coverage - python-glanceclient-docs publish: @@ -369,7 +369,7 @@ projects: - gate-python-keystoneclient-python27 - gate-tempest-devstack-vm post: - - python-keystoneclient-tarball + - python-keystoneclient-sdist-tarball - python-keystoneclient-coverage - python-keystoneclient-docs publish: @@ -392,7 +392,7 @@ projects: - gate-python-novaclient-python27 - gate-tempest-devstack-vm post: - - python-novaclient-tarball + - python-novaclient-sdist-tarball - python-novaclient-coverage - python-novaclient-docs publish: @@ -413,7 +413,7 @@ projects: - gate-python-openstackclient-python26 - gate-python-openstackclient-python27 post: - - python-openstackclient-tarball + - python-openstackclient-sdist-tarball - python-openstackclient-coverage - python-openstackclient-docs publish: @@ -436,7 +436,7 @@ projects: - gate-python-quantumclient-python27 - gate-tempest-devstack-vm post: - - python-quantumclient-tarball + - python-quantumclient-sdist-tarball - python-quantumclient-coverage - python-quantumclient-docs publish: @@ -457,7 +457,7 @@ projects: - gate-python-swiftclient-python26 - gate-python-swiftclient-python27 post: - - python-swiftclient-tarball + - python-swiftclient-sdist-tarball - python-swiftclient-coverage - python-swiftclient-docs publish: @@ -500,7 +500,7 @@ projects: - gate-pbr-python26 - gate-pbr-python27 post: - - pbr-tarball + - pbr-sdist-tarball - pbr-coverage - pbr-docs publish: