From 05fbd2c2043f3840428ee79b07e6aef62260ca85 Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Wed, 3 Aug 2016 13:51:49 +0000 Subject: [PATCH] Sign all tarballs and wheels Now that the tarball signing job has been proven to work for the bindep 2.0.1 release, use it for all releases and pre-releases that run our {name}-tarball job. This reverts commit 1a2539a225dd4962177f596062ec9c8d794402c1 and part of commit 63b56462bc4354a94e52f8bcf05374c984cc175a. Change-Id: I4e8564df4ec2146e6a13ffc0fc4f582b6f383f9c --- jenkins/jobs/projects.yaml | 10 ++++++-- jenkins/jobs/pypi-jobs.yaml | 1 + jenkins/jobs/python-jobs.yaml | 1 + zuul/layout.yaml | 48 +++++++---------------------------- 4 files changed, 19 insertions(+), 41 deletions(-) diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml index 0c34efbfa9..29ffb725cd 100644 --- a/jenkins/jobs/projects.yaml +++ b/jenkins/jobs/projects.yaml @@ -446,7 +446,6 @@ - 'gate-{name}-python35{suffix}': suffix: '-nv' - pypi-jobs - - '{name}-tarball-signing' - project: name: blazar @@ -456,6 +455,7 @@ - python-db-jobs - gate-{name}-pylint - '{name}-tarball' + - '{name}-tarball-signing' - project: name: blazar-nova @@ -464,6 +464,7 @@ jobs: - python-jobs - '{name}-tarball' + - '{name}-tarball-signing' - project: name: browbeat @@ -1361,6 +1362,7 @@ suffix: '-nv' - openstack-publish-jobs - '{name}-tarball' + - '{name}-tarball-signing' - periodic-python-jobs-with-oslo-master - 'gate-rally-dsvm-cue-{broker}': broker: 'rabbitmq' @@ -1982,6 +1984,7 @@ jobs: - python-jobs - '{name}-tarball' + - '{name}-tarball-signing' - project: name: ec2-api @@ -2085,6 +2088,7 @@ jobs: - openstack-publish-jobs - '{name}-tarball' + - '{name}-tarball-signing' - gate-{name}-docs-{node}: node: - ubuntu-trusty @@ -2634,7 +2638,6 @@ suffix: '-nv' - pypi-jobs - infra-publish-jobs - - '{name}-tarball-signing' - project: name: git-upstream @@ -6612,6 +6615,7 @@ jobs: - python-jobs - '{name}-tarball' + - '{name}-tarball-signing' - 'gate-{name}-releasenotes' - 'gate-packstack-integration-{scenario}-tempest-{ostype}' @@ -8762,6 +8766,7 @@ jobs: - python-jobs - '{name}-tarball' + - '{name}-tarball-signing' - project: name: python-brick-cinderclient-ext @@ -10707,6 +10712,7 @@ - coverage-jobs - python-jobs - '{name}-tarball' + - '{name}-tarball-signing' - gate-{name}-pylint - gate-{name}-tox-{envlist}: envlist: tempauth diff --git a/jenkins/jobs/pypi-jobs.yaml b/jenkins/jobs/pypi-jobs.yaml index 65a944cd68..74082e56c5 100644 --- a/jenkins/jobs/pypi-jobs.yaml +++ b/jenkins/jobs/pypi-jobs.yaml @@ -21,4 +21,5 @@ jobs: - '{name}-pypi-both-upload' - '{name}-tarball' + - '{name}-tarball-signing' - '{name}-announce-release' diff --git a/jenkins/jobs/python-jobs.yaml b/jenkins/jobs/python-jobs.yaml index c2c5b53818..71398ea828 100644 --- a/jenkins/jobs/python-jobs.yaml +++ b/jenkins/jobs/python-jobs.yaml @@ -751,6 +751,7 @@ jobs: - '{name}-announce-release' - '{name}-tarball' + - '{name}-tarball-signing' - job-group: name: coverage-jobs diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 893de83ecc..b4ce4da88e 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -715,9 +715,11 @@ project-templates: - name: publish-to-pypi pre-release: - '{name}-tarball': + - '{name}-tarball-signing' - '{name}-pypi-both-upload' release: - '{name}-tarball': + - '{name}-tarball-signing' - '{name}-pypi-both-upload': - wheel-build-ubuntu-trusty-amd64-python2: - wheel-release-trustyx64 @@ -739,10 +741,12 @@ project-templates: pre-release: - 'xstatic-check-version': - '{name}-tarball': + - '{name}-tarball-signing' - '{name}-pypi-both-upload' release: - 'xstatic-check-version': - '{name}-tarball': + - '{name}-tarball-signing' - '{name}-pypi-both-upload': - wheel-build-ubuntu-trusty-amd64-python2: - wheel-release-trustyx64 @@ -761,9 +765,11 @@ project-templates: # Release OpenStack Server packages. - name: openstack-server-release-jobs pre-release: - - '{name}-tarball' + - '{name}-tarball': + - '{name}-tarball-signing' release: - '{name}-tarball': + - '{name}-tarball-signing' - '{name}-announce-release' - name: release-notes-jobs @@ -3349,6 +3355,7 @@ projects: template: - name: bindep-fallback - name: merge-check + - name: publish-to-pypi - name: pypy-jobs - name: python-jobs - name: python34-jobs @@ -3356,27 +3363,8 @@ projects: post: - bindep-coverage-ubuntu-trusty - bindep-coverage-ubuntu-xenial - pre-release: - - bindep-tarball: - - bindep-pypi-both-upload release: - bindep-infra-docs-tags-only - - bindep-tarball: - - bindep-tarball-signing - - bindep-pypi-both-upload: - - wheel-build-ubuntu-trusty-amd64-python2: - - wheel-release-trustyx64 - - wheel-build-ubuntu-trusty-amd64-python3: - - wheel-release-trustyx64 - - wheel-build-ubuntu-xenial-amd64-python2: - - wheel-release-xenialx64 - - wheel-build-ubuntu-xenial-amd64-python3: - - wheel-release-xenialx64 - - wheel-build-centos-7-amd64-python2: - - wheel-release-cent7x64 - - wheel-build-centos-7-amd64-python3: - - wheel-release-cent7x64 - - bindep-announce-release - name: openstack-infra/bugdaystats template: @@ -3536,29 +3524,11 @@ projects: - name: python-jobs - name: python34-jobs - name: python35-jobs-nv + - name: publish-to-pypi check: - gate-git-review-python34 - pre-release: - - git-review-tarball: - - git-review-pypi-both-upload release: - git-review-infra-docs-tags-only - - git-review-tarball: - - git-review-tarball-signing - - git-review-pypi-both-upload: - - wheel-build-ubuntu-trusty-amd64-python2: - - wheel-release-trustyx64 - - wheel-build-ubuntu-trusty-amd64-python3: - - wheel-release-trustyx64 - - wheel-build-ubuntu-xenial-amd64-python2: - - wheel-release-xenialx64 - - wheel-build-ubuntu-xenial-amd64-python3: - - wheel-release-xenialx64 - - wheel-build-centos-7-amd64-python2: - - wheel-release-cent7x64 - - wheel-build-centos-7-amd64-python3: - - wheel-release-cent7x64 - - git-review-announce-release - name: openstack-infra/gitdm template: