diff options
| -rw-r--r-- | jjb/releng-defaults.yaml | 1 | ||||
| -rw-r--r-- | jjb/releng-macros.yaml | 10 |
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: |