Chore: Move to centos8-builder

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

diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml
index bba93f0..a8b578f 100644 (file)
--- a/jjb/sdc/sdc.yaml
+++ b/jjb/sdc/sdc.yaml
@@ -49,10 +49,13 @@
       - gerrit-maven-stage:
           build-timeout: 90
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          sbom-generator: true
+          build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
+          mvn-version: 'mvn36'
           mvn-params: '-DskipTests=true -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/'
       - gerrit-maven-docker-stage:
+          sbom-generator: true
           build-node: ubuntu1804-docker-v1-8c-8g
           maven-versions-plugin: true
           mvn-params: '-P docker -DskipTests=true -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/'
@@ -67,8 +70,11 @@
       - 'master':
           branch: 'master'
           java-version: openjdk11
-      - 'istanbul':
-          branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
+          java-version: openjdk11
+      - 'kohn':
+          branch: 'kohn'
           java-version: openjdk11
     mvn-settings: 'sdc-settings'
     files: '**'
@@ -83,7 +89,6 @@
           build-timeout: 120
     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'
@@ -109,7 +114,9 @@
     project: sdc
     project-name: 'sdc'
     build-node: ubuntu1804-docker-8c-8g
-    branch: 'master'
+    stream:
+      - 'master':
+          branch: 'master'
     mvn-version: 'mvn36'
     mvn-settings: 'sdc-settings'
     java-version: openjdk11
@@ -119,22 +126,6 @@
     project-name: sdc
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: sdc
     branch: master
-
-- project:
-    name: 'sdc-whitesource'
-    project-name: 'sdc'
-    build-node: ubuntu1804-docker-8c-8g
-    jobs:
-      - gerrit-whitesource-scan:
-          build-timeout: 120
-          submodule-timeout: 30
-          java-opts: '-Xmx2048m'
-    mvn-settings: 'sdc-settings'
-    wss-product-name: 'sdc'
-    mvn-clean-install: true
-    project: 'sdc'
-    branch: master
-    java-version: openjdk11