X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Foptf%2Foptf-osdf.yaml;h=46e719f12edaa790bde0552e11444940c6634bcb;hb=6343b32a1e48a92a61c92379773975fb2d4d74d1;hp=18865fb75f4ed7033daef339481e3f0cf4563b34;hpb=2f42ab9471e3cc478dd6eccd9b9dbce4ca9b15fe;p=ci-management.git

diff --git a/jjb/optf/optf-osdf.yaml b/jjb/optf/optf-osdf.yaml
index 18865fb75..46e719f12 100644
--- a/jjb/optf/optf-osdf.yaml
+++ b/jjb/optf/optf-osdf.yaml
@@ -17,16 +17,18 @@
           pom: 'pom.xml'
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-python':
-          build-node: ubuntu2004-builder-4c-4g
+          build-node: ubuntu1804-builder-4c-4g
       - '{project-name}-{stream}-{subproject}-merge-java':
           build-node: ubuntu1804-docker-8c-8g
       - gerrit-maven-stage:
+          sbom-generator: true
           sign-artifacts: true
-          build-node: centos7-docker-8c-8g
+          build-node: centos8-docker-8c-8g
           maven-versions-plugin: true
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
       - gerrit-maven-docker-stage:
+          sbom-generator: true
           build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
           container-public-registry: 'nexus3.onap.org:10001'
@@ -36,7 +38,7 @@
 
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu2004-builder-4c-4g'
+    build-node: 'ubuntu1804-builder-4c-4g'
 
 - project:
     name: optf-osdf-sonar
@@ -44,7 +46,6 @@
       - 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'
@@ -67,8 +68,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'jakarta':
-          branch: 'jakarta'
     mvn-settings: 'optf-osdf-settings'
 
 - project:
@@ -76,6 +75,6 @@
     project-name: optf-osdf
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: optf/osdf
     branch: master