From 7d4c9f117b95283b79850b08257d346aa00828e6 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Fri, 27 Oct 2017 14:24:54 +0200 Subject: [PATCH] Make prepare-docs-for-afs useable for different paths The rearrange script had hardcoded doc/build but we use the role also for other directories, adjust the script. Change-Id: Ib718d4674768380decefc93f6189527b6cf1ed1b --- roles/prepare-docs-for-afs/tasks/main.yaml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/roles/prepare-docs-for-afs/tasks/main.yaml b/roles/prepare-docs-for-afs/tasks/main.yaml index 44066f52..b7346b41 100644 --- a/roles/prepare-docs-for-afs/tasks/main.yaml +++ b/roles/prepare-docs-for-afs/tasks/main.yaml @@ -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