summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
Diffstat (limited to 'jjb')
-rw-r--r--jjb/joid/joid-ci-jobs.yml (renamed from jjb/joid/joid.yml)80
-rw-r--r--jjb/joid/joid-project-jobs.yml62
2 files changed, 126 insertions, 16 deletions
diff --git a/jjb/joid/joid.yml b/jjb/joid/joid-ci-jobs.yml
index 90b3df682..af81aacb2 100644
--- a/jjb/joid/joid.yml
+++ b/jjb/joid/joid-ci-jobs.yml
@@ -7,8 +7,49 @@
project: '{name}'
- installer: 'joid'
-
+ installer: '{name}'
+
+#--------------------------------
+# BRANCH ANCHORS
+#--------------------------------
+ master: &master
+ stream: master
+ branch: '{stream}'
+ gs-pathname: ''
+ brahmaputra: &brahmaputra
+ stream: brahmaputra
+ branch: 'stable/{stream}'
+ gs-pathname: '/{stream}'
+#--------------------------------
+# POD, INSTALLER, AND BRANCH MAPPING
+#--------------------------------
+# Current Mapping
+#--------------------------------
+# everything runs against master branch
+#--------------------------------
+ pod:
+ - intel-pod5:
+ <<: *master
+ - orange-pod2:
+ <<: *master
+#--------------------------------
+# Milestone E Mapping
+# !!!DO NOT ENABLE!!!
+#--------------------------------
+# brahmaputra
+#--------------------------------
+# - intel-pod5:
+# <<: *brahmaputra
+#--------------------------------
+# master
+#--------------------------------
+# - intel-pod6:
+# <<: *master
+# - orange-pod2:
+# <<: *master
+#--------------------------------
+
+# please check the triggers before enabling any of the controllers!!!
sdn-controller:
- 'nosdn':
disabled: true
@@ -19,19 +60,6 @@
- 'opencontrail':
disabled: true
- pod:
- - 'intel-pod5'
- - 'orange-pod2'
-
-# only master branch is enabled at the moment to keep no of jobs sane
- stream:
- - master:
- branch: '{stream}'
- gs-pathname: ''
-# - brahmaputra:
-# branch: 'stable/{stream}'
-# gs-pathname: '{stream}'
-
jobs:
- 'joid-{sdn-controller}-{pod}-daily-{stream}'
- 'joid-deploy-{pod}-daily-{stream}'
@@ -48,6 +76,13 @@
concurrent: false
+ wrappers:
+ - build-name:
+ name: '$BUILD_NUMBER - SDN: $SDN_CONTROLLER Feature: $OPNFV_FEATURE'
+
+ triggers:
+ - 'joid-{pod}-trigger'
+
parameters:
- project-parameter:
project: '{project}'
@@ -80,7 +115,7 @@
wrappers:
- build-name:
- name: '$BUILD_NUMBER: $INSTALLER_TYPE $SDN_CONTROLLER'
+ name: '$BUILD_NUMBER - SDN: $SDN_CONTROLLER Feature: $OPNFV_FEATURE'
parameters:
- project-parameter:
@@ -183,3 +218,16 @@
./clean.sh
- shell:
!include-raw ./joid-deploy.sh
+########################
+# trigger macros
+########################
+- trigger:
+ name: 'joid-intel-pod5-trigger'
+ triggers:
+ - timed: '0 3 * * *'
+# timer trigger is commented out since we do not know if the automatic runs should
+# be enabled on orange-pod2
+- trigger:
+ name: 'joid-orange-pod2-trigger'
+ triggers:
+ - timed: '#0 3 * * *'
diff --git a/jjb/joid/joid-project-jobs.yml b/jjb/joid/joid-project-jobs.yml
new file mode 100644
index 000000000..987b3f9e1
--- /dev/null
+++ b/jjb/joid/joid-project-jobs.yml
@@ -0,0 +1,62 @@
+###################################################
+# All the jobs except verify have been removed!
+# They will only be enabled on request by projects!
+###################################################
+- project:
+ name: joid-project-jobs
+
+ project: 'joid'
+
+ jobs:
+ - 'joid-verify-{stream}'
+
+# only master branch is enabled at the moment to keep no of jobs sane
+ stream:
+ - master:
+ branch: '{stream}'
+ gs-pathname: ''
+# - brahmaputra:
+# branch: 'stable/{stream}'
+# gs-pathname: '/{stream}'
+
+- job-template:
+ name: 'joid-verify-{stream}'
+
+ parameters:
+ - project-parameter:
+ project: '{project}'
+ - gerrit-parameter:
+ branch: '{branch}'
+ - '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: '**/{branch}'
+ forbidden-file-paths:
+ - compare-type: ANT
+ pattern: 'docs/**|.gitignore'
+
+ builders:
+ - shell: |
+ echo "Nothing to verify!"