X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fsdnc%2Fsdnc-northbound.yaml;h=0da9c8ccb6ccbdceadcb6e969c82fdaf47aea68d;hb=c4761781e78ec7b04f115e1c62b28ddc741d7fd1;hp=507d044963bc34fdb42b98c52cb1262aebf91726;hpb=4798227ceb53c4e0fd17263d9e4e9065af61db30;p=ci-management.git

diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml
index 507d04496..0da9c8ccb 100644
--- a/jjb/sdnc/sdnc-northbound.yaml
+++ b/jjb/sdnc/sdnc-northbound.yaml
@@ -3,11 +3,13 @@
     name: sdnc-northbound
     project-name: 'sdnc-northbound'
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-verify
+      - gerrit-maven-merge:
+          cron: '@daily'
       - gerrit-maven-stage:
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
+          cron: ''
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
 
@@ -15,10 +17,12 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
-      - 'elalto-fluorine':
-          branch: 'elalto-fluorine'
+      - 'istanbul':
+          branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
+    java-version: openjdk11
+    mvn-version: "mvn36"
     mvn-settings: 'sdnc-northbound-settings'
 
     # due to a strange macro / variable translation problem this needs to be
@@ -29,7 +33,9 @@
     files: '**'
     archive-artifacts: ''
     maven-version: "mvn35"
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
+    mvn-snapshot-id: 'ecomp-snapshots'
+    nexus-snapshot-repo: 'snapshots'
 
 - project:
     name: sdnc-northbound-sonar
@@ -39,15 +45,16 @@
     sonarcloud-project-organization: '{sonarcloud_project_organization}'
     sonarcloud-api-token: '{sonarcloud_api_token}'
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'sdnc/northbound'
     project-name: 'sdnc-northbound'
     branch: 'master'
     mvn-settings: 'sdnc-northbound-settings'
     mvn-goals: 'clean install'
-    maven-version: "mvn35"
+    java-version: openjdk11
+    mvn-version: "mvn36"
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
 - project:
@@ -57,16 +64,23 @@
     nexus-iq-namespace: 'onap-'
     project: sdnc/northbound
     project-name: 'sdnc-northbound'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     stream:
       - 'master':
           branch: 'master'
+      - 'istanbul':
+          branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     mvn-settings: 'sdnc-northbound-settings'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
 
 - project:
     name: sdnc-northbound-info
     project-name: sdnc-northbound
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: sdnc/northbound
     branch: master