From 2ecf933833990da51710d5594d6d506266b5bec9 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Thu, 5 Oct 2017 14:18:49 -0500
Subject: [PATCH] Update specs-site and infra-index publication jobs

They were both not fetching the same venv they were building with.

Rather than repeat ourselves, we can update these to share a run
playbook - and can pass tox_envlist from the job rather than needing
playbooks that set that themselves. That also allows fetch-tox-output to
pick it up.

Change-Id: Iefec8c50418dcea00c3adebdc20b71c7f20241bd
---
 playbooks/project-config/run-tox.yaml |  3 +++
 playbooks/specs-site/run.yaml         |  4 ----
 zuul.d/jobs.yaml                      | 13 ++++++-------
 3 files changed, 9 insertions(+), 11 deletions(-)
 create mode 100644 playbooks/project-config/run-tox.yaml
 delete mode 100644 playbooks/specs-site/run.yaml

diff --git a/playbooks/project-config/run-tox.yaml b/playbooks/project-config/run-tox.yaml
new file mode 100644
index 0000000000..22f82096c7
--- /dev/null
+++ b/playbooks/project-config/run-tox.yaml
@@ -0,0 +1,3 @@
+- hosts: all
+  roles:
+    - tox
diff --git a/playbooks/specs-site/run.yaml b/playbooks/specs-site/run.yaml
deleted file mode 100644
index 6a006aa400..0000000000
--- a/playbooks/specs-site/run.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- hosts: all
-  roles:
-    - role: tox
-      tox_envlist: specs
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 13d8fe17c8..0dce04912c 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -167,15 +167,13 @@
       Publish OpenStack specs site to static.openstack.org specs/
     final: True
     pre-run: playbooks/python-docs/pre
-    run: playbooks/specs-site/run
+    run: playbooks/project-config/run-tox
     post-run: playbooks/publish/openstack-specs-site
-    required-projects:
-      - name: openstack/requirements
     roles:
       - zuul: openstack-infra/zuul-jobs
       - zuul: openstack-infra/openstack-zuul-jobs
     vars:
-      tox_constraints_file: "{{ ansible_user_dir }}/src/git.openstack.org/openstack/requirements/upper-constraints.txt"
+      tox_envlist: specs
     secrets:
       - site_logs
 
@@ -237,14 +235,15 @@
       Publish the infrastructure documentation index
     final: True
     pre-run: playbooks/python-docs/pre
-    run: playbooks/docs-infra-index/run
-    post-run:
-      - playbooks/publish/infra-index
+    run: playbooks/project-config/run-tox
+    post-run: playbooks/publish/infra-index
     allowed-projects:
       - openstack-infra/project-config
     roles:
       - zuul: openstack-infra/zuul-jobs
       - zuul: openstack-infra/openstack-zuul-jobs
+    vars:
+      tox_envlist: infra-docs
     secrets:
       - secret: afsdocs_secret
         name: afs