[CI] Add Istanbul branches to jobs

# Disabling all mirrormaker jobs

Change-Id: Ibd423b3b266eeef9dbadfc473dda27246da4a294
Signed-off-by: efiacor <fiachra.corcoran@est.tech>
Issue-ID: CIMAN-411

7 files changed, 17 insertions, 12 deletions

diff --git a/jjb/dmaap/dmaap-buscontroller.yaml b/jjb/dmaap/dmaap-buscontroller.yaml
index 3136272a6..225be160a 100644
--- a/jjb/dmaap/dmaap-buscontroller.yaml
+++ b/jjb/dmaap/dmaap-buscontroller.yaml
@@ -39,10 +39,10 @@
           container-staging-registry: 'nexus3.onap.org:10003'
     project: 'dmaap/buscontroller'
     stream:
+      - 'istanbul':
+          branch: 'istanbul'
       - 'honolulu':
           branch: 'honolulu'
-      - 'guilin':
-          branch: 'guilin'
     mvn-settings: 'dmaap-buscontroller-settings'
     files: '**'
     archive-artifacts: ''
diff --git a/jjb/dmaap/dmaap-datarouter.yaml b/jjb/dmaap/dmaap-datarouter.yaml
index a7a23a4d9..1a8f5ffad 100644
--- a/jjb/dmaap/dmaap-datarouter.yaml
+++ b/jjb/dmaap/dmaap-datarouter.yaml
@@ -36,10 +36,10 @@
           container-staging-registry: 'nexus3.onap.org:10003'
     project: 'dmaap/datarouter'
     stream:
+      - 'istanbul':
+          branch: 'istanbul'
       - 'honolulu':
           branch: 'honolulu'
-      - 'guilin':
-          branch: 'guilin'
     mvn-settings: 'dmaap-datarouter-settings'
     files: '**'
     archive-artifacts: ''
diff --git a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
index 3e7ba92bd..8e0dbf6c5 100644
--- a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
@@ -32,10 +32,10 @@
           maven-versions-plugin: true
     project: 'dmaap/messagerouter/dmaapclient'
     stream:
+      - 'istanbul':
+          branch: 'istanbul'
       - 'honolulu':
           branch: 'honolulu'
-      - 'guilin':
-          branch: 'guilin'
     mvn-settings: 'dmaap-messagerouter-dmaapclient-settings'
     files: '**'
     archive-artifacts: ''
diff --git a/jjb/dmaap/dmaap-messagerouter-kafka.yaml b/jjb/dmaap/dmaap-messagerouter-kafka.yaml
index 47b3d492c..ff785c55e 100644
--- a/jjb/dmaap/dmaap-messagerouter-kafka.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-kafka.yaml
@@ -36,10 +36,10 @@
           container-staging-registry: 'nexus3.onap.org:10003'
     project: 'dmaap/kafka11aaf'
     stream:
+      - 'istanbul':
+          branch: 'istanbul'
       - 'honolulu':
           branch: 'honolulu'
-      - 'guilin':
-          branch: 'guilin'
     mvn-settings: 'dmaap-kafka11aaf-settings'
     files: '**'
     archive-artifacts: ''
diff --git a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
index 8f62a7c4f..9fb9ed28c 100644
--- a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
@@ -38,10 +38,10 @@
           container-staging-registry: 'nexus3.onap.org:10003'
     project: 'dmaap/messagerouter/messageservice'
     stream:
+      - 'istanbul':
+          branch: 'istanbul'
       - 'honolulu':
           branch: 'honolulu'
-      - 'guilin':
-          branch: 'guilin'
     mvn-settings: 'dmaap-messagerouter-messageservice-settings'
     files: '**'
     archive-artifacts: ''
diff --git a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml
index 1d476f91c..0bb247b2b 100644
--- a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml
@@ -1,5 +1,6 @@
 ---
 - project:
+    disabled: true
     name: dmaap-messagerouter-mirroragent
     project-name: 'dmaap-messagerouter-mirroragent'
     jobs:
@@ -20,6 +21,7 @@
     archive-artifacts: ''
 
 - project:
+    disabled: true
     name: dmaap-messagerouter-mirroragent-maintenance
     project-name: 'dmaap-messagerouter-mirroragent-maintenance'
     jobs:
@@ -41,6 +43,7 @@
     cron: ''
 
 - project:
+    disabled: true
     name: dmaap-messagerouter-mirroragent-sonar
     jobs:
       - gerrit-maven-sonar
@@ -59,6 +62,7 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
 - project:
+    disabled: true
     name: dmaap-messagerouter-mirroragent-clm
     jobs:
       - gerrit-maven-clm
@@ -69,6 +73,7 @@
     mvn-settings: 'dmaap-messagerouter-mirroragent-settings'
 
 - project:
+    disabled: true
     name: dmaap-messagerouter-mirroragent-info
     project-name: dmaap-messagerouter-mirroragent
     jobs:
diff --git a/jjb/dmaap/dmaap-messagerouter-zookeeper.yaml b/jjb/dmaap/dmaap-messagerouter-zookeeper.yaml
index 3258275e9..8186cc314 100644
--- a/jjb/dmaap/dmaap-messagerouter-zookeeper.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-zookeeper.yaml
@@ -34,10 +34,10 @@
           container-staging-registry: 'nexus3.onap.org:10003'
     project: 'dmaap/zookeeper'
     stream:
+      - 'istanbul':
+          branch: 'istanbul'
       - 'honolulu':
           branch: 'honolulu'
-      - 'guilin':
-          branch: 'guilin'
     mvn-settings: 'dmaap-zookeeper-settings'
     files: '**'
     archive-artifacts: ''