summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
Diffstat (limited to 'jjb')
-rw-r--r--jjb/genesis/genesis-foreman.yml21
-rw-r--r--jjb/genesis/genesis-fuel.yml23
-rw-r--r--jjb/opnfvdocs/docu-build.sh26
-rw-r--r--jjb/opnfvdocs/opnfvdocs.yml31
4 files changed, 77 insertions, 24 deletions
diff --git a/jjb/genesis/genesis-foreman.yml b/jjb/genesis/genesis-foreman.yml
index fea2b939b..8553bcff9 100644
--- a/jjb/genesis/genesis-foreman.yml
+++ b/jjb/genesis/genesis-foreman.yml
@@ -93,7 +93,6 @@
builders:
- 'foreman-build'
- - 'foreman-workspace-cleanup'
- job-template:
name: 'genesis-foreman-merge'
@@ -153,7 +152,6 @@
builders:
- 'foreman-build'
- - 'foreman-workspace-cleanup'
- job-template:
name: 'genesis-foreman-daily-{stream}'
@@ -164,6 +162,9 @@
disabled: false
+ triggers:
+ - 'foreman-{stream}'
+
parameters:
- project-parameter:
project: '{project}'
@@ -184,16 +185,19 @@
builders:
- trigger-builds:
- - project: 'genesis-foreman-build'
+ - project: 'genesis-foreman-build-{stream}'
git-revision: true
block: true
- trigger-builds:
- - project: 'genesis-foreman-deploy'
+ - project: 'genesis-foreman-deploy-{stream}'
git-revision: true
block: true
- trigger-builds:
- project: 'functest-opnfv-jump-2'
block: true
+ - trigger-builds:
+ - project: 'yardstick-opnfv-jump-2'
+ block: true
- job-template:
name: 'genesis-foreman-build-{stream}'
@@ -379,6 +383,7 @@
echo
echo "--------------------------------------------------------"
echo "Done!"
+ echo "Artifact is available as http://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.iso"
- builder:
name: 'foreman-workspace-cleanup'
@@ -396,11 +401,11 @@
# trigger macros
########################
- trigger:
- name: 'master'
+ name: 'foreman-master'
triggers:
- - pollscm: "0 9 * * *"
+ - pollscm: '0 21 * * *'
- trigger:
- name: 'stable-arno'
+ name: 'foreman-stable-arno'
triggers:
- - pollscm: "0 21 * * *"
+ - pollscm: '0 3 * * *'
diff --git a/jjb/genesis/genesis-fuel.yml b/jjb/genesis/genesis-fuel.yml
index 88ac66a18..9f00e5ded 100644
--- a/jjb/genesis/genesis-fuel.yml
+++ b/jjb/genesis/genesis-fuel.yml
@@ -96,7 +96,6 @@
builders:
- 'fuel-build'
- - 'fuel-workspace-cleanup'
- job-template:
name: 'genesis-fuel-merge'
@@ -157,7 +156,6 @@
builders:
- 'fuel-build'
- - 'fuel-workspace-cleanup'
- job-template:
name: 'genesis-fuel-daily-{stream}'
@@ -168,6 +166,9 @@
disabled: false
+ triggers:
+ - 'fuel-{stream}'
+
parameters:
- project-parameter:
project: '{project}'
@@ -199,6 +200,9 @@
- trigger-builds:
- project: 'functest-opnfv-jump-1'
block: true
+ - trigger-builds:
+ - project: 'yardstick-opnfv-jump-1'
+ block: true
- job-template:
name: 'genesis-fuel-build-{stream}'
@@ -229,7 +233,6 @@
builders:
- 'fuel-build'
- 'fuel-upload-artifact'
- - 'fuel-workspace-cleanup'
- job-template:
name: 'genesis-fuel-deploy-{stream}'
@@ -454,6 +457,7 @@
echo
echo "--------------------------------------------------------"
echo "Done!"
+ echo "Artifact is available as http://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.iso"
- builder:
name: 'fuel-download-artifact'
@@ -500,3 +504,16 @@
# delete everything that is in $WORKSPACE
/bin/rm -rf $WORKSPACE
+
+########################
+# trigger macros
+########################
+- trigger:
+ name: 'fuel-master'
+ triggers:
+ - pollscm: '0 21 * * *'
+
+- trigger:
+ name: 'fuel-stable-arno'
+ triggers:
+ - pollscm: '0 3 * * *'
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 * * *"