From 7a853c2cbb48d79543733a73bc937156974b3bea Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Sun, 29 Sep 2019 16:57:09 +0200
Subject: [PATCH] Cleanup publish-openstack-releasenotes jobs

Remove publish-openstack-releasenotes job, it's not used.

Now we don't need publish-openstack-releasenotes-base anymore, so merge
publish-openstack-releasenotes-python3 and it's parent.

Depends-On: https://review.opendev.org/685598
Depends-On: https://review.opendev.org/685599
Depends-On: https://review.opendev.org/685600
Change-Id: I46d724c2a2aa63902022101686e6972cbd01e76c
---
 zuul.d/jobs.yaml | 38 ++++++--------------------------------
 1 file changed, 6 insertions(+), 32 deletions(-)

diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 14349d4f11..da6a1f1de2 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -288,16 +288,16 @@
       special_publish_directory: "contributors"
 
 - job:
-    name: publish-openstack-releasenotes-base
+    name: publish-openstack-releasenotes-python3
     description: |
-      Abstract base job to publish the results of build-openstack-releasenotes to
+      Publish the results of build-openstack-releasenotes to
       /afs/.openstack.org/docs/releasenotes/{{ zuul.project.short_name }}
-    # This job is protected-abstract because it sets the afs_subpath
+      Uses python3.
+    # This job is final because its sets the afs_subpath
     # variable; it is not safe to let that be overridden in an
     # untrusted job because it would allow writing outside of the
     # project's directory on the production doc site.
-    protected: true
-    abstract: true
+    final: true
     pre-run: playbooks/releasenotes/pre.yaml
     run: playbooks/releasenotes/run.yaml
     post-run:
@@ -312,6 +312,7 @@
       - zuul: openstack/openstack-zuul-jobs
       - zuul: zuul/zuul-jobs
     vars:
+      sphinx_python: python3
       afs_subpath: "/releasenotes/{{ zuul.project.short_name }}"
       constraints_file: '{{ ansible_user_dir }}/src/opendev.org/openstack/requirements/upper-constraints.txt'
       sphinx_build_dir: releasenotes/build
@@ -342,33 +343,6 @@
       - test-requirements.txt
       - tox.ini
 
-- job:
-    name: publish-openstack-releasenotes
-    parent: publish-openstack-releasenotes-base
-    description: |
-      Publish the results of build-openstack-releasenotes to
-      /afs/.openstack.org/docs/releasenotes/{{ zuul.project.short_name }}
-    # This job is final because its parent sets the afs_subpath
-    # variable; it is not safe to let that be overridden in an
-    # untrusted job because it would allow writing outside of the
-    # project's directory on the production doc site.
-    final: true
-
-- job:
-    name: publish-openstack-releasenotes-python3
-    parent: publish-openstack-releasenotes-base
-    description: |
-      Publish the results of build-openstack-releasenotes to
-      /afs/.openstack.org/docs/releasenotes/{{ zuul.project.short_name }}
-      Uses python3.
-    # This job is final because its parent sets the afs_subpath
-    # variable; it is not safe to let that be overridden in an
-    # untrusted job because it would allow writing outside of the
-    # project's directory on the production doc site.
-    final: true
-    vars:
-      sphinx_python: python3
-
 - job:
     name: promote-openstack-specs-base
     parent: opendev-promote-docs-base