Chore: Revert back to ubuntu1804-builder

[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 6bf7795..32d9507 100644 (file)
--- a/jjb/sdc/sdc-sdc-distribution-client.yaml
+++ b/jjb/sdc/sdc-sdc-distribution-client.yaml
@@ -23,14 +23,14 @@
       - 'master':
           branch: 'master'
           java-version: openjdk11
-      - 'honolulu':
-          branch: 'honolulu'
+      - 'jakarta':
+          branch: 'jakarta'
           java-version: openjdk11
     mvn-settings: 'sdc-sdc-distribution-client-settings'
     files: '**'
     archive-artifacts: ''
     build-timeout: 60
-    mvn-version: 'mvn36'
+    maven-version: 'mvn36'
 
 - project:
     name: sdc-sdc-distribution-client-integration-pairwise
@@ -48,7 +48,7 @@
     files: '**'
     archive-artifacts: ''
     build-timeout: 60
-    mvn-version: 'mvn36'
+    maven-version: 'mvn36'
     mvn-params: ' -P integration-pairwise'
 
 - project:
@@ -59,7 +59,7 @@
     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: ubuntu1804-builder-4c-4g
     project: 'sdc/sdc-distribution-client'
@@ -78,7 +78,11 @@
     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