From 2775881cb126f9e352a765ab17489eb44dbab260 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Wed, 4 Apr 2018 09:53:34 +0200 Subject: [PATCH] Fix publishing infra/publications The two publishing jobs failed, fix them: * ZUUL_REFNAME in playbooks/publications/run.yaml#n12 is not set, use the proper variable. * index publishing is done from master, always check out master for this like it was done for version 2. Change-Id: I494c69e51282418bbc7cac45454abe8c52e6920f --- playbooks/publications/run.yaml | 2 +- zuul.d/jobs.yaml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/playbooks/publications/run.yaml b/playbooks/publications/run.yaml index f68982d070..05f6e21503 100644 --- a/playbooks/publications/run.yaml +++ b/playbooks/publications/run.yaml @@ -9,7 +9,7 @@ cmd: | set -x # NAME will either be the branch name or the tag name - NAME=`echo $ZUUL_REFNAME | sed 's/refs.tags.//'` + NAME=`echo {{ zuul.ref }} | sed 's/refs.tags.//'` mkdir -p _out/$NAME for FN in * ; do if [ "_out" != "$FN" ] ; then diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 5074725292..36623d2cff 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -496,6 +496,8 @@ post-run: - playbooks/publish/publications-index.yaml - playbooks/publish/openstack-afs.yaml + # Index is always published from master + override-branch: master allowed-projects: - openstack-infra/publications roles: