X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Foptf%2Foptf-has.yaml;h=7aef5694740930a0a0c4da2745ea67f7484a4d60;hb=6343b32a1e48a92a61c92379773975fb2d4d74d1;hp=a452fbab30f69dbe93acc0ca85407f99a90c36f3;hpb=09cdc9a10b40fe78f8b8afa40e914c454e965ba1;p=ci-management.git

diff --git a/jjb/optf/optf-has.yaml b/jjb/optf/optf-has.yaml
index a452fbab3..7aef56947 100644
--- a/jjb/optf/optf-has.yaml
+++ b/jjb/optf/optf-has.yaml
@@ -6,8 +6,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
+      - 'jakarta':
+          branch: 'jakarta'
     mvn-settings: 'optf-has-settings'
     subproject:
       - 'conductor':
@@ -20,66 +20,35 @@
       - '{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'
           container-staging-registry: 'nexus3.onap.org:10003'
           docker-pom: 'conductor/pom.xml'
-          mvn-goals: 'install'
           mvn-params: '-Dmaven.test.skip=true -P docker'
 
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1804-builder-4c-4g'
 
-- project:
-    name: optf-has-docker
-    project-name: 'optf-has'
-    project: 'optf/has'
-    stream:
-      - 'master':
-          branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
-    mvn-settings: 'optf-has-settings'
-    subproject:
-      - 'conductor':
-          path: 'conductor'
-          pattern: 'conductor/**'
-          pom: 'pom.xml'
-    jobs:
-      - '{project-name}-{stream}-{subproject}-docker-java-version-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'install'
-          mvn-params: '-Dmaven.test.skip=true'
-          script:
-            !include-raw-escape: 'build-optf-has-docker-image.sh'
-          build-node: queue-docker-4c-4g
-      - '{project-name}-{stream}-{subproject}-docker-java-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'install'
-          mvn-params: '-Dmaven.test.skip=true'
-          script:
-            !include-raw-escape: 'build-optf-has-docker-image.sh'
-          build-node: queue-docker-4c-4g
-
 - project:
     name: optf-has-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
+    build-node: ubuntu1804-docker-8c-8g
     project: 'optf/has'
     project-name: 'optf-has'
     branch: 'master'
@@ -94,11 +63,10 @@
     nexus-iq-namespace: 'onap-'
     project: optf/has
     project-name: 'optf-has'
+    build-node: ubuntu1804-docker-8c-8g
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
     mvn-settings: 'optf-has-settings'
 
 - project:
@@ -106,6 +74,6 @@
     project-name: optf-has
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: optf/has
     branch: master