Remove usage of tox -e venv from release job
The newer pti-python-tarball playbooks do not use tox -e venv anymore but call python setup.py directly. We can use these for all release and tarball jobs and simplify them. This allows to remove installing extra required projects or setting up a constraints file. Remove now unused playbooks. Change-Id: Ia1bc5d7715d4b8117d1d99c3415e5af88d902ced
This commit is contained in:
parent
3fd4b4bab2
commit
dcfe5da396
|
@ -1,8 +0,0 @@
|
|||
- hosts: all
|
||||
roles:
|
||||
- fetch-tox-output
|
||||
- fetch-python-sdist-output
|
||||
|
||||
- hosts: localhost
|
||||
roles:
|
||||
- sign-artifacts
|
|
@ -1,22 +0,0 @@
|
|||
- hosts: all
|
||||
roles:
|
||||
- bindep
|
||||
- ensure-tox
|
||||
- revoke-sudo
|
||||
tasks:
|
||||
- name: Checkout requirements branch for tag
|
||||
shell:
|
||||
cmd: |
|
||||
set -x
|
||||
# See if the tag appears on a stable branch
|
||||
TARGET_BRANCH=`git -C \
|
||||
{{ ansible_user_dir }}/{{ zuul.project.src_dir }} branch -a \
|
||||
--contains {{ zuul.ref }} | grep ' stable/' | sort | head -n1`
|
||||
# And if it does, then try to check out the same branch of the
|
||||
# requirements repo, but if that does not exist then we leave it
|
||||
# as we found it
|
||||
if [ -n "$TARGET_BRANCH" ]; then
|
||||
git checkout $TARGET_BRANCH || true
|
||||
fi
|
||||
executable: /bin/bash
|
||||
chdir: "{{ zuul.projects['git.openstack.org/openstack/requirements'].src_dir }}"
|
|
@ -1,6 +0,0 @@
|
|||
- hosts: all
|
||||
roles:
|
||||
- role: tox
|
||||
tox_extra_args: -vv python setup.py sdist
|
||||
- role: tox
|
||||
tox_extra_args: -vv python setup.py bdist_wheel
|
|
@ -182,57 +182,29 @@
|
|||
description: |
|
||||
Sign and release python tarballs to tarballs.openstack.org, but
|
||||
do not upload to PyPI.
|
||||
pre-run: playbooks/python-tarball/pre.yaml
|
||||
run: playbooks/python-tarball/run.yaml
|
||||
pre-run: playbooks/pti-python-tarball/pre.yaml
|
||||
run: playbooks/pti-python-tarball/run.yaml
|
||||
post-run:
|
||||
- playbooks/python-tarball/post.yaml
|
||||
- playbooks/pti-python-tarball/post.yaml
|
||||
required-projects:
|
||||
- name: openstack/requirements
|
||||
secrets:
|
||||
- gpg_key
|
||||
vars:
|
||||
# NOTE(dhellmann): Library projects using a custom installation
|
||||
# script need to be told where the constraints file is. We can
|
||||
# remove this when tox is no longer part of the CTI for building
|
||||
# sdists.
|
||||
tox_constraints_file: '{{ ansible_user_dir }}/src/git.openstack.org/openstack/requirements/upper-constraints.txt'
|
||||
|
||||
- job:
|
||||
name: release-openstack-python
|
||||
parent: publish-openstack-artifacts
|
||||
description: |
|
||||
Release python tarballs / wheels to pypi.
|
||||
pre-run: playbooks/python-tarball/pre.yaml
|
||||
run: playbooks/python-tarball/run.yaml
|
||||
pre-run: playbooks/pti-python-tarball/pre.yaml
|
||||
run: playbooks/pti-python-tarball/run.yaml
|
||||
post-run:
|
||||
- playbooks/python-tarball/post.yaml
|
||||
- playbooks/pti-python-tarball/post.yaml
|
||||
- playbooks/publish/pypi.yaml
|
||||
required-projects:
|
||||
# NOTE(dhellmann): Several projects that depend on neutron or
|
||||
# horizon for their testing use a special install script run via
|
||||
# tox that tries to use zuul-cloner to make the dependency
|
||||
# available before installing it from source. All libraries
|
||||
# require openstack/requirements for the custom install scripts
|
||||
# they run via tox. Until we change the PTI for building sdists
|
||||
# and wheels from Python projects so that it does not use tox,
|
||||
# we need to ensure those repos are present for zuul-cloner to
|
||||
# copy. The openstack/neutron, openstack/horizon, and
|
||||
# openstack/requirements repos can be removed from the list of
|
||||
# required-projects for this job when the job is modified to not
|
||||
# use tox.
|
||||
- name: openstack/neutron
|
||||
- name: openstack/horizon
|
||||
- name: openstack/requirements
|
||||
secrets:
|
||||
- secret: pypi_secret
|
||||
name: pypi_info
|
||||
- gpg_key
|
||||
vars:
|
||||
# NOTE(dhellmann): Library projects using a custom installation
|
||||
# script need to be told where the constraints file is. We can
|
||||
# remove this when tox is no longer part of the CTI for building
|
||||
# sdists.
|
||||
tox_constraints_file: '{{ ansible_user_dir }}/src/git.openstack.org/openstack/requirements/upper-constraints.txt'
|
||||
|
||||
- job:
|
||||
name: release-zuul-python
|
||||
|
@ -627,14 +599,9 @@
|
|||
parent: publish-openstack-artifacts
|
||||
description: |
|
||||
Publish the results of the tox-tarball job to tarballs.openstack.org.
|
||||
pre-run: playbooks/python-tarball/pre.yaml
|
||||
run: playbooks/python-tarball/run.yaml
|
||||
pre-run: playbooks/pti-python-tarball/pre.yaml
|
||||
run: playbooks/pti-python-tarball/run.yaml
|
||||
post-run: playbooks/python-branch-tarball/post.yaml
|
||||
required-projects:
|
||||
# See job release-openstack-python for details
|
||||
- name: openstack/neutron
|
||||
- name: openstack/horizon
|
||||
- name: openstack/requirements
|
||||
|
||||
- job:
|
||||
name: publish-irc-meetings
|
||||
|
|
Loading…
Reference in New Issue