13 files changed, 36 insertions, 70 deletions
diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml
index 2195631b8..b32f224a2 100644
--- a/jjb/ccsdk/apps.yaml
+++ b/jjb/ccsdk/apps.yaml
@@ -34,6 +34,8 @@
           branch: 'master'
       - 'honolulu':
           branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
     java-version: openjdk11
     mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-apps-settings'
@@ -80,6 +82,8 @@
           branch: 'master'
       - 'honolulu':
           branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
     java-version: openjdk11
     mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-apps-settings'
diff --git a/jjb/ccsdk/ccsdk-csit.yaml b/jjb/ccsdk/ccsdk-csit.yaml
index 1853728ce..c8af14cbd 100644
--- a/jjb/ccsdk/ccsdk-csit.yaml
+++ b/jjb/ccsdk/ccsdk-csit.yaml
@@ -17,6 +17,8 @@
           branch: 'master'
       - 'honolulu':
           branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
     mvn-settings: 'ccsdk-distribution-settings'
     robot-options: ''
     branch: 'master'
@@ -37,6 +39,8 @@
           branch: 'master'
       - 'honolulu':
           branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
     mvn-settings: 'ccsdk-oran-settings'
     robot-options: ''
     branch: 'master'
diff --git a/jjb/ccsdk/ccsdk-oran.yaml b/jjb/ccsdk/ccsdk-oran.yaml
index 4574f091a..3193bfe1d 100644
--- a/jjb/ccsdk/ccsdk-oran.yaml
+++ b/jjb/ccsdk/ccsdk-oran.yaml
@@ -29,6 +29,8 @@
           branch: 'master'
       - 'honolulu':
           branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
     java-version: openjdk11
     mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-oran-settings'
@@ -52,6 +54,8 @@
           branch: 'master'
       - 'honolulu':
           branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
     java-version: openjdk11
     mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-oran-settings'
diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml
index 345b9d6f8..acece7ce2 100644
--- a/jjb/ccsdk/cds.yaml
+++ b/jjb/ccsdk/cds.yaml
@@ -28,6 +28,8 @@
           branch: 'master'
       - 'honolulu':
           branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
     java-version: openjdk11
     mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-cds-settings'
diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml
index 7e94bdeff..312542400 100644
--- a/jjb/ccsdk/distribution.yaml
+++ b/jjb/ccsdk/distribution.yaml
@@ -30,6 +30,8 @@
           branch: 'master'
       - 'honolulu':
           branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
     java-version: openjdk11
     mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-distribution-settings'
@@ -71,6 +73,8 @@
           branch: 'master'
       - 'honolulu':
           branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
     java-version: openjdk11
     mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-distribution-settings'
diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml
index 0d4004113..00a2af4fa 100644
--- a/jjb/ccsdk/features.yaml
+++ b/jjb/ccsdk/features.yaml
@@ -22,6 +22,8 @@
           branch: 'master'
       - 'honolulu':
           branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
     java-version: openjdk11
     mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-features-settings'
@@ -69,6 +71,8 @@
           branch: 'master'
       - 'honolulu':
           branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
     java-version: openjdk11
     mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-features-settings'
diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml
index 888132301..7e5685baf 100644
--- a/jjb/ccsdk/parent.yaml
+++ b/jjb/ccsdk/parent.yaml
@@ -24,6 +24,8 @@
           branch: 'master'
       - 'honolulu':
           branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
     java-version: openjdk11
     mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-parent-settings'
diff --git a/jjb/ccsdk/sli.yaml b/jjb/ccsdk/sli.yaml
index 501b4511c..864aa758d 100644
--- a/jjb/ccsdk/sli.yaml
+++ b/jjb/ccsdk/sli.yaml
@@ -22,6 +22,8 @@
           branch: 'master'
       - 'honolulu':
           branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
     java-version: openjdk11
     mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-sli-settings'
@@ -68,6 +70,8 @@
           branch: 'master'
       - 'honolulu':
           branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
     java-version: openjdk11
     mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-sli-settings'
diff --git a/jjb/ccsdk/utils.yaml b/jjb/ccsdk/utils.yaml
deleted file mode 100644
index 25061980c..000000000
--- a/jjb/ccsdk/utils.yaml
+++ /dev/null
@@ -1,70 +0,0 @@
----
-- project:
-    name: ccsdk-utils
-    project-name: 'ccsdk-utils'
-    jobs:
-      - gerrit-maven-verify:
-          cron: ''
-      - gerrit-maven-merge:
-          cron: '@daily'
-          mvn-params: '-Dmaven.test.skip=true'
-      - gerrit-maven-stage:
-          build-node: centos7-builder-4c-4g
-          sign-artifacts: true
-          mvn-params: '-Dmaven.test.skip=true'
-          cron: ''
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
-
-    project: 'ccsdk/utils'
-    stream:
-      - 'master':
-          branch: 'master'
-    java-version: openjdk11
-    mvn-version: 'mvn36'
-    mvn-settings: 'ccsdk-utils-settings'
-    # due to a strange macro / variable translation problem this needs to be
-    # passed as a string block to properly get the properties correctly defined
-    # in the job
-    maven-deploy-properties: |
-      deployAtEnd=true
-    files: '**'
-    archive-artifacts: ''
-    mvn-snapshot-id: 'ecomp-snapshots'
-    nexus-snapshot-repo: 'snapshots'
-
-- project:
-    name: ccsdk-utils-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: 'ccsdk/utils'
-    project-name: 'ccsdk-utils'
-    stream:
-      - 'master':
-          branch: 'master'
-    java-version: openjdk11
-    mvn-version: 'mvn36'
-    mvn-settings: 'ccsdk-utils-settings'
-
-- project:
-    name: ccsdk-utils-info
-    project-name: ccsdk-utils
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: ccsdk/utils
-    branch: master
-
-- project:
-    name: ccsdk-utils-whitesource
-    project-name: ccsdk-utils
-    jobs:
-      - gerrit-whitesource-scan
-    java-version: openjdk11
-    mvn-version: 'mvn36'
-    mvn-settings: 'ccsdk-utils-settings'
-    wss-product-name: ccsdk
-    mvn-clean-install: true
-    project: ccsdk/utils
-    branch: master
diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml
index fedeb7c17..6c843ced4 100644
--- a/jjb/sdnc/sdnc-apps.yaml
+++ b/jjb/sdnc/sdnc-apps.yaml
@@ -38,6 +38,8 @@
           branch: 'master'
       - 'honolulu':
           branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
     java-version: openjdk11
     mvn-version : "mvn36"
     mvn-settings: 'sdnc-apps-settings'
diff --git a/jjb/sdnc/sdnc-csit.yaml b/jjb/sdnc/sdnc-csit.yaml
index 0ce45c359..cc2150399 100644
--- a/jjb/sdnc/sdnc-csit.yaml
+++ b/jjb/sdnc/sdnc-csit.yaml
@@ -17,6 +17,8 @@
           branch: 'master'
       - 'honolulu':
           branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
     mvn-settings: 'sdnc-oam-settings'
     robot-options: ''
     branch: 'master'
diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml
index 982eb479b..80c9dfd23 100644
--- a/jjb/sdnc/sdnc-northbound.yaml
+++ b/jjb/sdnc/sdnc-northbound.yaml
@@ -19,6 +19,8 @@
           branch: 'master'
       - 'honolulu':
           branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
     java-version: openjdk11
     mvn-version: "mvn36"
     mvn-settings: 'sdnc-northbound-settings'
diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml
index 8aab78224..f4be0c670 100644
--- a/jjb/sdnc/sdnc-oam.yaml
+++ b/jjb/sdnc/sdnc-oam.yaml
@@ -28,6 +28,8 @@
           branch: 'master'
       - 'honolulu':
           branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
     java-version: openjdk11
     mvn-version: "mvn36"
     mvn-settings: 'sdnc-oam-settings'