From 21d87e32337db9bc324ff6b36e172e51f19d105a Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Mon, 11 Mar 2019 19:49:23 +0000
Subject: [PATCH] Reset base-test playbooks to match base

No current testing seems to be underway, so get the base-test job
working again in support of validating the default nodeset switch to
ubuntu-bionic.

Change-Id: Ic405efb369f1903624fbdd83fc60c2d4db01406a
---
 playbooks/base-test/post-logs.yaml | 4 +++-
 playbooks/base-test/pre.yaml       | 7 +------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/playbooks/base-test/post-logs.yaml b/playbooks/base-test/post-logs.yaml
index ad044d7..b959b58 100644
--- a/playbooks/base-test/post-logs.yaml
+++ b/playbooks/base-test/post-logs.yaml
@@ -7,7 +7,7 @@
 - hosts: "{{ site_logs.fqdn }}"
   gather_facts: False
   roles:
-    - role: test-upload-logs
+    - role: upload-logs
       zuul_log_url: "http://logs.openstack.org"
 
 - hosts: localhost
@@ -15,5 +15,7 @@
   # successful jobs.
   ignore_errors: yes
   roles:
+    # TODO do we want to assume subunit on opendev or should this move
+    # into tenant config
     - submit-logstash-jobs
     - submit-subunit-jobs
diff --git a/playbooks/base-test/pre.yaml b/playbooks/base-test/pre.yaml
index c14dd19..3ec1a34 100644
--- a/playbooks/base-test/pre.yaml
+++ b/playbooks/base-test/pre.yaml
@@ -31,15 +31,10 @@
   roles:
     - validate-host
     - use-cached-repos
-    - test-mirror-workspace-git-repos
+    - mirror-workspace-git-repos
     - mirror-info
     - role: configure-mirrors
       set_apt_mirrors_trusted: True
     - role: fetch-zuul-cloner
       destination: "/usr/zuul-env/bin/zuul-cloner"
       repo_src_dir: "/home/zuul/src/git.openstack.org"
-
-  pre_tasks:
-    - name: Check that regional mirror is online
-      uri:
-        url: "http://{{ zuul_site_mirror_fqdn }}"