From 15e763dc6a949c31ef993b7e751b83ea3064a8be Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Mon, 2 Mar 2020 13:26:02 +0100
Subject: [PATCH] Move stackviz publish in-tree

The new job publish-openstack-stackviz-element is working now,
move the trigger in-tree and change the publish location, we do not need
the "-new" in the name anymore.

Content is published at:
https://tarballs.opendev.org/openstack/stackviz/dist/
The tarballs are equal, only difference is filenames of sources.

Mark the job to run only on master, since it publishes always to the
same location and each invocation overrides the file. This is a
safety measure.

Depends-On: https://review.opendev.org/710754
Change-Id: If9488d7c60b58f51a7a0a4bdf0740d16f61c241e
---
 playbooks/javascript/post-stackviz.yaml | 3 +--
 zuul.d/jobs.yaml                        | 2 ++
 zuul.d/projects.yaml                    | 7 -------
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/playbooks/javascript/post-stackviz.yaml b/playbooks/javascript/post-stackviz.yaml
index 130dccf1f2..9c6c58d5fe 100644
--- a/playbooks/javascript/post-stackviz.yaml
+++ b/playbooks/javascript/post-stackviz.yaml
@@ -2,10 +2,9 @@
   tasks:
 
     - name: Rename tarball and move it to a subdir named dist as well
-      # TODO(AJaeger): "-new" is for testing
       shell: |
         mkdir dist
-        mv {{ zuul.project.short_name }}*.tar.gz dist/{{ zuul.project.short_name }}-latest-new.tar.gz
+        mv {{ zuul.project.short_name }}*.tar.gz dist/{{ zuul.project.short_name }}-latest.tar.gz
       args:
         executable: /bin/bash
         chdir: "{{ zuul.project.src_dir }}/dist"
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index e2e4722ba2..654c7efaf5 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -806,6 +806,8 @@
     pre-run: playbooks/javascript/pre.yaml
     run: playbooks/javascript/content.yaml
     post-run: playbooks/javascript/post-stackviz.yaml
+    branches:
+      - master
     vars:
       node_version: 8
       npm_command: prod
diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index 838515d5ae..b4e995e2b7 100644
--- a/zuul.d/projects.yaml
+++ b/zuul.d/projects.yaml
@@ -4076,13 +4076,6 @@
     templates:
       - publish-to-pypi
 
-- project:
-    name: openstack/stackviz
-    periodic:
-      jobs:
-        - publish-openstack-stackviz-element:
-            branches: master
-
 - project:
     name: openstack/stevedore
     templates: