Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Remove rm local files (they will be cleaned with the container and can be...
[releng.git]
/
jjb
/
releng-macros.yaml
diff --git
a/jjb/releng-macros.yaml
b/jjb/releng-macros.yaml
index
f9cb952
..
5d95707
100644
(file)
--- a/
jjb/releng-macros.yaml
+++ b/
jjb/releng-macros.yaml
@@
-7,6
+7,14
@@
name: PROJECT
default: '{project}'
description: "JJB configured PROJECT parameter to identify an opnfv Gerrit project"
name: PROJECT
default: '{project}'
description: "JJB configured PROJECT parameter to identify an opnfv Gerrit project"
+ - string:
+ name: GS_BASE
+ default: artifacts.opnfv.org/$PROJECT
+ description: "URL to Google Storage."
+ - string:
+ name: GS_BASE_PROXY
+ default: build.opnfv.org/artifacts/$PROJECT
+ description: "URL to Google Storage proxy"
- parameter:
name: gerrit-parameter
- parameter:
name: gerrit-parameter
@@
-48,6
+56,16
@@
timeout: 360
fail: true
timeout: 360
fail: true
+- trigger:
+ name: 'brahmaputra-trigger-daily-disabled'
+ triggers:
+ - timed: ''
+
+- trigger:
+ name: 'brahmaputra-trigger-daily-enabled'
+ triggers:
+ - timed: '0 2 * * *'
+
- trigger:
name: gerrit-trigger-patch-submitted
triggers:
- trigger:
name: gerrit-trigger-patch-submitted
triggers:
@@
-151,7
+169,9
@@
name: build-html-and-pdf-docs-output
builders:
- shell: |
name: build-html-and-pdf-docs-output
builders:
- shell: |
- #!/bin/bash -e
+ #!/bin/bash
+ set -o errexit
+ set -o xtrace
export PATH=$PATH:/usr/local/bin/
git clone ssh://gerrit.opnfv.org:29418/releng
GERRIT_COMMENT=gerrit_comment.txt ./releng/utils/docs-build.sh
export PATH=$PATH:/usr/local/bin/
git clone ssh://gerrit.opnfv.org:29418/releng
GERRIT_COMMENT=gerrit_comment.txt ./releng/utils/docs-build.sh
@@
-160,12
+180,14
@@
name: upload-under-review-docs-to-opnfv-artifacts
builders:
- shell: |
name: upload-under-review-docs-to-opnfv-artifacts
builders:
- shell: |
- #!/bin/bash -e
+ #!/bin/bash
+ set -o errexit
set -o pipefail
set -o pipefail
+ set -o xtrace
export PATH=$PATH:/usr/local/bin/
[[ $GERRIT_CHANGE_NUMBER =~ .+ ]]
export PATH=$PATH:/usr/local/bin/
[[ $GERRIT_CHANGE_NUMBER =~ .+ ]]
- [[ -d
output ]]
+ [[ -d
docs_output ]] || exit 0
echo
echo "###########################"
echo
echo "###########################"
@@
-178,7
+200,7
@@
local_path="upload/$GERRIT_CHANGE_NUMBER"
mkdir -p upload
local_path="upload/$GERRIT_CHANGE_NUMBER"
mkdir -p upload
- mv output "$local_path"
+ mv
docs_
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
gsutil -m cp -r "$local_path" "gs://$gs_base"
if gsutil ls "gs://$gs_path" | grep -e 'html$' > /dev/null 2>&1 ; then
@@
-193,32
+215,29
@@
sed -e "s|^$local_path| http://$gs_path|" >> gerrit_comment.txt
- builder:
sed -e "s|^$local_path| http://$gs_path|" >> gerrit_comment.txt
- builder:
- name: upload-
merg
ed-docs-to-opnfv-artifacts
+ name: upload-
generat
ed-docs-to-opnfv-artifacts
builders:
- shell: |
builders:
- shell: |
- #!/bin/bash -e
+ #!/bin/bash
+ set -o errexit
set -o pipefail
set -o pipefail
+ set -o xtrace
export PATH=$PATH:/usr/local/bin/
export PATH=$PATH:/usr/local/bin/
- [[ -d
output ]]
+ [[ -d
docs_output ]] || exit 0
echo
echo
- echo "#####################"
- echo "UPLOADING
MERG
ED DOCS"
- echo "#####################"
+ echo "#####################
###
"
+ echo "UPLOADING
GENERAT
ED DOCS"
+ echo "#####################
###
"
echo
echo
- if [[ "$GERRIT_BRANCH" == "master" ]] ; then
- gs_base="artifacts.opnfv.org/$GERRIT_PROJECT"
- else
- gs_base="artifacts.opnfv.org/$GERRIT_PROJECT/$GERRIT_BRANCH"
- fi
- gs_path="$gs_base/docs"
+ gs_path="$GS_URL/docs"
local_path="upload/docs"
mkdir -p upload
local_path="upload/docs"
mkdir -p upload
- mv output "$local_path"
- gsutil -m cp -r "$local_path" "gs://$
gs_base
"
+ mv
docs_
output "$local_path"
+ gsutil -m cp -r "$local_path" "gs://$
GS_URL
"
if gsutil ls "gs://$gs_path" | grep -e 'html$' > /dev/null 2>&1 ; then
gsutil -m setmeta \
if gsutil ls "gs://$gs_path" | grep -e 'html$' > /dev/null 2>&1 ; then
gsutil -m setmeta \
@@
-235,7
+254,10
@@
name: report-docs-build-result-to-gerrit
builders:
- shell: |
name: report-docs-build-result-to-gerrit
builders:
- shell: |
- #!/bin/bash -e
+ #!/bin/bash
+ set -o errexit
+ set -o pipefail
+ set -o xtrace
export PATH=$PATH:/usr/local/bin/
if [[ -e gerrit_comment.txt ]] ; then
echo
export PATH=$PATH:/usr/local/bin/
if [[ -e gerrit_comment.txt ]] ; then
echo
@@
-253,7
+275,10
@@
name: remove-old-docs-from-opnfv-artifacts
builders:
- shell: |
name: remove-old-docs-from-opnfv-artifacts
builders:
- shell: |
- #!/bin/bash -e
+ #!/bin/bash
+ set -o errexit
+ set -o pipefail
+ set -o xtrace
export PATH=$PATH:/usr/local/bin/
[[ $GERRIT_CHANGE_NUMBER =~ .+ ]]
export PATH=$PATH:/usr/local/bin/
[[ $GERRIT_CHANGE_NUMBER =~ .+ ]]
@@
-277,6
+302,6
@@
name: upload-merged-docs
builders:
- build-html-and-pdf-docs-output
name: upload-merged-docs
builders:
- build-html-and-pdf-docs-output
- - upload-
merg
ed-docs-to-opnfv-artifacts
+ - upload-
generat
ed-docs-to-opnfv-artifacts
- report-docs-build-result-to-gerrit
- remove-old-docs-from-opnfv-artifacts
- report-docs-build-result-to-gerrit
- remove-old-docs-from-opnfv-artifacts