From 465b106f0dcbb0c5c19d561373034ab47eee4f57 Mon Sep 17 00:00:00 2001 From: Ryota MIBU Date: Tue, 1 Dec 2015 17:34:09 +0900 Subject: [PATCH] jjb: fix output path in docs uploader Change-Id: I52735adbce48734f103ac76c2b4f5c5c77427c58 Signed-off-by: Ryota MIBU --- jjb/releng-macros.yaml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml index c009abd97..f9cb95209 100644 --- a/jjb/releng-macros.yaml +++ b/jjb/releng-macros.yaml @@ -165,7 +165,7 @@ export PATH=$PATH:/usr/local/bin/ [[ $GERRIT_CHANGE_NUMBER =~ .+ ]] - [[ -d docs/output ]] + [[ -d output ]] echo echo "###########################" @@ -175,9 +175,10 @@ gs_base="artifacts.opnfv.org/review" gs_path="$gs_base/$GERRIT_CHANGE_NUMBER" - local_path="docs/$GERRIT_CHANGE_NUMBER" + local_path="upload/$GERRIT_CHANGE_NUMBER" - mv docs/output "$local_path" + mkdir -p upload + mv output "$local_path" gsutil -m cp -r "$local_path" "gs://$gs_base" if gsutil ls "gs://$gs_path" | grep -e 'html$' > /dev/null 2>&1 ; then @@ -199,7 +200,7 @@ set -o pipefail export PATH=$PATH:/usr/local/bin/ - [[ -d docs/output ]] + [[ -d output ]] echo echo "#####################" @@ -213,9 +214,10 @@ gs_base="artifacts.opnfv.org/$GERRIT_PROJECT/$GERRIT_BRANCH" fi gs_path="$gs_base/docs" - local_path="docs/docs" + local_path="upload/docs" - mv docs/output "$local_path" + mkdir -p upload + mv output "$local_path" gsutil -m cp -r "$local_path" "gs://$gs_base" if gsutil ls "gs://$gs_path" | grep -e 'html$' > /dev/null 2>&1 ; then -- 2.16.6