From 7683c985ccf8b12c63f8242307c38471fc3b61fb Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Mon, 3 Feb 2020 12:21:10 +1100
Subject: [PATCH] Remove publish-zuul-python-branch-tarball and
 release-zuul-python

I believe both these jobs are redundant and handled by artifact driven
jobs from Zuul now.

Change-Id: I310f07205ac31f8b99a7a3b80b9460162d92a0c9
---
 playbooks/zuul-tarball/post.yaml |  7 -------
 playbooks/zuul-tarball/pre.yaml  |  7 -------
 playbooks/zuul-tarball/run.yaml  |  6 ------
 zuul.d/jobs.yaml                 | 28 ----------------------------
 4 files changed, 48 deletions(-)
 delete mode 100644 playbooks/zuul-tarball/post.yaml
 delete mode 100644 playbooks/zuul-tarball/pre.yaml
 delete mode 100644 playbooks/zuul-tarball/run.yaml

diff --git a/playbooks/zuul-tarball/post.yaml b/playbooks/zuul-tarball/post.yaml
deleted file mode 100644
index 8c82812d15..0000000000
--- a/playbooks/zuul-tarball/post.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-- hosts: all
-  roles:
-    - fetch-python-sdist-output
-
-- hosts: localhost
-  roles:
-    - sign-artifacts
diff --git a/playbooks/zuul-tarball/pre.yaml b/playbooks/zuul-tarball/pre.yaml
deleted file mode 100644
index 7e8a28dc12..0000000000
--- a/playbooks/zuul-tarball/pre.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-- hosts: all
-  roles:
-    - bindep
-    - install-nodejs
-    - role: install-yarn
-      yarn_lock_file_path: "{{ zuul.project.src_dir }}/web/yarn.lock"
-    - revoke-sudo
diff --git a/playbooks/zuul-tarball/run.yaml b/playbooks/zuul-tarball/run.yaml
deleted file mode 100644
index 6aadbb39e1..0000000000
--- a/playbooks/zuul-tarball/run.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-- hosts: all
-  tasks:
-    - name: Build tarball and wheel
-      command:
-        cmd: python3 setup.py sdist bdist_wheel
-        chdir: "{{ zuul.project.src_dir }}"
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 9846b622fb..1fc9f425d8 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -140,34 +140,6 @@
       - setup.py
       - README.rst
 
-- job:
-    name: publish-zuul-python-branch-tarball
-    parent: publish-openstack-artifacts
-    description: |
-      Publish the results of the tox-tarball job to tarballs.openstack.org.
-    pre-run: playbooks/zuul-tarball/pre.yaml
-    run: playbooks/zuul-tarball/run.yaml
-    post-run: playbooks/python-branch-tarball/post.yaml
-    vars:
-      node_version: 10
-
-- job:
-    name: release-zuul-python
-    parent: publish-openstack-artifacts
-    description: |
-      Release python tarballs / wheels to pypi for zuul projects.
-    pre-run: playbooks/zuul-tarball/pre.yaml
-    run: playbooks/zuul-tarball/run.yaml
-    post-run:
-      - playbooks/zuul-tarball/post.yaml
-      - playbooks/publish/pypi.yaml
-    secrets:
-      - secret: pypi_secret
-        name: pypi_info
-      - gpg_key
-    vars:
-      node_version: 10
-
 - job:
     name: publish-openstack-sphinx-docs-base
     nodeset: ubuntu-xenial