Chore: Revert back to ubuntu1804-builder

[ci-management.git] / jjb / sdnc / sdnc-apps.yaml

diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml
index 43ad1c2..7327717 100644 (file)
--- a/jjb/sdnc/sdnc-apps.yaml
+++ b/jjb/sdnc/sdnc-apps.yaml
@@ -10,6 +10,9 @@
     project-name: 'sdnc-apps'
     jobs:
       - gerrit-maven-verify:
+          build-node: ubuntu1804-docker-8c-8g
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
           mvn-params: '-Ddocker.skip.push=true -Pdocker'
       - gerrit-maven-merge:
           cron: '@daily'
@@ -19,6 +22,7 @@
           sign-artifacts: true
           mvn-params: '-Dmaven.test.skip=true'
           cron: ''
+          sbom-generator: true
       - gerrit-maven-docker-stage:
           build-node: ubuntu1804-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
@@ -33,12 +37,12 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
-      - 'honolulu':
-          branch: 'honolulu'
+      - 'istanbul':
+          branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     java-version: openjdk11
-    mvn-version : "mvn36"
+    mvn-version : "mvn38"
     mvn-settings: 'sdnc-apps-settings'
 
     # due to a strange macro / variable translation problem this needs to be
@@ -48,7 +52,7 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    maven-version: "mvn36"
+    maven-version: "mvn38"
     build-node: ubuntu1804-builder-4c-4g
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
@@ -68,11 +72,11 @@
     project-name: 'sdnc-apps'
     branch: 'master'
     java-version: openjdk11
-    mvn-version : "mvn36"
+    mvn-version : "mvn38"
     mvn-settings: 'sdnc-apps-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    maven-version: "mvn36"
+    maven-version: "mvn38"
 
 #
 #- project:
@@ -103,8 +107,12 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'istanbul':
+          branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
     java-version: openjdk11
-    mvn-version : "mvn36"
+    mvn-version : "mvn38"
     mvn-settings: 'sdnc-apps-settings'
 
 - project: