From 7b3e266c2f53a6e928dfd2ada9af3df1f67e489c Mon Sep 17 00:00:00 2001
From: Alex Gaynor <alex.gaynor@gmail.com>
Date: Sat, 19 Dec 2020 13:42:37 -0500
Subject: [PATCH] Move more stuff to pre-run for resillience (#5658)

---
 .zuul.d/jobs.yaml                             |  2 +-
 .../playbooks/clone-wycheproof/main.yaml      |  7 ----
 .zuul.playbooks/playbooks/tox/main.yaml       | 27 ---------------
 .zuul.playbooks/playbooks/tox/pre.yaml        | 34 +++++++++++++++++++
 4 files changed, 35 insertions(+), 35 deletions(-)
 delete mode 100644 .zuul.playbooks/playbooks/clone-wycheproof/main.yaml
 create mode 100644 .zuul.playbooks/playbooks/tox/pre.yaml

diff --git a/.zuul.d/jobs.yaml b/.zuul.d/jobs.yaml
index 62f302ae8..9d1b2b9f5 100644
--- a/.zuul.d/jobs.yaml
+++ b/.zuul.d/jobs.yaml
@@ -2,7 +2,7 @@
     name: pyca-cryptography-base
     abstract: true
     description: Run pyca/cryptography unit testing
-    pre-run: .zuul.playbooks/playbooks/clone-wycheproof/main.yaml
+    pre-run: .zuul.playbooks/playbooks/tox/pre.yaml
     run: .zuul.playbooks/playbooks/tox/main.yaml
 
 - job:
diff --git a/.zuul.playbooks/playbooks/clone-wycheproof/main.yaml b/.zuul.playbooks/playbooks/clone-wycheproof/main.yaml
deleted file mode 100644
index 6f8ffb031..000000000
--- a/.zuul.playbooks/playbooks/clone-wycheproof/main.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-- hosts: all
-  tasks:
-    - name: Clone wycheproof
-      git:
-        repo: https://github.com/google/wycheproof
-        dest: "{{ ansible_facts.env['HOME'] }}/wycheproof"
-        depth: 1
diff --git a/.zuul.playbooks/playbooks/tox/main.yaml b/.zuul.playbooks/playbooks/tox/main.yaml
index 9ad2a78d0..6243215bc 100644
--- a/.zuul.playbooks/playbooks/tox/main.yaml
+++ b/.zuul.playbooks/playbooks/tox/main.yaml
@@ -1,32 +1,5 @@
 - hosts: all
   tasks:
-
-    - name: Install tox
-      include_role:
-        name: ensure-tox
-
-    - name: Install required packages
-      package:
-        name:
-          - build-essential
-          - libssl-dev
-          - libffi-dev
-          - python3-dev
-      become: yes
-      when: ansible_distribution in ['Debian', 'Ubuntu']
-
-    - name: Install required packages
-      package:
-        name:
-          - redhat-rpm-config
-          - gcc
-          - libffi-devel
-          - openssl-devel
-          - python3-devel
-          - python2-devel
-      become: yes
-      when: ansible_distribution == 'CentOS'
-
     - name: Run tox
       include_role:
         name: tox
diff --git a/.zuul.playbooks/playbooks/tox/pre.yaml b/.zuul.playbooks/playbooks/tox/pre.yaml
new file mode 100644
index 000000000..b656f327c
--- /dev/null
+++ b/.zuul.playbooks/playbooks/tox/pre.yaml
@@ -0,0 +1,34 @@
+- hosts: all
+  tasks:
+    - name: Clone wycheproof
+      git:
+        repo: https://github.com/google/wycheproof
+        dest: "{{ ansible_facts.env['HOME'] }}/wycheproof"
+        depth: 1
+
+    - name: Install tox
+      include_role:
+        name: ensure-tox
+
+    - name: Install required packages
+      package:
+        name:
+          - build-essential
+          - libssl-dev
+          - libffi-dev
+          - python3-dev
+      become: yes
+      when: ansible_distribution in ['Debian', 'Ubuntu']
+
+    - name: Install required packages
+      package:
+        name:
+          - redhat-rpm-config
+          - gcc
+          - libffi-devel
+          - openssl-devel
+          - python3-devel
+          - python2-devel
+      become: yes
+      when: ansible_distribution == 'CentOS'
+