From 9b93aac0d58ececd254032ceea744c782b40e187 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Fri, 8 Sep 2017 15:50:07 +1000 Subject: [PATCH] Build /etc/ci/mirror_info.sh script from ansible Use the mirror-info role from openstack-zuul-jobs to create the /etc/ci/mirror_info.sh script, which is sourced by various jobs to get environment variables that point to our various mirror and proxy sources. Change-Id: I2890404ccca11f47639177886c4d4bbfef47b50d --- playbooks/base/pre.yaml | 1 + zuul.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/playbooks/base/pre.yaml b/playbooks/base/pre.yaml index 5b1dc82e5d..8f4e5d4a1f 100644 --- a/playbooks/base/pre.yaml +++ b/playbooks/base/pre.yaml @@ -5,6 +5,7 @@ - validate-host - use-cached-repos - mirror-workspace-git-repos + - mirror-info - configure-mirrors - role: fetch-zuul-cloner destination: "/usr/zuul-env/bin/zuul-cloner" diff --git a/zuul.yaml b/zuul.yaml index 3a5536e5cd..791831de6a 100644 --- a/zuul.yaml +++ b/zuul.yaml @@ -302,6 +302,7 @@ - playbooks/base/post-logs roles: - zuul: openstack-infra/zuul-jobs + - zuul: openstack-infra/openstack-zuul-jobs timeout: 1800 nodes: - name: ubuntu-xenial