summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>2015-12-11 10:54:26 +0100
committerFatih Degirmenci <fatih.degirmenci@ericsson.com>2015-12-11 10:33:41 +0000
commit4163f6bfb811c17dc22e68c7a2ef1ed30293feaf (patch)
tree0205ec1ccbf67c0abdd6890a33352046733d33e5
parenta8f7054c6691852c58c0fd68961a4302c101e20c (diff)
Cleanup jjb files
- Remove the jobs that do nothing such as merge and daily jobs - Leave only verify jobs for all the projects as placeholders - Introduce stable/brahmaputra branch and keep it disabled Please note that the "real" jobs for bottlenecks, compass4nfv, functest, and qtip are not deleted. Change-Id: I80031f77a11c2bf5173fbb7be98294285e3cc2ef Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
-rw-r--r--jjb/armband/armband.yml131
-rw-r--r--jjb/availability/availability.yml120
-rw-r--r--jjb/availability/docu-build.sh80
-rw-r--r--jjb/bottlenecks/bottlenecks.yml71
-rw-r--r--jjb/compass4nfv/compass4nfv.yml69
-rw-r--r--jjb/conductor/conductor.yml123
-rw-r--r--jjb/copper/copper.yml63
-rw-r--r--jjb/doctor/doctor.yml74
-rw-r--r--jjb/doctor/docu-build.sh53
-rw-r--r--jjb/dpacc/dpacc.yml123
-rw-r--r--jjb/fastpathmetrics/fastpathmetrics.yml124
-rw-r--r--jjb/functest/functest.yml78
-rw-r--r--jjb/genesis/docu-build.sh49
-rw-r--r--jjb/genesis/genesis-docs.yml135
-rw-r--r--jjb/ipv6/ipv6.yml124
-rw-r--r--jjb/octopus/octopus.yml142
-rw-r--r--jjb/opnfv/opnfv-docs.yml8
-rw-r--r--jjb/opnfv/pod-params.yml17
-rw-r--r--jjb/opnfvdocs/docu-build.sh82
-rw-r--r--jjb/oscar/oscar.yml123
-rw-r--r--jjb/ovsnfv/ovsnfv.yml33
-rw-r--r--jjb/parser/docu-build.sh80
-rw-r--r--jjb/parser/parser.yml118
-rw-r--r--jjb/pharos/pharos.yml160
-rw-r--r--jjb/prediction/docu-build.sh80
-rw-r--r--jjb/prediction/prediction.yml120
-rw-r--r--jjb/promise/docu-build.sh47
-rw-r--r--jjb/promise/promise.yml65
-rw-r--r--jjb/qtip/qtip.yml117
29 files changed, 531 insertions, 2078 deletions
diff --git a/jjb/armband/armband.yml b/jjb/armband/armband.yml
index 47906b739..1180df6f8 100644
--- a/jjb/armband/armband.yml
+++ b/jjb/armband/armband.yml
@@ -1,77 +1,41 @@
+###################################################
+# All the jobs except verify have been removed!
+# They will only be enabled on request by projects!
+###################################################
- project:
name: armband
+
+ project: '{name}'
+
jobs:
- - 'armband-test'
- - 'armband-daily-{stream}'
- - 'armband-verify'
- - 'armband-merge'
+ - 'armband-verify-{stream}'
- # stream: branch with - in place of / (eg. stable-arno)
- # branch: branch (eg. stable/arno)
+# only master branch is enabled at the moment to keep no of jobs sane
stream:
- master:
branch: 'master'
+ gs-pathname: ''
+# - stable-brahmaputra:
+# branch: 'stable/brahmaputra'
+# gs-pathname: '/brahmaputra'
- project: 'armband'
- somevar: 'foo'
-
-- job-template:
- name: armband-test
-
- builders:
- - shell: |
- echo "Hello world from armband"
-
-- job-template:
- name: 'armband-daily-{stream}'
-
- # Job template for daily builders
- #
- # Required Variables:
- # stream: branch with - in place of / (eg. stable)
- # branch: branch (eg. stable)
-
- varsetabove: '{somevar}'
+- job_defaults: &armband_job_defaults
+ name: armband_job_defaults
parameters:
- project-parameter:
project: '{project}'
-
- scm:
- - git-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- branch: '{branch}'
-
- triggers:
- - timed: 'H H * * *'
-
- prebuilders:
- - test-macro
-
- builders:
- - shell: |
- pwd
- find .
- echo "Hello world from armband {somevar} daily"
-
- postbuilders:
- - test-macro
+ - gerrit-parameter:
+ branch: '{stream}'
- job-template:
- name: 'armband-verify'
+ name: 'armband-verify-{stream}'
- node: ericsson-build
+ <<: *armband_job_defaults
parameters:
- - project-parameter:
- project: '{project}'
- - gerrit-parameter:
- branch: 'master'
- - string:
- name: GIT_BASE
- default: https://gerrit.opnfv.org/gerrit/$PROJECT
- description: "Used for overriding the GIT URL coming from Global Jenkins configuration in case if the stuff is done on none-LF HW."
+ - 'opnfv-build-defaults'
+
scm:
- gerrit-trigger-scm:
credentials-id: '{ssh-credentials}'
@@ -92,55 +56,14 @@
comment-contains-value: 'reverify'
projects:
- project-compare-type: 'ANT'
- project-pattern: 'armband'
+ project-pattern: '{project}'
branches:
- branch-compare-type: 'ANT'
- branch-pattern: '**/master'
-
- builders:
- - shell: |
- pwd
- find .
- echo "verify logic goes here"
-
-- job-template:
- name: 'armband-merge'
-
- # builder-merge job to run JJB update
- #
- # This job's purpose is to update all the JJB
-
- parameters:
- - project-parameter:
- project: '{project}'
- - gerrit-parameter:
- branch: 'master'
- - string:
- name: GIT_BASE
- default: https://gerrit.opnfv.org/gerrit/$PROJECT
- description: "Used for overriding the GIT URL coming from Global Jenkins configuration in case if the stuff is done on none-LF HW."
-
- scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- choosing-strategy: 'default'
-
- triggers:
- - gerrit:
- trigger-on:
- - change-merged-event
- - comment-added-contains-event:
- comment-contains-value: 'remerge'
- projects:
- - project-compare-type: 'ANT'
- project-pattern: 'armband'
- branches:
- - branch-compare-type: 'ANT'
- branch-pattern: '**/master'
+ branch-pattern: '**/{stream}'
+ forbidden-file-paths:
+ - compare-type: ANT
+ pattern: 'docs/**|.gitignore'
builders:
- shell: |
- pwd
- find .
- echo "merge logic goes here"
+ echo "Nothing to verify!"
diff --git a/jjb/availability/availability.yml b/jjb/availability/availability.yml
index e8fb4300c..847880232 100644
--- a/jjb/availability/availability.yml
+++ b/jjb/availability/availability.yml
@@ -1,69 +1,41 @@
+###################################################
+# All the jobs except verify have been removed!
+# They will only be enabled on request by projects!
+###################################################
- project:
name: availability
+
+ project: '{name}'
+
jobs:
- - 'availability-test'
- - 'availability-daily-{stream}'
- - 'availability-merge'
- - 'availability-verify'
+ - 'availability-verify-{stream}'
- # stream: branch with - in place of / (eg. stable-arno)
- # branch: branch (eg. stable/arno)
+# only master branch is enabled at the moment to keep no of jobs sane
stream:
- master:
branch: 'master'
+ gs-pathname: ''
+# - stable-brahmaputra:
+# branch: 'stable/brahmaputra'
+# gs-pathname: '/brahmaputra'
- project: 'availability'
- somevar: 'foo'
-
-- job-template:
- name: availability-test
-
- builders:
- - shell: |
- echo "Hello world from availability"
-
-- job-template:
- name: 'availability-daily-{stream}'
-
- # Job template for daily builders
- #
- # Required Variables:
- # stream: branch with - in place of / (eg. stable)
- # branch: branch (eg. stable)
-
- varsetabove: '{somevar}'
+- job_defaults: &availability_job_defaults
+ name: availability_job_defaults
parameters:
- project-parameter:
project: '{project}'
-
- scm:
- - git-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- branch: '{branch}'
-
- triggers:
- - timed: 'H H * * *'
-
- prebuilders:
- - test-macro
-
- builders:
- - shell:
- !include-raw docu-build.sh
-
- postbuilders:
- - test-macro
+ - gerrit-parameter:
+ branch: '{stream}'
- job-template:
- name: 'availability-verify'
+ name: 'availability-verify-{stream}'
+
+ <<: *availability_job_defaults
parameters:
- - project-parameter:
- project: '{project}'
- - gerrit-parameter:
- branch: 'master'
+ - 'opnfv-build-defaults'
+
scm:
- gerrit-trigger-scm:
credentials-id: '{ssh-credentials}'
@@ -84,48 +56,14 @@
comment-contains-value: 'reverify'
projects:
- project-compare-type: 'ANT'
- project-pattern: 'availability'
+ project-pattern: '{project}'
branches:
- branch-compare-type: 'ANT'
- branch-pattern: '**/master'
-
- builders:
- - shell:
- !include-raw docu-build.sh
-
-- job-template:
- name: 'availability-merge'
-
- # builder-merge job to run JJB update
- #
- # This job's purpose is to update all the JJB
-
- parameters:
- - project-parameter:
- project: '{project}'
- - gerrit-parameter:
- branch: 'master'
-
- scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- choosing-strategy: 'default'
-
- triggers:
- - gerrit:
- trigger-on:
- - change-merged-event
- - comment-added-contains-event:
- comment-contains-value: 'remerge'
- projects:
- - project-compare-type: 'ANT'
- project-pattern: 'availability'
- branches:
- - branch-compare-type: 'ANT'
- branch-pattern: '**/master'
+ branch-pattern: '**/{stream}'
+ forbidden-file-paths:
+ - compare-type: ANT
+ pattern: 'docs/**|.gitignore'
builders:
- - shell:
- !include-raw docu-build.sh
-
+ - shell: |
+ echo "Nothing to verify!"
diff --git a/jjb/availability/docu-build.sh b/jjb/availability/docu-build.sh
deleted file mode 100644
index 057cc97d1..000000000
--- a/jjb/availability/docu-build.sh
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/bin/bash
-set -e
-set -o pipefail
-
-project="$(git remote -v | head -n1 | awk '{{print $2}}' | sed -e 's,.*:\(.*/\)\?,,' -e 's/\.git$//')"
-export PATH=$PATH:/usr/local/bin/
-
-git_sha1="$(git rev-parse HEAD)"
-docu_build_date="$(date)"
-
-if [[ $JOB_NAME =~ "verify" ]] ; then
- patchset="/$GERRIT_CHANGE_NUMBER"
-fi
-
-files=()
-while read -r -d ''; do
- files+=("$REPLY")
-done < <(find * -type f -iname '*.rst' -print0)
-
-for file in "${{files[@]}}"; do
-
- file_cut="${{file%.*}}"
- gs_cp_folder="${{file_cut}}"
-
- # sed part
- sed -i "s/_sha1_/$git_sha1/g" $file
- sed -i "s/_date_/$docu_build_date/g" $file
-
- # rst2html part
- echo "rst2html $file"
- rst2html $file | gsutil cp -L gsoutput.txt - \
- gs://artifacts.opnfv.org/"$project""$patchset"/"$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
- 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
- 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
- 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"
-
-done
-
-images=()
-while read -r -d ''; do
- images+=("$REPLY")
-done < <(find * -type f \( -iname \*.jpg -o -iname \*.png \) -print0)
-
-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"
- gsutil setmeta -h "Content-Type:image/jpeg" \
- -h "Cache-Control:private, max-age=0, no-transform" \
- gs://artifacts.opnfv.org/"$project""$patchset"/"$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
- fi
-fi
-
-echo -e "$links"
-
diff --git a/jjb/bottlenecks/bottlenecks.yml b/jjb/bottlenecks/bottlenecks.yml
index e7758651d..15aceefcd 100644
--- a/jjb/bottlenecks/bottlenecks.yml
+++ b/jjb/bottlenecks/bottlenecks.yml
@@ -4,13 +4,9 @@
- project:
name: bottlenecks
jobs:
- - 'bottlenecks-test'
- - 'bottlenecks-verify'
- - 'bottlenecks-merge'
+ - 'bottlenecks-verify-{stream}'
- 'bottlenecks-daily-{installer}-{pod}-{stream}'
- # stream: branch with - in place of / (eg. stable-arno)
- # branch: branch (eg. stable/arno)
pod:
- lf:
node: 'opnfv-jump-2'
@@ -20,31 +16,29 @@
installer:
-fuel
+# only master branch is enabled at the moment to keep no of jobs sane
stream:
- master:
branch: 'master'
+ gs-pathname: ''
+# - stable-brahmaputra:
+# branch: 'stable/brahmaputra'
+# gs-pathname: '/brahmaputra'
project: 'bottlenecks'
- somevar: 'foo'
###############################
# Job templates
##############################
- job-template:
- name: 'bottlenecks-test'
-
- builders:
- - shell: |
- echo "Hello world from bottlenecks"
-
-- job-template:
-
- name: 'bottlenecks-verify'
+ name: 'bottlenecks-verify-{stream}'
parameters:
- project-parameter:
project: '{project}'
- gerrit-parameter:
- branch: 'master'
+ branch: '{stream}'
+ - 'opnfv-build-defaults'
+
scm:
- gerrit-trigger-scm:
credentials-id: '{ssh-credentials}'
@@ -68,47 +62,14 @@
project-pattern: '{project}'
branches:
- branch-compare-type: 'ANT'
- branch-pattern: '**/master'
-
- builders:
- - shell: |
- echo "hello world"
-
-- job-template:
- name: 'bottlenecks-merge'
-
- # builder-merge job to run JJB update
- #
- # This job's purpose is to update all the JJB
-
- parameters:
- - project-parameter:
- project: '{project}'
- - gerrit-parameter:
- branch: 'master'
-
- scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- choosing-strategy: 'default'
-
- triggers:
- - gerrit:
- trigger-on:
- - change-merged-event
- - comment-added-contains-event:
- comment-contains-value: 'remerge'
- projects:
- - project-compare-type: 'ANT'
- project-pattern: 'bottlenecks'
- branches:
- - branch-compare-type: 'ANT'
- branch-pattern: '**/master'
+ branch-pattern: '**/{stream}'
+ forbidden-file-paths:
+ - compare-type: ANT
+ pattern: 'docs/**|.gitignore'
builders:
- shell: |
- echo "hello world"
+ echo "Nothing to verify!"
- job-template:
name: 'bottlenecks-daily-{installer}-{pod}-{stream}'
@@ -120,7 +81,7 @@
parameters:
- project-parameter:
project: '{project}'
- - '{pod}-parameters'
+ - 'opnfv-jump-2-defaults'
- string:
name: POD_NAME
default: '{pod}'
diff --git a/jjb/compass4nfv/compass4nfv.yml b/jjb/compass4nfv/compass4nfv.yml
index 2b279bd71..9db53e617 100644
--- a/jjb/compass4nfv/compass4nfv.yml
+++ b/jjb/compass4nfv/compass4nfv.yml
@@ -1,4 +1,3 @@
-# this is the job configuration for bgs
- project:
name: compass
@@ -6,19 +5,21 @@
installer: 'compass'
jobs:
- - 'compass-verify'
- - 'compass-merge'
+ - 'compass-verify-{stream}'
- 'compass-daily-{stream}'
- 'compass-build-iso'
- 'compass-build-ppa'
- 'compass-deploy-virtual-{flavor}'
- 'compass-deploy-bare-huawei-us'
- # stream: branch with - in place of / (eg. stable-helium)
- # branch: branch (eg. stable/helium)
+# only master branch is enabled at the moment to keep no of jobs sane
stream:
- master:
branch: 'master'
+ gs-pathname: ''
+# - stable-brahmaputra:
+# branch: 'stable/brahmaputra'
+# gs-pathname: '/brahmaputra'
flavor:
- cluster-odl:
@@ -37,7 +38,7 @@
# job templates
########################
- job-template:
- name: 'compass-verify'
+ name: 'compass-verify-{stream}'
disabled: false
@@ -88,7 +89,7 @@
branch-pattern: '**/master'
forbidden-file-paths:
- compare-type: ANT
- pattern: 'docs/**'
+ pattern: 'docs/**|.gitignore'
builders:
- 'builder-compass-build-iso'
@@ -100,53 +101,6 @@
fingerprint: true
- job-template:
- name: 'compass-merge'
-
- # builder-merge job to run JJB update
- #
- # This job's purpose is to update all the JJB
-
- node: huawei-build
-
- concurrent: true
-
- properties:
- - throttle:
- enabled: true
- max-total: 3
- max-per-node: 1
-
- parameters:
- - project-parameter:
- project: '{project}'
- - gerrit-parameter:
- branch: 'master'
- - compass-parameter:
- installer: '{installer}'
-
- scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- choosing-strategy: 'default'
-
- triggers:
- - gerrit:
- trigger-on:
- - change-merged-event
- - comment-added-contains-event:
- comment-contains-value: 'remerge'
- projects:
- - project-compare-type: 'ANT'
- project-pattern: '{project}'
- branches:
- - branch-compare-type: 'ANT'
- branch-pattern: '**/master'
-
- builders:
- - 'builder-compass-merge'
-
-- job-template:
name: 'compass-daily-{stream}'
node: huawei-build
@@ -366,13 +320,6 @@
# builder macros
########################
- builder:
- name: 'builder-compass-merge'
- builders:
- - shell: |
- #!/bin/bash
- echo "Hello World!"
-
-- builder:
name: 'builder-compass-make-ppa'
builders:
- shell: |
diff --git a/jjb/conductor/conductor.yml b/jjb/conductor/conductor.yml
index 3316a4abf..961bcd878 100644
--- a/jjb/conductor/conductor.yml
+++ b/jjb/conductor/conductor.yml
@@ -1,71 +1,41 @@
+###################################################
+# All the jobs except verify have been removed!
+# They will only be enabled on request by projects!
+###################################################
- project:
name: conductor
+
+ project: '{name}'
+
jobs:
- - 'conductor-test'
- - 'conductor-daily-{stream}'
- - 'conductor-merge'
- - 'conductor-verify'
+ - 'conductor-verify-{stream}'
- # stream: branch with - in place of / (eg. stable-helium)
- # branch: branch (eg. stable/helium)
+# only master branch is enabled at the moment to keep no of jobs sane
stream:
- master:
branch: 'master'
+ gs-pathname: ''
+# - stable-brahmaputra:
+# branch: 'stable/brahmaputra'
+# gs-pathname: '/brahmaputra'
- project: 'conductor'
- somevar: 'foo'
-
-- job-template:
- name: conductor-test
-
- builders:
- - shell: |
- echo "Hello world from conductor"
-
-- job-template:
- name: 'conductor-daily-{stream}'
-
- # Job template for daily builders
- #
- # Required Variables:
- # stream: branch with - in place of / (eg. stable)
- # branch: branch (eg. stable)
-
- varsetabove: '{somevar}'
+- job_defaults: &conductor_job_defaults
+ name: conductor_job_defaults
parameters:
- project-parameter:
project: '{project}'
-
- scm:
- - git-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- branch: '{branch}'
-
- triggers:
- - timed: 'H H * * *'
-
- prebuilders:
- - test-macro
-
- builders:
- - shell: |
- pwd
- find .
- echo "Hello world from conductor {somevar} daily"
-
- postbuilders:
- - test-macro
+ - gerrit-parameter:
+ branch: '{stream}'
- job-template:
- name: 'conductor-verify'
+ name: 'conductor-verify-{stream}'
+
+ <<: *conductor_job_defaults
parameters:
- - project-parameter:
- project: '{project}'
- - gerrit-parameter:
- branch: 'master'
+ - 'opnfv-build-defaults'
+
scm:
- gerrit-trigger-scm:
credentials-id: '{ssh-credentials}'
@@ -86,51 +56,14 @@
comment-contains-value: 'reverify'
projects:
- project-compare-type: 'ANT'
- project-pattern: 'conductor'
+ project-pattern: '{project}'
branches:
- branch-compare-type: 'ANT'
- branch-pattern: '**/master'
-
- builders:
- - shell: |
- pwd
- find .
- echo "verify logic goes here"
-
-- job-template:
- name: 'conductor-merge'
-
- # builder-merge job to run JJB update
- #
- # This job's purpose is to update all the JJB
-
- parameters:
- - project-parameter:
- project: '{project}'
- - gerrit-parameter:
- branch: 'master'
-
- scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- choosing-strategy: 'default'
-
- triggers:
- - gerrit:
- trigger-on:
- - change-merged-event
- - comment-added-contains-event:
- comment-contains-value: 'remerge'
- projects:
- - project-compare-type: 'ANT'
- project-pattern: 'conductor'
- branches:
- - branch-compare-type: 'ANT'
- branch-pattern: '**/master'
+ branch-pattern: '**/{stream}'
+ forbidden-file-paths:
+ - compare-type: ANT
+ pattern: 'docs/**|.gitignore'
builders:
- shell: |
- pwd
- find .
- echo "merge logic goes here"
+ echo "Nothing to verify!"
diff --git a/jjb/copper/copper.yml b/jjb/copper/copper.yml
index 637e35981..654b6f02a 100644
--- a/jjb/copper/copper.yml
+++ b/jjb/copper/copper.yml
@@ -1,20 +1,69 @@
+###################################################
+# All the jobs except verify have been removed!
+# They will only be enabled on request by projects!
+###################################################
- project:
name: copper
+
+ project: '{name}'
+
jobs:
- - 'copper-test'
+ - 'copper-verify-{stream}'
- # stream: branch with - in place of / (eg. stable-helium)
- # branch: branch (eg. stable/helium)
+# only master branch is enabled at the moment to keep no of jobs sane
stream:
- master:
branch: 'master'
+ gs-pathname: ''
+# - stable-brahmaputra:
+# branch: 'stable/brahmaputra'
+# gs-pathname: '/brahmaputra'
- project: 'copper'
- somevar: 'foo'
+- job_defaults: &copper_job_defaults
+ name: copper_job_defaults
+
+ parameters:
+ - project-parameter:
+ project: '{project}'
+ - gerrit-parameter:
+ branch: '{stream}'
- job-template:
- name: copper-test
+ name: 'copper-verify-{stream}'
+
+ <<: *copper_job_defaults
+
+ parameters:
+ - 'opnfv-build-defaults'
+
+ scm:
+ - gerrit-trigger-scm:
+ credentials-id: '{ssh-credentials}'
+ refspec: '$GERRIT_REFSPEC'
+ choosing-strategy: 'gerrit'
+
+ triggers:
+ - gerrit:
+ trigger-on:
+ - patchset-created-event:
+ exclude-drafts: 'false'
+ exclude-trivial-rebase: 'false'
+ exclude-no-code-change: 'false'
+ - draft-published-event
+ - comment-added-contains-event:
+ comment-contains-value: 'recheck'
+ - comment-added-contains-event:
+ comment-contains-value: 'reverify'
+ projects:
+ - project-compare-type: 'ANT'
+ project-pattern: '{project}'
+ branches:
+ - branch-compare-type: 'ANT'
+ branch-pattern: '**/{stream}'
+ forbidden-file-paths:
+ - compare-type: ANT
+ pattern: 'docs/**|.gitignore'
builders:
- shell: |
- echo "Hello world from copper"
+ echo "Nothing to verify!"
diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml
index 963e1fd73..7778ecc39 100644
--- a/jjb/doctor/doctor.yml
+++ b/jjb/doctor/doctor.yml
@@ -1,35 +1,54 @@
+###################################################
+# All the jobs except verify have been removed!
+# They will only be enabled on request by projects!
+###################################################
- project:
name: doctor
+
project: '{name}'
+
jobs:
- - '{project}-verify'
- - '{project}-merge-{stream}'
+ - 'doctor-verify-{stream}'
- # stream: branch with - in place of / (eg. stable-arno)
- # branch: branch (eg. stable/arno)
+# only master branch is enabled at the moment to keep no of jobs sane
stream:
- master:
branch: 'master'
+ gs-pathname: ''
+# - stable-brahmaputra:
+# branch: 'stable/brahmaputra'
+# gs-pathname: '/brahmaputra'
+
+- job_defaults: &doctor_job_defaults
+ name: doctor_job_defaults
-- job_defaults: &job_defaults
- name: job_defaults
parameters:
- project-parameter:
project: '{project}'
+ - gerrit-parameter:
+ branch: '{stream}'
- job-template:
- name: '{project}-verify'
- disabled: true
- <<: *job_defaults
+ name: 'doctor-verify-{stream}'
+
+ <<: *doctor_job_defaults
+
+ parameters:
+ - 'opnfv-build-defaults'
+
scm:
- gerrit-trigger-scm:
credentials-id: '{ssh-credentials}'
refspec: '$GERRIT_REFSPEC'
choosing-strategy: 'gerrit'
+
triggers:
- gerrit:
trigger-on:
- - patchset-created-event
+ - patchset-created-event:
+ exclude-drafts: 'false'
+ exclude-trivial-rebase: 'false'
+ exclude-no-code-change: 'false'
- draft-published-event
- comment-added-contains-event:
comment-contains-value: 'recheck'
@@ -39,33 +58,12 @@
- project-compare-type: 'ANT'
project-pattern: '{project}'
branches:
- - branch-compare-type: 'ANT'
- branch-pattern: '**'
- builders:
- - shell:
- !include-raw docu-build.sh
+ - branch-compare-type: 'ANT'
+ branch-pattern: '**/{stream}'
+ forbidden-file-paths:
+ - compare-type: ANT
+ pattern: 'docs/**|.gitignore'
-- job-template:
- name: '{project}-merge-{stream}'
- disabled: true
- <<: *job_defaults
- scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- choosing-strategy: 'default'
- triggers:
- - gerrit:
- trigger-on:
- - change-merged-event
- - comment-added-contains-event:
- comment-contains-value: 'remerge'
- projects:
- - project-compare-type: 'ANT'
- project-pattern: '{project}'
- branches:
- - branch-compare-type: 'ANT'
- branch-pattern: '**/{branch}'
builders:
- - shell:
- !include-raw docu-build.sh
+ - shell: |
+ echo "Nothing to verify!"
diff --git a/jjb/doctor/docu-build.sh b/jjb/doctor/docu-build.sh
deleted file mode 100644
index 2a253b555..000000000
--- a/jjb/doctor/docu-build.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/bash
-set -e
-set -o pipefail
-
-export PATH=$PATH:/usr/local/bin/
-
-echo
-echo "Build"
-echo "-----"
-echo
-
-make
-
-echo
-echo "Upload"
-echo "------"
-echo
-
-# NOTE: make sure source parameters for GS paths are not empty.
-[[ $GERRIT_CHANGE_NUMBER =~ .+ ]]
-[[ $GERRIT_PROJECT =~ .+ ]]
-[[ $GERRIT_BRANCH =~ .+ ]]
-
-gs_path_review="artifacts.opnfv.org/review/$GERRIT_CHANGE_NUMBER"
-if [[ $GERRIT_BRANCH = "master" ]] ; then
- gs_path_branch="artifacts.opnfv.org/$GERRIT_PROJECT"
-else
- gs_path_branch="artifacts.opnfv.org/$GERRIT_PROJECT/${{GERRIT_BRANCH##*/}}"
-fi
-
-if [[ $JOB_NAME =~ "verify" ]] ; then
- gsutil cp -r build/* "gs://$gs_path_review/"
- echo
- echo "Document is available at http://$gs_path_review"
-else
- if [ -e build/design_docs ]; then
- gsutil cp -r build/design_docs "gs://$gs_path_branch/"
- fi
- if [ -e build/requirements/html ]; then
- gsutil cp -r build/requirements/html "gs://$gs_path_branch/"
- fi
- if [ -e build/requirements/latex ]; then
- gsutil cp -r build/requirements/latex/*.pdf "gs://$gs_path_branch/"
- fi
- echo
- echo "Latest document is available at http://$gs_path_branch"
-
- if gsutil ls "gs://$gs_path_review" > /dev/null 2>&1 ; then
- echo
- echo "Deleting Out-of-dated Documents..."
- gsutil rm -r "gs://$gs_path_review"
- fi
-fi
diff --git a/jjb/dpacc/dpacc.yml b/jjb/dpacc/dpacc.yml
index 27f298c74..163275ffd 100644
--- a/jjb/dpacc/dpacc.yml
+++ b/jjb/dpacc/dpacc.yml
@@ -1,71 +1,41 @@
+###################################################
+# All the jobs except verify have been removed!
+# They will only be enabled on request by projects!
+###################################################
- project:
name: dpacc
+
+ project: '{name}'
+
jobs:
- - 'dpacc-test'
- - 'dpacc-daily-{stream}'
- - 'dpacc-merge'
- - 'dpacc-verify'
+ - 'dpacc-verify-{stream}'
- # stream: branch with - in place of / (eg. stable-helium)
- # branch: branch (eg. stable/helium)
+# only master branch is enabled at the moment to keep no of jobs sane
stream:
- master:
branch: 'master'
+ gs-pathname: ''
+# - stable-brahmaputra:
+# branch: 'stable/brahmaputra'
+# gs-pathname: '/brahmaputra'
- project: 'dpacc'
- somevar: 'foo'
-
-- job-template:
- name: dpacc-test
-
- builders:
- - shell: |
- echo "Hello world from dpacc"
-
-- job-template:
- name: 'dpacc-daily-{stream}'
-
- # Job template for daily builders
- #
- # Required Variables:
- # stream: branch with - in place of / (eg. stable)
- # branch: branch (eg. stable)
-
- varsetabove: '{somevar}'
+- job_defaults: &dpacc_job_defaults
+ name: dpacc_job_defaults
parameters:
- project-parameter:
project: '{project}'
-
- scm:
- - git-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- branch: '{branch}'
-
- triggers:
- - timed: 'H H * * *'
-
- prebuilders:
- - test-macro
-
- builders:
- - shell: |
- pwd
- find .
- echo "Hello world from dpacc {somevar} daily"
-
- postbuilders:
- - test-macro
+ - gerrit-parameter:
+ branch: '{stream}'
- job-template:
- name: 'dpacc-verify'
+ name: 'dpacc-verify-{stream}'
+
+ <<: *dpacc_job_defaults
parameters:
- - project-parameter:
- project: '{project}'
- - gerrit-parameter:
- branch: 'master'
+ - 'opnfv-build-defaults'
+
scm:
- gerrit-trigger-scm:
credentials-id: '{ssh-credentials}'
@@ -86,51 +56,14 @@
comment-contains-value: 'reverify'
projects:
- project-compare-type: 'ANT'
- project-pattern: 'dpacc'
+ project-pattern: '{project}'
branches:
- branch-compare-type: 'ANT'
- branch-pattern: '**/master'
-
- builders:
- - shell: |
- pwd
- find .
- echo "verify logic goes here"
-
-- job-template:
- name: 'dpacc-merge'
-
- # builder-merge job to run JJB update
- #
- # This job's purpose is to update all the JJB
-
- parameters:
- - project-parameter:
- project: '{project}'
- - gerrit-parameter:
- branch: 'master'
-
- scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- choosing-strategy: 'default'
-
- triggers:
- - gerrit:
- trigger-on:
- - change-merged-event
- - comment-added-contains-event:
- comment-contains-value: 'remerge'
- projects:
- - project-compare-type: 'ANT'
- project-pattern: 'dpacc'
- branches:
- - branch-compare-type: 'ANT'
- branch-pattern: '**/master'
+ branch-pattern: '**/{stream}'
+ forbidden-file-paths:
+ - compare-type: ANT
+ pattern: 'docs/**|.gitignore'
builders:
- shell: |
- pwd
- find .
- echo "merge logic goes here"
+ echo "Nothing to verify!"
diff --git a/jjb/fastpathmetrics/fastpathmetrics.yml b/jjb/fastpathmetrics/fastpathmetrics.yml
index fbe8f0bd2..6bbb344b0 100644
--- a/jjb/fastpathmetrics/fastpathmetrics.yml
+++ b/jjb/fastpathmetrics/fastpathmetrics.yml
@@ -1,71 +1,41 @@
+###################################################
+# All the jobs except verify have been removed!
+# They will only be enabled on request by projects!
+###################################################
- project:
name: fastpathmetrics
+
+ project: '{name}'
+
jobs:
- - 'fastpathmetrics-test'
- - 'fastpathmetrics-daily-{stream}'
- - 'fastpathmetrics-merge'
- - 'fastpathmetrics-verify'
+ - 'fastpathmetrics-verify-{stream}'
- # stream: branch with - in place of / (eg. stable-helium)
- # branch: branch (eg. stable/helium)
+# only master branch is enabled at the moment to keep no of jobs sane
stream:
- master:
branch: 'master'
+ gs-pathname: ''
+# - stable-brahmaputra:
+# branch: 'stable/brahmaputra'
+# gs-pathname: '/brahmaputra'
- project: 'fastpathmetrics'
- somevar: 'foo'
-
-- job-template:
- name: fastpathmetrics-test
-
- builders:
- - shell: |
- echo "Hello world from fastpathmetrics"
-
-- job-template:
- name: 'fastpathmetrics-daily-{stream}'
-
- # Job template for daily builders
- #
- # Required Variables:
- # stream: branch with - in place of / (eg. stable)
- # branch: branch (eg. stable)
-
- varsetabove: '{somevar}'
+- job_defaults: &fastpathmetrics_job_defaults
+ name: fastpathmetrics_job_defaults
parameters:
- project-parameter:
project: '{project}'
-
- scm:
- - git-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- branch: '{branch}'
-
- triggers:
- - timed: 'H H * * *'
-
- prebuilders:
- - test-macro
-
- builders:
- - shell: |
- pwd
- find .
- echo "Hello world from fastpathmetrics {somevar} daily"
-
- postbuilders:
- - test-macro
+ - gerrit-parameter:
+ branch: '{stream}'
- job-template:
- name: 'fastpathmetrics-verify'
+ name: 'fastpathmetrics-verify-{stream}'
+
+ <<: *fastpathmetrics_job_defaults
parameters:
- - project-parameter:
- project: '{project}'
- - gerrit-parameter:
- branch: 'master'
+ - 'opnfv-build-defaults'
+
scm:
- gerrit-trigger-scm:
credentials-id: '{ssh-credentials}'
@@ -86,52 +56,14 @@
comment-contains-value: 'reverify'
projects:
- project-compare-type: 'ANT'
- project-pattern: 'fastpathmetrics'
+ project-pattern: '{project}'
branches:
- branch-compare-type: 'ANT'
- branch-pattern: '**/master'
-
- builders:
- - shell: |
- pwd
- find .
- echo "verify logic goes here"
-
-- job-template:
- name: 'fastpathmetrics-merge'
-
- # builder-merge job to run JJB update
- #
- # This job's purpose is to update all the JJB
-
- parameters:
- - project-parameter:
- project: '{project}'
- - gerrit-parameter:
- branch: 'master'
-
- scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- choosing-strategy: 'default'
-
- triggers:
- - gerrit:
- trigger-on:
- - change-merged-event
- - comment-added-contains-event:
- comment-contains-value: 'remerge'
- projects:
- - project-compare-type: 'ANT'
- project-pattern: 'fastpathmetrics'
- branches:
- - branch-compare-type: 'ANT'
- branch-pattern: '**/master'
+ branch-pattern: '**/{stream}'
+ forbidden-file-paths:
+ - compare-type: ANT
+ pattern: 'docs/**|.gitignore'
builders:
- shell: |
- pwd
- find .
- echo "merge logic goes here"
-
+ echo "Nothing to verify!"
diff --git a/jjb/functest/functest.yml b/jjb/functest/functest.yml
index d1e8f262c..312e4dcee 100644
--- a/jjb/functest/functest.yml
+++ b/jjb/functest/functest.yml
@@ -55,8 +55,6 @@
- 'functest-odl-test-{pod}'
- 'functest-vims-{installer}-{stream}'
- 'functest-vping-test-{pod}'
- - 'functest-daily-{stream}'
- - 'functest-merge-{stream}'
- 'functest-verify-{stream}'
# stream: branch with - in place of / (eg. stable-arno)
@@ -236,42 +234,6 @@
- 'functest-vims'
- job-template:
- name: 'functest-daily-{stream}'
-
- # Job template for daily builders
- #
- # Required Variables:
- # stream: branch with - in place of / (eg. stable)
- # branch: branch (eg. stable)
-
- varsetabove: '{somevar}'
-
- parameters:
- - project-parameter:
- project: '{project}'
- - functest-parameter:
- gs-pathname: '{gs-pathname}'
-
- scm:
- - git-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- branch: '{stream}'
-
- triggers:
- - 'functest-{stream}'
-
- prebuilders:
- - test-macro
-
- builders:
- - shell:
- !include-raw ../opnfvdocs/docu-build.sh
-
- postbuilders:
- - test-macro
-
-- job-template:
name: 'functest-verify-{stream}'
parameters:
@@ -305,44 +267,8 @@
branch-pattern: '**/{branch}'
builders:
- - shell:
- echo "Hello World"
-
-- job-template:
- name: 'functest-merge-{stream}'
-
- # builder-merge job to run JJB update
- #
- # This job's purpose is to update all the JJB
-
- parameters:
- - project-parameter:
- project: '{project}'
- - gerrit-parameter:
- branch: '{branch}'
-
- scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- choosing-strategy: 'default'
-
- triggers:
- - gerrit:
- trigger-on:
- - change-merged-event
- - comment-added-contains-event:
- comment-contains-value: 'remerge'
- projects:
- - project-compare-type: 'ANT'
- project-pattern: 'functest'
- branches:
- - branch-compare-type: 'ANT'
- branch-pattern: '**/{branch}'
-
- builders:
- - shell:
- !include-raw ../opnfvdocs/docu-build.sh
+ - shell: |
+ echo "Nothing to verify!"
########################
# parameter macros
diff --git a/jjb/genesis/docu-build.sh b/jjb/genesis/docu-build.sh
deleted file mode 100644
index 52e380663..000000000
--- a/jjb/genesis/docu-build.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-set -e
-set -o pipefail
-
-export PATH=$PATH:/usr/local/bin/
-
-echo
-echo "Build"
-echo "-----"
-echo
-
-#make
-
-echo
-echo "Upload"
-echo "------"
-echo
-
-echo "document generation disabled"
-
-## NOTE: make sure source parameters for GS paths are not empty.
-#[[ $GERRIT_CHANGE_NUMBER =~ .+ ]]
-#[[ $GERRIT_PROJECT =~ .+ ]]
-#[[ $GERRIT_BRANCH =~ .+ ]]
-#
-#gs_path_review="artifacts.opnfv.org/review/$GERRIT_CHANGE_NUMBER"
-#if [[ $GERRIT_BRANCH = "master" ]] ; then
-# gs_path_branch="artifacts.opnfv.org/$GERRIT_PROJECT"
-#else
-# gs_path_branch="artifacts.opnfv.org/$GERRIT_PROJECT/${{GERRIT_BRANCH##*/}}"
-#fi
-#
-#if [[ $JOB_NAME =~ "verify" ]] ; then
-# gsutil cp -r build/* "gs://$gs_path_review/"
-# echo
-# echo "Document is available at http://$gs_path_review"
-#else
-# gsutil cp -r build/design_docs "gs://$gs_path_branch/"
-# gsutil cp -r build/requirements/html "gs://$gs_path_branch/"
-# gsutil cp -r build/requirements/latex/*.pdf "gs://$gs_path_branch/"
-# echo
-# echo "Latest document is available at http://$gs_path_branch"
-#
-# if gsutil ls "gs://$gs_path_review" > /dev/null 2>&1 ; then
-# echo
-# echo "Deleting Out-of-dated Documents..."
-# gsutil rm -r "gs://$gs_path_review"
-# fi
-#fi
diff --git a/jjb/genesis/genesis-docs.yml b/jjb/genesis/genesis-docs.yml
deleted file mode 100644
index fa8b35aed..000000000
--- a/jjb/genesis/genesis-docs.yml
+++ /dev/null
@@ -1,135 +0,0 @@
-# this is the job configuration for bgs
-- project:
-
- name: genesis-docs
-
- jobs:
- - 'genesis-merge-docs-{stream}'
- - 'genesis-verify-docs-{stream}'
-
- # stream: branch with - in place of / (eg. stable-helium)
- # branch: branch (eg. stable/helium)
- stream:
- - master:
- branch: 'master'
- gs-pathname: ''
- - stable-arno:
- branch: 'stable/arno'
- gs-pathname: '/arno'
-
- project: 'genesis'
-
-########################
-# job templates
-########################
-- job-template:
- name: 'genesis-merge-docs-{stream}'
-
- node: gce-opnfv-docker-1
-
- parameters:
- - project-parameter:
- project: '{project}'
- - gerrit-parameter:
- branch: '{branch}'
- - string:
- name: GS_PATHNAME
- default: '{gs-pathname}'
- description: "Version directory where the octopus will be stored in gs repository"
-
- scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- choosing-strategy: 'default'
-
- triggers:
- - gerrit:
- trigger-on:
- - change-merged-event
- - comment-added-contains-event:
- comment-contains-value: 'remerge'
- projects:
- - project-compare-type: 'ANT'
- project-pattern: 'genesis'
- branches:
- - branch-compare-type: 'ANT'
- branch-pattern: '**/{branch}'
- file-paths:
- - compare-type: ANT
- pattern: 'common/docs/**'
- - compare-type: ANT
- pattern: '**/docs/**'
- forbidden-file-paths:
- - compare-type: ANT
- pattern: '**/build/**'
- - compare-type: ANT
- pattern: '**/ci/**'
- - compare-type: ANT
- pattern: '**/deploy/**'
- - compare-type: ANT
- pattern: '**/include/**'
- - compare-type: ANT
- pattern: '**/prototypes/**'
-
- builders:
- - shell:
- !include-raw ../opnfvdocs/docu-build.sh
-
-- job-template:
- name: 'genesis-verify-docs-{stream}'
-
- node: gce-opnfv-docker-1
-
- parameters:
- - project-parameter:
- project: '{project}'
- - gerrit-parameter:
- branch: '{branch}'
-
- scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
-
- triggers:
- - gerrit:
- trigger-on:
- - patchset-created-event:
- exclude-drafts: 'false'
- exclude-trivial-rebase: 'false'
- exclude-no-code-change: 'false'
- - draft-published-event
- - comment-added-contains-event:
- comment-contains-value: 'recheck'
- - comment-added-contains-event:
- comment-contains-value: 'reverify'
-
- projects:
- - project-compare-type: 'ANT'
- project-pattern: 'genesis'
- branches:
- - branch-compare-type: 'ANT'
- branch-pattern: '**/{branch}'
- file-paths:
- - compare-type: ANT
- pattern: 'common/docs/**'
- - compare-type: ANT
- pattern: '**/docs/**'
- forbidden-file-paths:
- - compare-type: ANT
- pattern: '**/build/**'
- - compare-type: ANT
- pattern: '**/ci/**'
- - compare-type: ANT
- pattern: '**/deploy/**'
- - compare-type: ANT
- pattern: '**/include/**'
- - compare-type: ANT
- pattern: '**/prototypes/**'
-
- builders:
- - shell:
- !include-raw ../opnfvdocs/docu-build.sh
-
diff --git a/jjb/ipv6/ipv6.yml b/jjb/ipv6/ipv6.yml
index 13ea0541b..7ec58536b 100644
--- a/jjb/ipv6/ipv6.yml
+++ b/jjb/ipv6/ipv6.yml
@@ -1,71 +1,41 @@
+###################################################
+# All the jobs except verify have been removed!
+# They will only be enabled on request by projects!
+###################################################
- project:
name: ipv6
+
+ project: '{name}'
+
jobs:
- - 'ipv6-test'
- - 'ipv6-daily-{stream}'
- - 'ipv6-merge'
- - 'ipv6-verify'
+ - 'ipv6-verify-{stream}'
- # stream: branch with - in place of / (eg. stable-helium)
- # branch: branch (eg. stable/helium)
+# only master branch is enabled at the moment to keep no of jobs sane
stream:
- master:
branch: 'master'
+ gs-pathname: ''
+# - stable-brahmaputra:
+# branch: 'stable/brahmaputra'
+# gs-pathname: '/brahmaputra'
- project: 'ipv6'
- somevar: 'foo'
-
-- job-template:
- name: ipv6-test
-
- builders:
- - shell: |
- echo "Hello world from ipv6"
-
-- job-template:
- name: 'ipv6-daily-{stream}'
-
- # Job template for daily builders
- #
- # Required Variables:
- # stream: branch with - in place of / (eg. stable)
- # branch: branch (eg. stable)
-
- varsetabove: '{somevar}'
+- job_defaults: &ipv6_job_defaults
+ name: ipv6_job_defaults
parameters:
- project-parameter:
project: '{project}'
-
- scm:
- - git-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- branch: '{branch}'
-
- triggers:
- - timed: 'H H * * *'
-
- prebuilders:
- - test-macro
-
- builders:
- - shell: |
- pwd
- find .
- echo "Hello world from ipv6 {somevar} daily"
-
- postbuilders:
- - test-macro
+ - gerrit-parameter:
+ branch: '{stream}'
- job-template:
- name: 'ipv6-verify'
+ name: 'ipv6-verify-{stream}'
+
+ <<: *ipv6_job_defaults
parameters:
- - project-parameter:
- project: '{project}'
- - gerrit-parameter:
- branch: 'master'
+ - 'opnfv-build-defaults'
+
scm:
- gerrit-trigger-scm:
credentials-id: '{ssh-credentials}'
@@ -86,52 +56,14 @@
comment-contains-value: 'reverify'
projects:
- project-compare-type: 'ANT'
- project-pattern: 'ipv6'
+ project-pattern: '{project}'
branches:
- branch-compare-type: 'ANT'
- branch-pattern: '**/master'
-
- builders:
- - shell: |
- pwd
- find .
- echo "verify logic goes here"
-
-- job-template:
- name: 'ipv6-merge'
-
- # builder-merge job to run JJB update
- #
- # This job's purpose is to update all the JJB
-
- parameters:
- - project-parameter:
- project: '{project}'
- - gerrit-parameter:
- branch: 'master'
-
- scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- choosing-strategy: 'default'
-
- triggers:
- - gerrit:
- trigger-on:
- - change-merged-event
- - comment-added-contains-event:
- comment-contains-value: 'remerge'
- projects:
- - project-compare-type: 'ANT'
- project-pattern: 'ipv6'
- branches:
- - branch-compare-type: 'ANT'
- branch-pattern: '**/master'
+ branch-pattern: '**/{stream}'
+ forbidden-file-paths:
+ - compare-type: ANT
+ pattern: 'docs/**|.gitignore'
builders:
- shell: |
- pwd
- find .
- echo "merge logic goes here"
-
+ echo "Nothing to verify!"
diff --git a/jjb/octopus/octopus.yml b/jjb/octopus/octopus.yml
index ed452a6bb..d61fa1033 100644
--- a/jjb/octopus/octopus.yml
+++ b/jjb/octopus/octopus.yml
@@ -3,79 +3,38 @@
################################
- project:
name: octopus
+
+ project: '{name}'
+
jobs:
- - 'octopus-test'
- - 'octopus-daily-{stream}'
- - 'octopus-merge-{stream}'
- 'octopus-verify-{stream}'
- # stream: branch with - in place of / (eg. stable-arno)
- # branch: branch (eg. stable/arno)
+# only master branch is enabled at the moment to keep no of jobs sane
stream:
- master:
branch: 'master'
gs-pathname: ''
- - stable-arno:
- branch: 'stable/arno'
- gs-pathname: '/arno'
-
- project: 'octopus'
- somevar: 'foo'
-###############################
-# job templates
-###############################
-
-- job-template:
- name: octopus-test
-
- builders:
- - shell: |
- echo "Hello world from octopus"
-
-- job-template:
- name: 'octopus-daily-{stream}'
-
- # Job template for daily builders
- #
- # Required Variables:
- # stream: branch with - in place of / (eg. stable)
- # branch: branch (eg. stable)
+# - stable-brahmaputra:
+# branch: 'stable/brahmaputra'
+# gs-pathname: '/brahmaputra'
- varsetabove: '{somevar}'
+- job_defaults: &octopus_job_defaults
+ name: octopus_job_defaults
parameters:
- project-parameter:
project: '{project}'
- - octopus-parameter:
- gs-pathname: '{gs-pathname}'
-
- scm:
- - git-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- branch: '{branch}'
-
- triggers:
- - 'octopus-{stream}'
-
- prebuilders:
- - test-macro
-
- builders:
- - shell:
- !include-raw ../opnfvdocs/docu-build.sh
-
- postbuilders:
- - test-macro
+ - gerrit-parameter:
+ branch: '{stream}'
- job-template:
name: 'octopus-verify-{stream}'
+ <<: *octopus_job_defaults
+
parameters:
- - project-parameter:
- project: '{project}'
- - gerrit-parameter:
- branch: '{branch}'
+ - 'opnfv-build-defaults'
+
scm:
- gerrit-trigger-scm:
credentials-id: '{ssh-credentials}'
@@ -96,71 +55,14 @@
comment-contains-value: 'reverify'
projects:
- project-compare-type: 'ANT'
- project-pattern: 'octopus'
+ project-pattern: '{project}'
branches:
- branch-compare-type: 'ANT'
- branch-pattern: '**/{branch}'
+ branch-pattern: '**/{stream}'
+ forbidden-file-paths:
+ - compare-type: ANT
+ pattern: 'docs/**|.gitignore'
builders:
- - shell:
- !include-raw ../opnfvdocs/docu-build.sh
-
-- job-template:
- name: 'octopus-merge-{stream}'
-
- # builder-merge job to run JJB update
- #
- # This job's purpose is to update all the JJB
-
- parameters:
- - project-parameter:
- project: '{project}'
- - gerrit-parameter:
- branch: '{branch}'
-
- scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- choosing-strategy: 'default'
-
- triggers:
- - gerrit:
- trigger-on:
- - change-merged-event
- - comment-added-contains-event:
- comment-contains-value: 'remerge'
- projects:
- - project-compare-type: 'ANT'
- project-pattern: 'octopus'
- branches:
- - branch-compare-type: 'ANT'
- branch-pattern: '**/{branch}'
-
- builders:
- - shell:
- !include-raw ../opnfvdocs/docu-build.sh
-
-########################
-## parameter macros
-#########################
-- parameter:
- name: octopus-parameter
- parameters:
- - string:
- name: GS_PATHNAME
- default: '{gs-pathname}'
- description: "Version directory where the octopus will be stored in gs repository"
-
-#########################
-## trigger macros
-#########################
-- trigger:
- name: 'octopus-master'
- triggers:
- - pollscm: "H 7 * * *"
-
-- trigger:
- name: 'octopus-stable-arno'
- triggers:
- - pollscm: "H 19 * * *"
+ - shell: |
+ echo "Nothing to verify!"
diff --git a/jjb/opnfv/opnfv-docs.yml b/jjb/opnfv/opnfv-docs.yml
index 841ce2e3d..6c6b91532 100644
--- a/jjb/opnfv/opnfv-docs.yml
+++ b/jjb/opnfv/opnfv-docs.yml
@@ -8,8 +8,8 @@
project: opnfv-docs
jobs:
- - 'opnfv-docs-verify'
- - 'opnfv-docs-merge'
+ - 'opnfv-docs-verify-{stream}'
+ - 'opnfv-docs-merge-{stream}'
# stream: branch with - in place of / (eg. stable-arno)
# branch: branch (eg. stable/arno)
@@ -22,7 +22,7 @@
########################
- job-template:
- name: 'opnfv-docs-verify'
+ name: 'opnfv-docs-verify-{stream}'
parameters:
- project-parameter:
@@ -63,7 +63,7 @@
- upload-review-docs
- job-template:
- name: 'opnfv-docs-merge'
+ name: 'opnfv-docs-merge-{stream}'
parameters:
- project-parameter:
diff --git a/jjb/opnfv/pod-params.yml b/jjb/opnfv/pod-params.yml
index 3fdf01356..6a2650667 100644
--- a/jjb/opnfv/pod-params.yml
+++ b/jjb/opnfv/pod-params.yml
@@ -190,6 +190,23 @@
description: 'Git URL to use on the jumphost'
- parameter:
+ name: 'opnfv-build-defaults'
+ parameters:
+ - node:
+ name: SLAVE_NAME
+ description: 'Slave name on Jenkins'
+ allowed-slaves:
+ - intel-us-build-1
+ - ericsson-ca-build-1
+ default-slaves:
+ - intel-us-build-1
+ - ericsson-ca-build-1
+ - string:
+ name: GIT_BASE
+ default: https://gerrit.opnfv.org/gerrit/$PROJECT
+ description: 'Git URL to use on the slave'
+
+- parameter:
name: 'intel-us-build-1-defaults'
parameters:
- node:
diff --git a/jjb/opnfvdocs/docu-build.sh b/jjb/opnfvdocs/docu-build.sh
deleted file mode 100644
index 8681190e2..000000000
--- a/jjb/opnfvdocs/docu-build.sh
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/bin/bash
-set -e
-set -o pipefail
-
-project="$(git remote -v | head -n1 | awk '{{print $2}}' | sed -e 's,.*:\(.*/\)\?,,' -e 's/\.git$//')"
-export PATH=$PATH:/usr/local/bin/
-
-git_sha1="$(git rev-parse HEAD)"
-docu_build_date="$(date)"
-
-if [[ $JOB_NAME =~ "verify" ]] ; then
- subdir="/$GERRIT_CHANGE_NUMBER"
-else
- subdir="$GS_PATHNAME"
-fi
-
-files=()
-while read -r -d ''; do
- files+=("$REPLY")
-done < <(find * -type f -iname '*.rst' -print0)
-
-for file in "${{files[@]}}"; do
-
- file_cut="${{file%.*}}"
- gs_cp_folder="${{file_cut}}"
-
- # sed part
- sed -i "s/_sha1_/$git_sha1/g" $file
- sed -i "s/_date_/$docu_build_date/g" $file
-
- # rst2html part
- echo "rst2html $file"
- rst2html $file | gsutil cp -L gsoutput.txt - \
- 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""$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""$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""$subdir"/"$gs_cp_folder".pdf
- cat gsoutput.txt
- rm -f gsoutput.txt
-
- 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
-
-images=()
-while read -r -d ''; do
- images+=("$REPLY")
-done < <(find * -type f \( -iname \*.jpg -o -iname \*.png \) -print0)
-
-for img in "${{images[@]}}"; do
-
- # uploading found images
- echo "uploading $img"
- cat "$img" | gsutil cp -L gsoutput.txt - \
- 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""$subdir"/"$img"
- cat gsoutput.txt
- rm -f gsoutput.txt
-
-done
-
-if [[ $GERRIT_EVENT_TYPE = "change-merged" ]] ; then
- subdir="/$GERRIT_CHANGE_NUMBER"
- if [ ! -z "$subdir" ]; then
- gsutil rm gs://artifacts.opnfv.org/"$project""$subdir"/** || true
- fi
-fi
-
-echo -e "$links"
-
diff --git a/jjb/oscar/oscar.yml b/jjb/oscar/oscar.yml
index df5016037..380c90197 100644
--- a/jjb/oscar/oscar.yml
+++ b/jjb/oscar/oscar.yml
@@ -1,71 +1,41 @@
+###################################################
+# All the jobs except verify have been removed!
+# They will only be enabled on request by projects!
+###################################################
- project:
name: oscar
+
+ project: '{name}'
+
jobs:
- - 'oscar-test'
- - 'oscar-daily-{stream}'
- - 'oscar-merge'
- - 'oscar-verify'
+ - 'oscar-verify-{stream}'
- # stream: branch with - in place of / (eg. stable-helium)
- # branch: branch (eg. stable/helium)
+# only master branch is enabled at the moment to keep no of jobs sane
stream:
- master:
branch: 'master'
+ gs-pathname: ''
+# - stable-brahmaputra:
+# branch: 'stable/brahmaputra'
+# gs-pathname: '/brahmaputra'
- project: 'oscar'
- somevar: 'foo'
-
-- job-template:
- name: oscar-test
-
- builders:
- - shell: |
- echo "Hello world from oscar"
-
-- job-template:
- name: 'oscar-daily-{stream}'
-
- # Job template for daily builders
- #
- # Required Variables:
- # stream: branch with - in place of / (eg. stable)
- # branch: branch (eg. stable)
-
- varsetabove: '{somevar}'
+- job_defaults: &oscar_job_defaults
+ name: oscar_job_defaults
parameters:
- project-parameter:
project: '{project}'
-
- scm:
- - git-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- branch: '{branch}'
-
- triggers:
- - timed: 'H H * * *'
-
- prebuilders:
- - test-macro
-
- builders:
- - shell: |
- pwd
- find .
- echo "Hello world from oscar {somevar} daily"
-
- postbuilders:
- - test-macro
+ - gerrit-parameter:
+ branch: '{stream}'
- job-template:
- name: 'oscar-verify'
+ name: 'oscar-verify-{stream}'
+
+ <<: *oscar_job_defaults
parameters:
- - project-parameter:
- project: '{project}'
- - gerrit-parameter:
- branch: 'master'
+ - 'opnfv-build-defaults'
+
scm:
- gerrit-trigger-scm:
credentials-id: '{ssh-credentials}'
@@ -86,51 +56,14 @@
comment-contains-value: 'reverify'
projects:
- project-compare-type: 'ANT'
- project-pattern: 'oscar'
+ project-pattern: '{project}'
branches:
- branch-compare-type: 'ANT'
- branch-pattern: '**/master'
-
- builders:
- - shell: |
- pwd
- find .
- echo "verify logic goes here"
-
-- job-template:
- name: 'oscar-merge'
-
- # builder-merge job to run JJB update
- #
- # This job's purpose is to update all the JJB
-
- parameters:
- - project-parameter:
- project: '{project}'
- - gerrit-parameter:
- branch: 'master'
-
- scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- choosing-strategy: 'default'
-
- triggers:
- - gerrit:
- trigger-on:
- - change-merged-event
- - comment-added-contains-event:
- comment-contains-value: 'remerge'
- projects:
- - project-compare-type: 'ANT'
- project-pattern: 'oscar'
- branches:
- - branch-compare-type: 'ANT'
- branch-pattern: '**/master'
+ branch-pattern: '**/{stream}'
+ forbidden-file-paths:
+ - compare-type: ANT
+ pattern: 'docs/**|.gitignore'
builders:
- shell: |
- pwd
- find .
- echo "merge logic goes here"
+ echo "Nothing to verify!"
diff --git a/jjb/ovsnfv/ovsnfv.yml b/jjb/ovsnfv/ovsnfv.yml
index 6769f682a..83bab98b3 100644
--- a/jjb/ovsnfv/ovsnfv.yml
+++ b/jjb/ovsnfv/ovsnfv.yml
@@ -1,30 +1,31 @@
- project:
name: ovsnfv
+
+ project: '{name}'
+
jobs:
- 'ovsnfv-verify-{stream}'
- 'ovsnfv-merge-{stream}'
- 'ovsnfv-daily-{stream}'
+# only master branch is enabled at the moment to keep no of jobs sane
stream:
- master:
branch: 'master'
-
- project: 'ovsnfv'
+ gs-pathname: ''
+# - stable-brahmaputra:
+# branch: 'stable/brahmaputra'
+# gs-pathname: '/brahmaputra'
- job-template:
name: 'ovsnfv-verify-{stream}'
- node: opnfv-build
-
parameters:
- project-parameter:
project: '{project}'
- gerrit-parameter:
branch: 'master'
- - string:
- name: GIT_BASE
- default: https://gerrit.opnfv.org/gerrit/$PROJECT
- description: "Used for overriding the GIT URL coming from Global Jenkins configuration in case if the stuff is done on none-LF HW."
+ - 'intel-us-build-2-defaults'
scm:
- gerrit-trigger-scm:
@@ -64,17 +65,12 @@
- job-template:
name: 'ovsnfv-merge-{stream}'
- node: opnfv-build
-
parameters:
- project-parameter:
project: '{project}'
- gerrit-parameter:
branch: 'master'
- - string:
- name: GIT_BASE
- default: https://gerrit.opnfv.org/gerrit/$PROJECT
- description: "Used for overriding the GIT URL coming from Global Jenkins configuration in case if the stuff is done on none-LF HW."
+ - 'intel-us-build-2-defaults'
scm:
- gerrit-trigger-scm:
@@ -108,17 +104,10 @@
- job-template:
name: 'ovsnfv-daily-{stream}'
- node: opnfv-build
-
- disabled: true
-
parameters:
- project-parameter:
project: '{project}'
- - string:
- name: GIT_BASE
- default: https://gerrit.opnfv.org/gerrit/$PROJECT
- description: "Used for overriding the GIT URL coming from Global Jenkins configuration in case if the stuff is done on none-LF HW."
+ - 'intel-us-build-2-defaults'
scm:
- git-scm:
diff --git a/jjb/parser/docu-build.sh b/jjb/parser/docu-build.sh
deleted file mode 100644
index 057cc97d1..000000000
--- a/jjb/parser/docu-build.sh
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/bin/bash
-set -e
-set -o pipefail
-
-project="$(git remote -v | head -n1 | awk '{{print $2}}' | sed -e 's,.*:\(.*/\)\?,,' -e 's/\.git$//')"
-export PATH=$PATH:/usr/local/bin/
-
-git_sha1="$(git rev-parse HEAD)"
-docu_build_date="$(date)"
-
-if [[ $JOB_NAME =~ "verify" ]] ; then
- patchset="/$GERRIT_CHANGE_NUMBER"
-fi
-
-files=()
-while read -r -d ''; do
- files+=("$REPLY")
-done < <(find * -type f -iname '*.rst' -print0)
-
-for file in "${{files[@]}}"; do
-
- file_cut="${{file%.*}}"
- gs_cp_folder="${{file_cut}}"
-
- # sed part
- sed -i "s/_sha1_/$git_sha1/g" $file
- sed -i "s/_date_/$docu_build_date/g" $file
-
- # rst2html part
- echo "rst2html $file"
- rst2html $file | gsutil cp -L gsoutput.txt - \
- gs://artifacts.opnfv.org/"$project""$patchset"/"$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
- 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
- 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
- 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"
-
-done
-
-images=()
-while read -r -d ''; do
- images+=("$REPLY")
-done < <(find * -type f \( -iname \*.jpg -o -iname \*.png \) -print0)
-
-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"
- gsutil setmeta -h "Content-Type:image/jpeg" \
- -h "Cache-Control:private, max-age=0, no-transform" \
- gs://artifacts.opnfv.org/"$project""$patchset"/"$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
- fi
-fi
-
-echo -e "$links"
-
diff --git a/jjb/parser/parser.yml b/jjb/parser/parser.yml
index 80c4b761f..1df8b2fc6 100644
--- a/jjb/parser/parser.yml
+++ b/jjb/parser/parser.yml
@@ -1,69 +1,41 @@
+###################################################
+# All the jobs except verify have been removed!
+# They will only be enabled on request by projects!
+###################################################
- project:
name: parser
+
+ project: '{name}'
+
jobs:
- - 'parser-test'
- - 'parser-daily-{stream}'
- - 'parser-merge'
- - 'parser-verify'
+ - 'parser-verify-{stream}'
- # stream: branch with - in place of / (eg. stable-helium)
- # branch: branch (eg. stable/helium)
+# only master branch is enabled at the moment to keep no of jobs sane
stream:
- master:
branch: 'master'
+ gs-pathname: ''
+# - stable-brahmaputra:
+# branch: 'stable/brahmaputra'
+# gs-pathname: '/brahmaputra'
- project: 'parser'
- somevar: 'foo'
-
-- job-template:
- name: parser-test
-
- builders:
- - shell: |
- echo "Hello world from parser"
-
-- job-template:
- name: 'parser-daily-{stream}'
-
- # Job template for daily builders
- #
- # Required Variables:
- # stream: branch with - in place of / (eg. stable)
- # branch: branch (eg. stable)
-
- varsetabove: '{somevar}'
+- job_defaults: &parser_job_defaults
+ name: parser_job_defaults
parameters:
- project-parameter:
project: '{project}'
-
- scm:
- - git-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- branch: '{branch}'
-
- triggers:
- - timed: 'H H * * *'
-
- prebuilders:
- - test-macro
-
- builders:
- - shell:
- !include-raw docu-build.sh
-
- postbuilders:
- - test-macro
+ - gerrit-parameter:
+ branch: '{stream}'
- job-template:
- name: 'parser-verify'
+ name: 'parser-verify-{stream}'
+
+ <<: *parser_job_defaults
parameters:
- - project-parameter:
- project: '{project}'
- - gerrit-parameter:
- branch: 'master'
+ - 'opnfv-build-defaults'
+
scm:
- gerrit-trigger-scm:
credentials-id: '{ssh-credentials}'
@@ -84,48 +56,14 @@
comment-contains-value: 'reverify'
projects:
- project-compare-type: 'ANT'
- project-pattern: 'parser'
+ project-pattern: '{project}'
branches:
- branch-compare-type: 'ANT'
- branch-pattern: '**/master'
+ branch-pattern: '**/{stream}'
+ forbidden-file-paths:
+ - compare-type: ANT
+ pattern: 'docs/**|.gitignore'
builders:
- shell: |
- echo "Hello world from parser"
-
-- job-template:
- name: 'parser-merge'
-
- # builder-merge job to run JJB update
- #
- # This job's purpose is to update all the JJB
-
- parameters:
- - project-parameter:
- project: '{project}'
- - gerrit-parameter:
- branch: 'master'
-
- scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- choosing-strategy: 'default'
-
- triggers:
- - gerrit:
- trigger-on:
- - change-merged-event
- - comment-added-contains-event:
- comment-contains-value: 'remerge'
- projects:
- - project-compare-type: 'ANT'
- project-pattern: 'parser'
- branches:
- - branch-compare-type: 'ANT'
- branch-pattern: '**/master'
-
- builders:
- - shell:
- !include-raw docu-build.sh
-
+ echo "Nothing to verify!"
diff --git a/jjb/pharos/pharos.yml b/jjb/pharos/pharos.yml
index 92890df1e..2108ccd4d 100644
--- a/jjb/pharos/pharos.yml
+++ b/jjb/pharos/pharos.yml
@@ -1,73 +1,41 @@
-#################################
-# job configuration for pharos
-#################################
+###################################################
+# All the jobs except verify have been removed!
+# They will only be enabled on request by projects!
+###################################################
- project:
name: pharos
+
+ project: '{name}'
+
jobs:
- - 'pharos-daily-{stream}'
- - 'pharos-merge-{stream}'
- 'pharos-verify-{stream}'
- - 'pharos-maas-pilot-{stream}'
- # stream: branch with - in place of / (eg. stable-arno)
- # branch: branch (eg. stable/arno)
+# only master branch is enabled at the moment to keep no of jobs sane
stream:
- master:
branch: 'master'
gs-pathname: ''
- - stable-arno:
- branch: 'stable/arno'
- gs-pathname: '/arno'
-
- project: 'pharos'
- somevar: 'foo'
-##############################
-# job template
-##############################
-- job-template:
- name: 'pharos-daily-{stream}'
+# - stable-brahmaputra:
+# branch: 'stable/brahmaputra'
+# gs-pathname: '/brahmaputra'
- # Job template for daily builders
- #
- # Required Variables:
- # stream: branch with - in place of / (eg. stable)
- # branch: branch (eg. stable)
-
- varsetabove: '{somevar}'
+- job_defaults: &pharos_job_defaults
+ name: pharos_job_defaults
parameters:
- project-parameter:
project: '{project}'
- - pharos-parameter:
- gs-pathname: '{gs-pathname}'
-
- scm:
- - git-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- branch: '{branch}'
-
- triggers:
- - 'pharos-{stream}'
-
- prebuilders:
- - test-macro
-
- builders:
- - shell:
- !include-raw ../opnfvdocs/docu-build.sh
-
- postbuilders:
- - test-macro
+ - gerrit-parameter:
+ branch: '{stream}'
- job-template:
name: 'pharos-verify-{stream}'
+ <<: *pharos_job_defaults
+
parameters:
- - project-parameter:
- project: '{project}'
- - gerrit-parameter:
- branch: '{branch}'
+ - 'opnfv-build-defaults'
+
scm:
- gerrit-trigger-scm:
credentials-id: '{ssh-credentials}'
@@ -88,90 +56,14 @@
comment-contains-value: 'reverify'
projects:
- project-compare-type: 'ANT'
- project-pattern: 'pharos'
+ project-pattern: '{project}'
branches:
- branch-compare-type: 'ANT'
- branch-pattern: '**/{branch}'
-
- builders:
- - shell:
- !include-raw ../opnfvdocs/docu-build.sh
-
-- job-template:
- name: 'pharos-merge-{stream}'
-
- # builder-merge job to run JJB update
- #
- # This job's purpose is to update all the JJB
-
- parameters:
- - project-parameter:
- project: '{project}'
- - gerrit-parameter:
- branch: '{branch}'
-
- scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- choosing-strategy: 'default'
-
- triggers:
- - gerrit:
- trigger-on:
- - change-merged-event
- - comment-added-contains-event:
- comment-contains-value: 'remerge'
- projects:
- - project-compare-type: 'ANT'
- project-pattern: 'pharos'
- branches:
- - branch-compare-type: 'ANT'
- branch-pattern: '**/{branch}'
-
- builders:
- - shell:
- !include-raw ../opnfvdocs/docu-build.sh
-
-- job-template:
- name: 'pharos-maas-pilot-{stream}'
-
- parameters:
- - project-parameter:
- project: '{project}'
-
- scm:
- - git-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- branch: '{branch}'
-
- triggers:
- - pollscm: '@midnight'
+ branch-pattern: '**/{stream}'
+ forbidden-file-paths:
+ - compare-type: ANT
+ pattern: 'docs/**|.gitignore'
builders:
- - shell:
- echo "Hello World"
-########################
-# parameter macros
-########################
-- parameter:
- name: pharos-parameter
- parameters:
- - string:
- name: GS_PATHNAME
- default: '{gs-pathname}'
- description: "Version directory where the pharos documents will be stored in gs repository"
-
-########################
-## trigger macros
-#########################
-- trigger:
- name: 'pharos-master'
- triggers:
- - pollscm: "H 6 * * *"
-
-- trigger:
- name: 'pharos-stable-arno'
- triggers:
- - pollscm: "H 18 * * *"
+ - shell: |
+ echo "Nothing to verify!"
diff --git a/jjb/prediction/docu-build.sh b/jjb/prediction/docu-build.sh
deleted file mode 100644
index 057cc97d1..000000000
--- a/jjb/prediction/docu-build.sh
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/bin/bash
-set -e
-set -o pipefail
-
-project="$(git remote -v | head -n1 | awk '{{print $2}}' | sed -e 's,.*:\(.*/\)\?,,' -e 's/\.git$//')"
-export PATH=$PATH:/usr/local/bin/
-
-git_sha1="$(git rev-parse HEAD)"
-docu_build_date="$(date)"
-
-if [[ $JOB_NAME =~ "verify" ]] ; then
- patchset="/$GERRIT_CHANGE_NUMBER"
-fi
-
-files=()
-while read -r -d ''; do
- files+=("$REPLY")
-done < <(find * -type f -iname '*.rst' -print0)
-
-for file in "${{files[@]}}"; do
-
- file_cut="${{file%.*}}"
- gs_cp_folder="${{file_cut}}"
-
- # sed part
- sed -i "s/_sha1_/$git_sha1/g" $file
- sed -i "s/_date_/$docu_build_date/g" $file
-
- # rst2html part
- echo "rst2html $file"
- rst2html $file | gsutil cp -L gsoutput.txt - \
- gs://artifacts.opnfv.org/"$project""$patchset"/"$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
- 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
- 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
- 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"
-
-done
-
-images=()
-while read -r -d ''; do
- images+=("$REPLY")
-done < <(find * -type f \( -iname \*.jpg -o -iname \*.png \) -print0)
-
-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"
- gsutil setmeta -h "Content-Type:image/jpeg" \
- -h "Cache-Control:private, max-age=0, no-transform" \
- gs://artifacts.opnfv.org/"$project""$patchset"/"$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
- fi
-fi
-
-echo -e "$links"
-
diff --git a/jjb/prediction/prediction.yml b/jjb/prediction/prediction.yml
index ee47f86c8..93fa33144 100644
--- a/jjb/prediction/prediction.yml
+++ b/jjb/prediction/prediction.yml
@@ -1,69 +1,41 @@
+###################################################
+# All the jobs except verify have been removed!
+# They will only be enabled on request by projects!
+###################################################
- project:
name: prediction
+
+ project: '{name}'
+
jobs:
- - 'prediction-test'
- - 'prediction-daily-{stream}'
- - 'prediction-merge'
- - 'prediction-verify'
+ - 'prediction-verify-{stream}'
- # stream: branch with - in place of / (eg. stable-helium)
- # branch: branch (eg. stable/helium)
+# only master branch is enabled at the moment to keep no of jobs sane
stream:
- master:
branch: 'master'
+ gs-pathname: ''
+# - stable-brahmaputra:
+# branch: 'stable/brahmaputra'
+# gs-pathname: '/brahmaputra'
- project: 'prediction'
- somevar: 'foo'
-
-- job-template:
- name: prediction-test
-
- builders:
- - shell: |
- echo "Hello world from prediction"
-
-- job-template:
- name: 'prediction-daily-{stream}'
-
- # Job template for daily builders
- #
- # Required Variables:
- # stream: branch with - in place of / (eg. stable)
- # branch: branch (eg. stable)
-
- varsetabove: '{somevar}'
+- job_defaults: &prediction_job_defaults
+ name: prediction_job_defaults
parameters:
- project-parameter:
project: '{project}'
-
- scm:
- - git-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- branch: '{branch}'
-
- triggers:
- - timed: 'H H * * *'
-
- prebuilders:
- - test-macro
-
- builders:
- - shell:
- !include-raw docu-build.sh
-
- postbuilders:
- - test-macro
+ - gerrit-parameter:
+ branch: '{stream}'
- job-template:
- name: 'prediction-verify'
+ name: 'prediction-verify-{stream}'
+
+ <<: *prediction_job_defaults
parameters:
- - project-parameter:
- project: '{project}'
- - gerrit-parameter:
- branch: 'master'
+ - 'opnfv-build-defaults'
+
scm:
- gerrit-trigger-scm:
credentials-id: '{ssh-credentials}'
@@ -84,48 +56,14 @@
comment-contains-value: 'reverify'
projects:
- project-compare-type: 'ANT'
- project-pattern: 'prediction'
+ project-pattern: '{project}'
branches:
- branch-compare-type: 'ANT'
- branch-pattern: '**/master'
-
- builders:
- - shell:
- !include-raw docu-build.sh
-
-- job-template:
- name: 'prediction-merge'
-
- # builder-merge job to run JJB update
- #
- # This job's purpose is to update all the JJB
-
- parameters:
- - project-parameter:
- project: '{project}'
- - gerrit-parameter:
- branch: 'master'
-
- scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- choosing-strategy: 'default'
-
- triggers:
- - gerrit:
- trigger-on:
- - change-merged-event
- - comment-added-contains-event:
- comment-contains-value: 'remerge'
- projects:
- - project-compare-type: 'ANT'
- project-pattern: 'prediction'
- branches:
- - branch-compare-type: 'ANT'
- branch-pattern: '**/master'
+ branch-pattern: '**/{stream}'
+ forbidden-file-paths:
+ - compare-type: ANT
+ pattern: 'docs/**|.gitignore'
builders:
- - shell:
- !include-raw docu-build.sh
-
+ - shell: |
+ echo "Nothing to verify!"
diff --git a/jjb/promise/docu-build.sh b/jjb/promise/docu-build.sh
deleted file mode 100644
index aafcb2f66..000000000
--- a/jjb/promise/docu-build.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/bash
-set -e
-set -o pipefail
-
-export PATH=$PATH:/usr/local/bin/
-
-echo
-echo "Build"
-echo "-----"
-echo
-
-make
-
-echo
-echo "Upload"
-echo "------"
-echo
-
-# NOTE: make sure source parameters for GS paths are not empty.
-[[ $GERRIT_CHANGE_NUMBER =~ .+ ]]
-[[ $GERRIT_PROJECT =~ .+ ]]
-[[ $GERRIT_BRANCH =~ .+ ]]
-
-gs_path_review="artifacts.opnfv.org/review/$GERRIT_CHANGE_NUMBER"
-if [[ $GERRIT_BRANCH = "master" ]] ; then
- gs_path_branch="artifacts.opnfv.org/$GERRIT_PROJECT"
-else
- gs_path_branch="artifacts.opnfv.org/$GERRIT_PROJECT/${{GERRIT_BRANCH##*/}}"
-fi
-
-if [[ $JOB_NAME =~ "verify" ]] ; then
- gsutil cp -r build/* "gs://$gs_path_review/"
- echo
- echo "Document is available at http://$gs_path_review"
-else
- gsutil cp -r build/requirements/latex/*.pdf "gs://$gs_path_branch/"
- echo
- echo "Document is available at http://$gs_path_branch"
-fi
-
-if [[ $GERRIT_EVENT_TYPE = "change-merged" ]] ; then
- echo
- echo "Clean Out-of-dated Documents"
- echo "----------------------------"
- echo
- gsutil rm -r "gs://$gs_path_review" || true
-fi
diff --git a/jjb/promise/promise.yml b/jjb/promise/promise.yml
index 357ddd2ec..17ddc9ecb 100644
--- a/jjb/promise/promise.yml
+++ b/jjb/promise/promise.yml
@@ -1,12 +1,69 @@
+###################################################
+# All the jobs except verify have been removed!
+# They will only be enabled on request by projects!
+###################################################
- project:
name: promise
+
project: '{name}'
+
jobs:
- - '{project}-verify'
- - '{project}-merge-{stream}'
+ - 'promise-verify-{stream}'
- # stream: branch with - in place of / (eg. stable-arno)
- # branch: branch (eg. stable/arno)
+# only master branch is enabled at the moment to keep no of jobs sane
stream:
- master:
branch: 'master'
+ gs-pathname: ''
+# - stable-brahmaputra:
+# branch: 'stable/brahmaputra'
+# gs-pathname: '/brahmaputra'
+
+- job_defaults: &promise_job_defaults
+ name: promise_job_defaults
+
+ parameters:
+ - project-parameter:
+ project: '{project}'
+ - gerrit-parameter:
+ branch: '{stream}'
+
+- job-template:
+ name: 'promise-verify-{stream}'
+
+ <<: *promise_job_defaults
+
+ parameters:
+ - 'opnfv-build-defaults'
+
+ scm:
+ - gerrit-trigger-scm:
+ credentials-id: '{ssh-credentials}'
+ refspec: '$GERRIT_REFSPEC'
+ choosing-strategy: 'gerrit'
+
+ triggers:
+ - gerrit:
+ trigger-on:
+ - patchset-created-event:
+ exclude-drafts: 'false'
+ exclude-trivial-rebase: 'false'
+ exclude-no-code-change: 'false'
+ - draft-published-event
+ - comment-added-contains-event:
+ comment-contains-value: 'recheck'
+ - comment-added-contains-event:
+ comment-contains-value: 'reverify'
+ projects:
+ - project-compare-type: 'ANT'
+ project-pattern: '{project}'
+ branches:
+ - branch-compare-type: 'ANT'
+ branch-pattern: '**/{stream}'
+ forbidden-file-paths:
+ - compare-type: ANT
+ pattern: 'docs/**|.gitignore'
+
+ builders:
+ - shell: |
+ echo "Nothing to verify!"
diff --git a/jjb/qtip/qtip.yml b/jjb/qtip/qtip.yml
index 886074593..9388f388b 100644
--- a/jjb/qtip/qtip.yml
+++ b/jjb/qtip/qtip.yml
@@ -1,80 +1,38 @@
- project:
name: qtip
+
+ project: '{name}'
+
jobs:
- - 'qtip-test'
- - 'qtip-daily-{stream}'
- - 'qtip-merge'
- - 'qtip-verify'
+ - 'qtip-verify-{stream}'
- 'qtip-dhrystone-serial-{pod}'
- 'qtip-ssl-parallel-{pod}'
- # stream: branch with - in place of / (eg. stable-helium)
- # branch: branch (eg. stable/helium)
-
pod:
- dell-build:
node: 'dell-us-testing-bm-1'
installer_type: 'fuel'
installer_ip: '10.20.0.2'
+# only master branch is enabled at the moment to keep no of jobs sane
stream:
- master:
branch: 'master'
-
- project: 'qtip'
- somevar: 'foo'
-
-- job-template:
- name: qtip-test
-
- builders:
- - shell: |
- echo "Hello world from qtip"
-
-- job-template:
- name: 'qtip-daily-{stream}'
-
- # Job template for daily builders
- #
- # Required Variables:
- # stream: branch with - in place of / (eg. stable)
- # branch: branch (eg. stable)
-
- varsetabove: '{somevar}'
-
- parameters:
- - project-parameter:
- project: '{project}'
-
- scm:
- - git-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- branch: '{branch}'
-
- triggers:
- - timed: 'H H * * *'
-
- prebuilders:
- - test-macro
-
- builders:
- - shell: |
- pwd
- find .
- echo "Hello world from qtip {somevar} daily"
-
- postbuilders:
- - test-macro
+ gs-pathname: ''
+# - stable-brahmaputra:
+# branch: 'stable/brahmaputra'
+# gs-pathname: '/brahmaputra'
- job-template:
- name: 'qtip-verify'
+ name: 'qtip-verify-{stream}'
parameters:
- project-parameter:
project: '{project}'
- gerrit-parameter:
- branch: 'master'
+ branch: '{stream}'
+ - 'opnfv-build-defaults'
+
scm:
- gerrit-trigger-scm:
credentials-id: '{ssh-credentials}'
@@ -95,54 +53,17 @@
comment-contains-value: 'reverify'
projects:
- project-compare-type: 'ANT'
- project-pattern: 'qtip'
+ project-pattern: '{project}'
branches:
- branch-compare-type: 'ANT'
- branch-pattern: '**/master'
-
- builders:
- - shell: |
- pwd
- find .
- echo "verify logic goes here"
-
-- job-template:
- name: 'qtip-merge'
-
- # builder-merge job to run JJB update
- #
- # This job's purpose is to update all the JJB
-
- parameters:
- - project-parameter:
- project: '{project}'
- - gerrit-parameter:
- branch: 'master'
-
- scm:
- - gerrit-trigger-scm:
- credentials-id: '{ssh-credentials}'
- refspec: ''
- choosing-strategy: 'default'
-
- triggers:
- - gerrit:
- trigger-on:
- - change-merged-event
- - comment-added-contains-event:
- comment-contains-value: 'remerge'
- projects:
- - project-compare-type: 'ANT'
- project-pattern: 'qtip'
- branches:
- - branch-compare-type: 'ANT'
- branch-pattern: '**/master'
+ branch-pattern: '**/{stream}'
+ forbidden-file-paths:
+ - compare-type: ANT
+ pattern: 'docs/**|.gitignore'
builders:
- shell: |
- pwd
- find .
- echo "merge logic goes here"
+ echo "Nothing to verify!"
- job-template:
name: 'qtip-dhrystone-serial-{pod}'