Chore: Revert back to ubuntu1804-docker

[ci-management.git] / jjb / sdc / sdc-sdc-distribution-client.yaml

diff --git a/jjb/sdc/sdc-sdc-distribution-client.yaml b/jjb/sdc/sdc-sdc-distribution-client.yaml
index c7a3424..135ea5d 100644 (file)
--- a/jjb/sdc/sdc-sdc-distribution-client.yaml
+++ b/jjb/sdc/sdc-sdc-distribution-client.yaml
@@ -22,22 +22,51 @@
     stream:
       - 'master':
           branch: 'master'
+          java-version: openjdk11
+      - 'jakarta':
+          branch: 'jakarta'
+          java-version: openjdk11
     mvn-settings: 'sdc-sdc-distribution-client-settings'
     files: '**'
     archive-artifacts: ''
     build-timeout: 60
-    maven-version: 'mvn35'
+    maven-version: 'mvn36'
+
+- project:
+    name: sdc-sdc-distribution-client-integration-pairwise
+    java-version: openjdk11
+    jobs:
+       - '{project-name}-{stream}-integration-pairwise'
+    build-node: ubuntu1804-docker-8c-8g
+    project: 'sdc/sdc-distribution-client'
+    project-name: 'sdc-sdc-distribution-client'
+    stream:
+        - 'master':
+            branch: 'master'
+            java-version: openjdk11
+    mvn-settings: 'sdc-sdc-distribution-client-settings'
+    files: '**'
+    archive-artifacts: ''
+    build-timeout: 60
+    maven-version: 'mvn36'
+    mvn-params: ' -P integration-pairwise'
 
 - project:
     name: sdc-sdc-distribution-client-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: ubuntu1604-builder-4c-4g
+    build-node: ubuntu2004-builder-4c-4g
     project: 'sdc/sdc-distribution-client'
     project-name: 'sdc-sdc-distribution-client'
     branch: 'master'
     mvn-settings: 'sdc-sdc-distribution-client-settings'
+    java-version: openjdk11
     mvn-params: '-Dsonar.branch={branch}'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m'
@@ -49,13 +78,19 @@
     nexus-iq-namespace: 'onap-'
     project: sdc/sdc-distribution-client
     project-name: 'sdc-sdc-distribution-client'
-    branch: 'master'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'jakarta':
+          branch: 'jakarta'
     mvn-settings: 'sdc-sdc-distribution-client-settings'
+    java-version: openjdk11
 
 - project:
     name: sdc-sdc-distribution-client-info
     project-name: sdc-sdc-distribution-client
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: sdc/sdc-distribution-client
     branch: master