summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jjb/opnfvdocs/docu-build.sh26
-rw-r--r--jjb/opnfvdocs/opnfvdocs.yml31
2 files changed, 44 insertions, 13 deletions
diff --git a/jjb/opnfvdocs/docu-build.sh b/jjb/opnfvdocs/docu-build.sh
index 057cc97d1..8681190e2 100644
--- a/jjb/opnfvdocs/docu-build.sh
+++ b/jjb/opnfvdocs/docu-build.sh
@@ -9,7 +9,9 @@ git_sha1="$(git rev-parse HEAD)"
docu_build_date="$(date)"
if [[ $JOB_NAME =~ "verify" ]] ; then
- patchset="/$GERRIT_CHANGE_NUMBER"
+ subdir="/$GERRIT_CHANGE_NUMBER"
+else
+ subdir="$GS_PATHNAME"
fi
files=()
@@ -29,24 +31,24 @@ for file in "${{files[@]}}"; do
# rst2html part
echo "rst2html $file"
rst2html $file | gsutil cp -L gsoutput.txt - \
- gs://artifacts.opnfv.org/"$project""$patchset"/"$gs_cp_folder".html
+ gs://artifacts.opnfv.org/"$project""$subdir"/"$gs_cp_folder".html
gsutil setmeta -h "Content-Type:text/html" \
-h "Cache-Control:private, max-age=0, no-transform" \
- gs://artifacts.opnfv.org/"$project""$patchset"/"$gs_cp_folder".html
+ gs://artifacts.opnfv.org/"$project""$subdir"/"$gs_cp_folder".html
cat gsoutput.txt
rm -f gsoutput.txt
echo "rst2pdf $file"
rst2pdf $file -o - | gsutil cp -L gsoutput.txt - \
- gs://artifacts.opnfv.org/"$project""$patchset"/"$gs_cp_folder".pdf
+ gs://artifacts.opnfv.org/"$project""$subdir"/"$gs_cp_folder".pdf
gsutil setmeta -h "Content-Type:application/pdf" \
-h "Cache-Control:private, max-age=0, no-transform" \
- gs://artifacts.opnfv.org/"$project""$patchset"/"$gs_cp_folder".pdf
+ gs://artifacts.opnfv.org/"$project""$subdir"/"$gs_cp_folder".pdf
cat gsoutput.txt
rm -f gsoutput.txt
- links+="http://artifacts.opnfv.org/"$project""$patchset"/"$gs_cp_folder".html \n"
- links+="http://artifacts.opnfv.org/"$project""$patchset"/"$gs_cp_folder".pdf \n"
+ links+="http://artifacts.opnfv.org/"$project""$subdir"/"$gs_cp_folder".html \n"
+ links+="http://artifacts.opnfv.org/"$project""$subdir"/"$gs_cp_folder".pdf \n"
done
@@ -60,19 +62,19 @@ for img in "${{images[@]}}"; do
# uploading found images
echo "uploading $img"
cat "$img" | gsutil cp -L gsoutput.txt - \
- gs://artifacts.opnfv.org/"$project""$patchset"/"$img"
+ gs://artifacts.opnfv.org/"$project""$subdir"/"$img"
gsutil setmeta -h "Content-Type:image/jpeg" \
-h "Cache-Control:private, max-age=0, no-transform" \
- gs://artifacts.opnfv.org/"$project""$patchset"/"$img"
+ gs://artifacts.opnfv.org/"$project""$subdir"/"$img"
cat gsoutput.txt
rm -f gsoutput.txt
done
if [[ $GERRIT_EVENT_TYPE = "change-merged" ]] ; then
- patchset="/$GERRIT_CHANGE_NUMBER"
- if [ ! -z "$patchset" ]; then
- gsutil rm gs://artifacts.opnfv.org/"$project""$patchset"/** || true
+ subdir="/$GERRIT_CHANGE_NUMBER"
+ if [ ! -z "$subdir" ]; then
+ gsutil rm gs://artifacts.opnfv.org/"$project""$subdir"/** || true
fi
fi
diff --git a/jjb/opnfvdocs/opnfvdocs.yml b/jjb/opnfvdocs/opnfvdocs.yml
index 6e7b40bf2..da9f13cf4 100644
--- a/jjb/opnfvdocs/opnfvdocs.yml
+++ b/jjb/opnfvdocs/opnfvdocs.yml
@@ -10,6 +10,10 @@
stream:
- master:
branch: 'master'
+ gs-pathname: ''
+ - stable-arno:
+ branch: 'stable/arno'
+ gs-pathname: '/arno'
project: 'opnfvdocs'
@@ -35,6 +39,8 @@
parameters:
- project-parameter:
project: '{project}'
+ - opnfvdocs-parameter:
+ gs-pathname: '{gs-pathname}'
scm:
- git-scm:
@@ -47,7 +53,7 @@
user: '{ssh-credentials}'
triggers:
- - timed: 'H H * * *'
+ - 'opnfvdocs-{stream}'
builders:
- shell:
@@ -154,3 +160,26 @@
- shell:
!include-raw docu-build.sh
+########################
+# parameter macros
+########################
+- parameter:
+ name: opnfvdocs-parameter
+ parameters:
+ - string:
+ name: GS_PATHNAME
+ default: '{gs-pathname}'
+ description: "Version directory where the opnfv documents will be stored in gs repository"
+
+########################
+# trigger macros
+########################
+- trigger:
+ name: 'opnfvdocs-master'
+ triggers:
+ - pollscm: "H 9 * * *"
+
+- trigger:
+ name: 'opnfvdocs-stable-arno'
+ triggers:
+ - pollscm: "H 21 * * *"