From 39c6263eacc283c79fae382bedec87b642801f94 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Sat, 21 Oct 2017 14:03:22 +0200
Subject: [PATCH] Stop using tox to build python tarballs

The PTI for Python has been updated to no longer specify using tox to
build tarballs. Remove the bindep and tox steps in
publish-openstack-python-tarball.

Remove build-openstack-python-tarball - it was not being used anywhere.

Depends-On: Icfad9ad6ba5c7a0c62a8d5ce243952b81f28a47f
Change-Id: Ic46d077428bc77fb481bd63ae766d00c4bdae0c2
---
 playbooks/python-tarball/pre.yaml | 7 -------
 playbooks/python-tarball/run.yaml | 5 +----
 zuul.d/jobs.yaml                  | 8 --------
 3 files changed, 1 insertion(+), 19 deletions(-)
 delete mode 100644 playbooks/python-tarball/pre.yaml

diff --git a/playbooks/python-tarball/pre.yaml b/playbooks/python-tarball/pre.yaml
deleted file mode 100644
index 6e971267..00000000
--- a/playbooks/python-tarball/pre.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-- hosts: all
-  roles:
-    - role: bindep
-      bindep_profile: test
-      bindep_dir: "src/{{ zuul.project.canonical_name }}"
-    - revoke-sudo
-    - ensure-tox
diff --git a/playbooks/python-tarball/run.yaml b/playbooks/python-tarball/run.yaml
index 0f3fcfb8..3ea4aef6 100644
--- a/playbooks/python-tarball/run.yaml
+++ b/playbooks/python-tarball/run.yaml
@@ -1,6 +1,3 @@
 - hosts: all
   roles:
-    - role: tox
-      tox_extra_args: -vv python setup.py sdist
-    - role: tox
-      tox_extra_args: -vv python setup.py bdist_wheel
+    - build-python-release
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index cf43d8b0..98d3e571 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -414,17 +414,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
     post-run: playbooks/python-tarball/post.yaml
 
-- job:
-    name: build-openstack-python-tarball
-    parent: python-sdist
-    description: |
-      Build a tarball using tox but do not upload it anywhere.
-    pre-run: playbooks/python-tarball/pre.yaml
-    run: playbooks/python-tarball/run.yaml
 
 - job:
     name: publish-openstack-javascript-tarball