summaryrefslogtreecommitdiffstats
path: root/jjb/conductor
diff options
context:
space:
mode:
Diffstat (limited to 'jjb/conductor')
-rw-r--r--jjb/conductor/conductor.yml123
1 files changed, 28 insertions, 95 deletions
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!"