From 643c17698255c4d33989ffb5574b4762f8c808ee Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Wed, 3 Oct 2018 11:18:44 -0500
Subject: [PATCH] Add release-zuul-python job that deals with javascript

The zuul releases need to build javascript when making artifacts. We
also don't want to use the openstack project-template for zuul and
nodepool.

Add a new job and remove the release template from project-config. We'll
add release-zuul-python from zuul and nodepool .zuul.yaml files.

Change-Id: Ic999040ce21e867b2c9279cc3a445fba13a2730f
---
 playbooks/zuul-tarball/post.yaml |  7 +++++++
 playbooks/zuul-tarball/pre.yaml  |  6 ++++++
 playbooks/zuul-tarball/run.yaml  |  6 ++++++
 zuul.d/jobs.yaml                 | 15 +++++++++++++++
 zuul.d/projects.yaml             |  4 ----
 5 files changed, 34 insertions(+), 4 deletions(-)
 create mode 100644 playbooks/zuul-tarball/post.yaml
 create mode 100644 playbooks/zuul-tarball/pre.yaml
 create mode 100644 playbooks/zuul-tarball/run.yaml

diff --git a/playbooks/zuul-tarball/post.yaml b/playbooks/zuul-tarball/post.yaml
new file mode 100644
index 0000000000..8c82812d15
--- /dev/null
+++ b/playbooks/zuul-tarball/post.yaml
@@ -0,0 +1,7 @@
+- 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
new file mode 100644
index 0000000000..1cbccc3256
--- /dev/null
+++ b/playbooks/zuul-tarball/pre.yaml
@@ -0,0 +1,6 @@
+- hosts: all
+  roles:
+    - bindep
+    - install-nodejs
+    - install-yarn
+    - revoke-sudo
diff --git a/playbooks/zuul-tarball/run.yaml b/playbooks/zuul-tarball/run.yaml
new file mode 100644
index 0000000000..e3d47ce625
--- /dev/null
+++ b/playbooks/zuul-tarball/run.yaml
@@ -0,0 +1,6 @@
+- hosts: all
+  tasks:
+    - name: Build tarball and wheel
+      command:
+        cmd: python setup.py sdist bdist_wheel
+        chdir: '{{ zuul_work_dir }}'
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 3baf86812b..2f611d00a8 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -234,6 +234,21 @@
       # sdists.
       tox_constraints_file: '{{ ansible_user_dir }}/src/git.openstack.org/openstack/requirements/upper-constraints.txt'
 
+- 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
+
 - job:
     name: release-openstack-python3
     parent: publish-openstack-artifacts
diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index b37a7442f4..ccbea8bf47 100644
--- a/zuul.d/projects.yaml
+++ b/zuul.d/projects.yaml
@@ -483,8 +483,6 @@
 
 - project:
     name: openstack-infra/nodepool
-    templates:
-      - publish-to-pypi
     experimental:
       jobs:
         - nodepool-functional-py35-redhat-src
@@ -1575,8 +1573,6 @@
 
 - project:
     name: openstack-infra/zuul
-    templates:
-      - publish-to-pypi
     experimental:
       jobs:
         - nodepool-zuul-functional