Merge "Use Go 1.14 for multicloud-k8s CI build"

diff --git a/jjb/aai/aai-graphgraph.yaml b/jjb/aai/aai-graphgraph.yaml
index a6a182a..1f8078f 100644 (file)
--- a/jjb/aai/aai-graphgraph.yaml
+++ b/jjb/aai/aai-graphgraph.yaml
@@ -30,6 +30,36 @@
     files: '**'
     archive-artifacts: ''
 
+- project:
+    name: aai-graphgraph-sonar
+    jobs:
+      - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
+    cron: '@daily'
+    build-node: ubuntu1804-builder-4c-4g
+    project: 'aai/graphgraph'
+    project-name: 'aai-graphgraph'
+    branch: 'master'
+    mvn-settings: 'aai-graphgraph-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: aai-graphgraph-clm
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: 'onap-'
+    project: 'aai/graphgraph'
+    project-name: 'aai-graphgraph'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'aai-graphgraph-settings'
+
 - project:
     name: aai-graphgraph-info
     project-name: aai-graphgraph
@@ -38,4 +68,3 @@
     build-node: centos7-builder-2c-1g
     project: aai/graphgraph
     branch: master
-

diff --git a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
index 24e8d86..69d3ba1 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
@@ -2,7 +2,6 @@
 - project:
     name: dcaegen2-platform-inventory-api
     project-name: 'dcaegen2-platform-inventory-api'
-    java-version: openjdk11
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
@@ -22,6 +21,7 @@
     stream:
       - 'master':
           branch: 'master'
+          java-version: openjdk11
       - 'frankfurt':
           branch: 'frankfurt'
     mvn-settings: 'dcaegen2-platform-inventory-api-settings'
@@ -55,6 +55,7 @@
 
 - project:
     name: dcaegen2-platform-inventory-api-clm
+    java-version: openjdk11
     jobs:
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'

diff --git a/jjb/sdc/sdc-dcae-d-dt-be-main.yaml b/jjb/sdc/sdc-dcae-d-dt-be-main.yaml
index 0fdee27..3127610 100644 (file)
--- a/jjb/sdc/sdc-dcae-d-dt-be-main.yaml
+++ b/jjb/sdc/sdc-dcae-d-dt-be-main.yaml
@@ -21,6 +21,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'elalto':
+          branch: 'elalto'
     mvn-settings: 'sdc-dcae-d-dt-be-main-settings'
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/sdc/sdc-dcae-d-dt.yaml b/jjb/sdc/sdc-dcae-d-dt.yaml
index 41847c3..22117c7 100644 (file)
--- a/jjb/sdc/sdc-dcae-d-dt.yaml
+++ b/jjb/sdc/sdc-dcae-d-dt.yaml
@@ -23,6 +23,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'elalto':
+          branch: 'elalto'
     mvn-settings: 'sdc-dcae-d-dt-settings'
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/sdc/sdc-dcae-d-fe.yaml b/jjb/sdc/sdc-dcae-d-fe.yaml
index fa80c53..fcd7d51 100644 (file)
--- a/jjb/sdc/sdc-dcae-d-fe.yaml
+++ b/jjb/sdc/sdc-dcae-d-fe.yaml
@@ -23,6 +23,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'elalto':
+          branch: 'elalto'
     mvn-settings: 'sdc-dcae-d-fe-settings'
     files: '**'
     archive-artifacts: ''