summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorRyota MIBU <r-mibu@cq.jp.nec.com>2015-12-01 08:40:27 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2015-12-01 08:40:27 +0000
commita3eda1ce7953fc80ecf07905c2e551893b6ffc10 (patch)
tree89ef61116853065108b9eaef6c5c9177085d4b8e /jjb
parent2141a17cadce1d6d451f501d4038fcacb7b52f8f (diff)
parent465b106f0dcbb0c5c19d561373034ab47eee4f57 (diff)
Merge "jjb: fix output path in docs uploader"
Diffstat (limited to 'jjb')
-rw-r--r--jjb/releng-macros.yaml14
1 files 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