Chore: Revert back to ubuntu1804-builder

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

diff --git a/jjb/sdc/sdc-sdc-docker-base.yaml b/jjb/sdc/sdc-sdc-docker-base.yaml
index 6507f4f..5857c1c 100644 (file)
--- a/jjb/sdc/sdc-sdc-docker-base.yaml
+++ b/jjb/sdc/sdc-sdc-docker-base.yaml
@@ -5,14 +5,14 @@
     project-name: 'sdc-sdc-docker-base'
     jobs:
       - '{project-name}-{stream}-verify-java':
-          build-node: 'ubuntu1604-docker-v1-8c-8g'
+          build-node: 'ubuntu1804-docker-v1-8c-8g'
           docker-pom: 'pom.xml'
       - '{project-name}-{stream}-sdc-merge-java':
-          build-node: 'ubuntu1604-docker-8c-8g'
+          build-node: 'ubuntu1804-docker-8c-8g'
           docker-pom: 'pom.xml'
           mvn-profile: 'default'
       - gerrit-maven-docker-stage:
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
           mvn-params: '-P default'
           container-public-registry: 'nexus3.onap.org:10001'
@@ -23,29 +23,13 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'jakarta':
+          branch: 'jakarta'
     mvn-settings: 'sdc-sdc-docker-base-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-8c-8g
-    maven-version: 'mvn35'
-
-#- project:
-#    name: sdc-sdc-docker-base-arm64
-#    project-name: 'sdc-sdc-docker-base-arm64'
-#    jobs:
-#      - '{project-name}-{stream}-sdc-merge-java':
-#          build-node: 'ubuntu1604-docker-8c-8g'
-#          docker-pom: 'pom.xml'
-#          mvn-profile: 'default'
-#    project: 'sdc/sdc-docker-base'
-#    stream:
-#      - 'master':
-#          branch: 'master'
-#    mvn-settings: 'sdc-sdc-docker-base-settings'
-#    files: '**'
-#    archive-artifacts: ''
-#    build-node: ubuntu1604-docker-arm64-4c-2g
-#    maven-version: 'mvn35'
+    build-node: ubuntu1804-builder-4c-4g
+    maven-version: 'mvn36'
 
 - project:
     name: sdc-sdc-docker-base-info