From 42a967ca7f3b4b1c9c528f05046dbba0c0b7c3f5 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Wed, 11 Sep 2019 21:41:26 +0200
Subject: [PATCH] Move security site to AFS publishing

Move from promoting to static.o.o for the security site to
publish via promote to AFS.

Rename existing promote-security jobs to promote-security-static and
add it to ossa repo so
that we publish to both old and new location. The promote-security-static
job can be removed once everything works.

Create new promote-security job for publishing to AFS.

Story: 2006598
Task: 36854
Change-Id: I18404d8fa79566de1bee1ac5760b8a440e885df8
---
 zuul.d/jobs.yaml     | 16 +++++++++++++++-
 zuul.d/projects.yaml |  8 ++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index d7e92c3089..b09b858cda 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -719,16 +719,30 @@
       publish_site: "governance.openstack.org"
 
 - job:
-    name: promote-security
+    name: promote-security-static
     parent: base-promote-tox-docs-static
     description: |
       Promote content to static.openstack.org to /srv/static/security
+
+      This job is added for transition of sites, it will be
+      removed soon.
     final: true
     allowed-projects:
       - openstack/ossa
     vars:
       static_target: security
 
+- job:
+    name: promote-security
+    parent: promote-tox-docs-site-base
+    description: |
+      Promote content to security.openstack.org.
+    final: true
+    allowed-projects:
+      - openstack/ossa
+    vars:
+      publish_site: "security.openstack.org"
+
 - job:
     name: promote-openstack-manuals
     description: |
diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index 8919526f71..b9dc738862 100644
--- a/zuul.d/projects.yaml
+++ b/zuul.d/projects.yaml
@@ -3598,6 +3598,14 @@
     templates:
       - publish-to-pypi
 
+- project:
+    name: openstack/ossa
+    promote:
+      jobs:
+        # TODO(AJaeger): Remove once transition to AFS publishing is
+        # done.
+        - promote-security-static
+
 - project:
     name: openstack/oswin-tempest-plugin
     templates: