From 2154b0abf77a6f8d8de8319ff5d3f31595fe5617 Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Mon, 5 Feb 2018 09:40:09 -0800 Subject: [PATCH] Resync base-test to base This realigns base-test to base, ending all current experiments. Change-Id: I231cd13ddf0ab00bd198a7c7238092bc5b8616e8 --- playbooks/base-test/post-logs.yaml | 2 +- playbooks/base-test/post-ssh.yaml | 1 - playbooks/base-test/pre.yaml | 4 +++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/playbooks/base-test/post-logs.yaml b/playbooks/base-test/post-logs.yaml index 7b874c48e5..7ffe9cab21 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 diff --git a/playbooks/base-test/post-ssh.yaml b/playbooks/base-test/post-ssh.yaml index e82ab92259..02a338511b 100644 --- a/playbooks/base-test/post-ssh.yaml +++ b/playbooks/base-test/post-ssh.yaml @@ -2,6 +2,5 @@ # NOTE(pabelanger): We ignore_errors for the following tasks as not to fail # successful jobs. ignore_errors: yes - serial: "{{ base_serial | default(omit) }}" roles: - remove-build-sshkey diff --git a/playbooks/base-test/pre.yaml b/playbooks/base-test/pre.yaml index 0e54a10cb8..401afad28d 100644 --- a/playbooks/base-test/pre.yaml +++ b/playbooks/base-test/pre.yaml @@ -4,7 +4,6 @@ zuul_log_url: "http://logs.openstack.org" - hosts: all - serial: "{{ base_serial | default(omit) }}" roles: - add-build-sshkey - start-zuul-console @@ -14,3 +13,6 @@ - mirror-workspace-git-repos - mirror-info - configure-mirrors + - role: fetch-zuul-cloner + destination: "/usr/zuul-env/bin/zuul-cloner" + repo_src_dir: "/home/zuul/src/git.openstack.org"