Merge "Create dublin jenkin jobs for OOF projects"

6 files changed, 37 insertions, 15 deletions

diff --git a/jjb/optf/optf-cmso-csit.yaml b/jjb/optf/optf-cmso-csit.yaml
index b655a6752..ae0a790e5 100644
--- a/jjb/optf/optf-cmso-csit.yaml
+++ b/jjb/optf/optf-cmso-csit.yaml
@@ -1,15 +1,17 @@
----

-- project:

-     name: optf-cmso-csit

-     jobs:

-       - '{project-name}-{stream}-verify-csit-{functionality}'

-       - '{project-name}-{stream}-csit-{functionality}'

-     project-name: 'optf-cmso'

-     stream:

-       - 'master':

-           branch: master

-     functionality:

-       - 'cmso':

-           trigger_jobs: 'optf-cmso-master-docker-java-version-shell-daily'

-     robot-options: ''

-     branch: 'master'

+---
+- project:
+     name: optf-cmso-csit
+     jobs:
+       - '{project-name}-{stream}-verify-csit-{functionality}'
+       - '{project-name}-{stream}-csit-{functionality}'
+     project-name: 'optf-cmso'
+     stream:
+       - 'master':
+           branch: master
+       - 'dublin':
+           branch: dublin
+     functionality:
+       - 'cmso':
+           trigger_jobs: 'optf-cmso-master-docker-java-version-shell-daily'
+     robot-options: ''
+     branch: 'master'
diff --git a/jjb/optf/optf-cmso.yaml b/jjb/optf/optf-cmso.yaml
index 5b240f439..2c2b24ddf 100644
--- a/jjb/optf/optf-cmso.yaml
+++ b/jjb/optf/optf-cmso.yaml
@@ -30,6 +30,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'optf-cmso-settings'
     subproject:
       - 'cmso':
@@ -63,6 +65,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'optf-cmso-settings'
 
 - project:
diff --git a/jjb/optf/optf-has-csit.yaml b/jjb/optf/optf-has-csit.yaml
index 08a03c3d1..498878638 100644
--- a/jjb/optf/optf-has-csit.yaml
+++ b/jjb/optf/optf-has-csit.yaml
@@ -8,6 +8,8 @@
      stream:
        - 'master':
            branch: master
+       - 'dublin':
+           branch: dublin
      functionality:
        - 'has':
            trigger_jobs: 'optf-has-master-conductor-docker-java-version-shell-daily'
diff --git a/jjb/optf/optf-has.yaml b/jjb/optf/optf-has.yaml
index 50a8035f8..238c96cfa 100644
--- a/jjb/optf/optf-has.yaml
+++ b/jjb/optf/optf-has.yaml
@@ -6,6 +6,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'optf-has-settings'
     subproject:
       - 'conductor':
@@ -32,6 +34,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'optf-has-settings'
     subproject:
       - 'conductor':
@@ -77,6 +81,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'optf-has-settings'
 
 - project:
diff --git a/jjb/optf/optf-osdf-csit.yaml b/jjb/optf/optf-osdf-csit.yaml
index c79a189a4..bb31f31dc 100644
--- a/jjb/optf/optf-osdf-csit.yaml
+++ b/jjb/optf/optf-osdf-csit.yaml
@@ -8,6 +8,8 @@
      stream:
        - 'master':
            branch: master
+       - 'dublin':
+           branch: dublin
      functionality:
        - 'osdf':
            trigger_jobs: 'optf-osdf-master-osdf-docker-java-version-shell-daily'
diff --git a/jjb/optf/optf-osdf.yaml b/jjb/optf/optf-osdf.yaml
index 094985082..14c7a17ec 100644
--- a/jjb/optf/optf-osdf.yaml
+++ b/jjb/optf/optf-osdf.yaml
@@ -6,6 +6,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'optf-osdf-settings'
     subproject:
       - 'osdf':
@@ -31,6 +33,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'optf-osdf-settings'
     subproject:
       - 'osdf':
@@ -76,6 +80,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'dublin':
+          branch: 'dublin'
     mvn-settings: 'optf-osdf-settings'
 
 - project: