openstack/openstack-zuul-jobs
Code Issues Proposed changes

Make prepare-docs-for-afs useable for different paths

Browse Source 
The rearrange script had hardcoded doc/build but we use the role also
for other directories, adjust the script.

Change-Id: Ib718d4674768380decefc93f6189527b6cf1ed1b
This commit is contained in:
Andreas Jaeger 2017-10-27 14:24:54 +02:00
parent b8456bb17d
commit 7d4c9f117b
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
roles/prepare-docs-for-afs/tasks/main.yaml
View File

@ -21,6 +21,7 @@
executable: /bin/bash
shell: |
set -xe
DOCBUILD="{{ doc_build_dir }}"
if [[ {{ zuul.ref }} =~ ^refs/tags/ ]]; then
# This job should not be configured to run for
# pre-releases, so if we have a tag we want to use it as
@ -40,16 +41,16 @@
# We will have already moved the content inside
# a directory named for the tag, so we move that
# directory to the publish location.
mv doc/build/html/$tag doc/publish/
mv $DOCBUILD/html/$tag doc/publish/
elif [[ $branch_name = master ]]; then
# The above tasks does not rename the output directory, but
# we want it to be called "latest".
mv doc/build/html doc/publish/latest
mv $DOCBUILD/html doc/publish/latest
elif [[ $branch_name =~ stable/ ]]; then
# We will have already moved the content inside
# a directory named for the branch, so move that to the
# publish location.
mv doc/build/html/$(basename $branch_name) doc/publish/
mv $DOCBUILD/html/$(basename $branch_name) doc/publish/
elif [[ $branch_name =~ feature/ ]]; then
echo "Docs should not be published for feature branches"
exit 1
@ -62,5 +63,5 @@
exit 1
fi
# Move back into doc/build/html for artifact publisher.
rm -rf doc/build/html
mv doc/publish doc/build/html
rm -rf $DOCBUILD/html
mv doc/publish $DOCBUILD/html