summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyota MIBU <r-mibu@cq.jp.nec.com>2015-11-23 23:57:33 +0900
committerRyota MIBU <r-mibu@cq.jp.nec.com>2015-11-23 23:57:33 +0900
commit6c1b77bea51e28810e53a1f2eea5da9135ca7842 (patch)
tree0929fcd95e502d582cc977458a00116d4d75e42a
parentf8bc50378f857f3dc38d4b9cf3977fe0f719b09b (diff)
fix document build (ssh gerrit-review cmd)
Signed-off-by: Ryota MIBU <r-mibu@cq.jp.nec.com> Change-Id: I3d3c4cdd1031514526382c83178a3a2f3e1b471d
-rw-r--r--jjb/releng-defaults.yaml1
-rw-r--r--jjb/releng-macros.yaml10
2 files changed, 5 insertions, 6 deletions
diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index c85347457..0292f5f31 100644
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -9,4 +9,3 @@
build-artifact-num-to-keep: 5
ssh-credentials: 'd42411ac011ad6f3dd2e1fa34eaa5d87f910eb2e'
- gerrit-review: 'ssh -p 29418 gerrit.opnfv.org gerrit review'
diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index c5bbef7d3..22d56224c 100644
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -221,7 +221,7 @@
echo
echo "$gerrit_comment"
echo
- {gerrit-review} -p {project} -m "$gerrit_comment" $GERRIT_PATCHSET_REVISION
+ ssh -p 29418 gerrit.opnfv.org gerrit review -p $GERRIT_PROJECT -m "$gerrit_comment" $GERRIT_PATCHSET_REVISION
#TODO(r-mibu): change this to publisher
- builder:
@@ -240,10 +240,10 @@
echo "#####################"
echo
- if [[ "{branch}" == "master" ]] ; then
- gs_path="artifacts.opnfv.org/{project}/docs"
+ if [[ "$GERRIT_BRANCH" == "master" ]] ; then
+ gs_path="artifacts.opnfv.org/$GERRIT_PROJECT/docs"
else
- gs_path="artifacts.opnfv.org/{project}/{branch}/docs"
+ gs_path="artifacts.opnfv.org/$GERRIT_PROJECT/$GERRIT_BRANCH/docs"
fi
gsutil -m cp -r docs/output/* "gs://$gs_path"
@@ -262,7 +262,7 @@
echo
echo "$gerrit_comment"
echo
- {gerrit-review} -p {project} -m "$gerrit_comment" $GERRIT_PATCHSET_REVISION
+ ssh -p 29418 gerrit.opnfv.org gerrit review -p $GERRIT_PROJECT -m "$gerrit_comment" $GERRIT_PATCHSET_REVISION
#TODO(r-mibu): change this to publisher
- builder: