Chore: Revert back to ubuntu1804-builder

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

diff --git a/jjb/sdc/sdc-sdc-workflow-designer.yaml b/jjb/sdc/sdc-sdc-workflow-designer.yaml
index 9c2d057..e4eff9d 100644 (file)
--- a/jjb/sdc/sdc-sdc-workflow-designer.yaml
+++ b/jjb/sdc/sdc-sdc-workflow-designer.yaml
@@ -4,6 +4,7 @@
     project-name: sdc-sdc-workflow
     views:
       - project-view
+    java-version: openjdk11
 
 - project:
     name: sdc-sdc-workflow-designer
@@ -23,41 +24,22 @@
           container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
+    java-version: openjdk11
 
     project: 'sdc/sdc-workflow-designer'
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
-      - 'elalto':
-          branch: 'elalto'
+      - 'jakarta':
+          branch: 'jakarta'
     mvn-settings: 'sdc-sdc-workflow-designer-settings'
     files: '**'
     archive-artifacts: ''
     docker-pom: 'pom.xml'
     mvn-profile: docker
     build-node: ubuntu1804-builder-4c-4g
-    maven-version: 'mvn35'
+    maven-version: 'mvn36'
 
-#- project:
-#    name: sdc-sdc-workflow-designer-arm64
-#    project-name: 'sdc-sdc-workflow-designer-arm64'
-#    jobs:
-#      - '{project-name}-{stream}-docker-java-daily':
-#          mvn-params: '-Dmaven.test.skip=true'
-#    project: 'sdc/sdc-workflow-designer'
-#    stream:
-#      - 'master':
-#          branch: 'master'
-#    mvn-settings: 'sdc-sdc-workflow-designer-settings'
-#    files: '**'
-#    archive-artifacts: ''
-#    docker-pom: 'pom.xml'
-#    mvn-profile: docker
-#    build-node: ubuntu1804-docker-arm64-4c-2g
-#    maven-version: 'mvn35'
-#
 - project:
     name: sdc-sdc-workflow-designer-sonar
     jobs:
@@ -66,7 +48,7 @@
     sonarcloud-project-organization: '{sonarcloud_project_organization}'
     sonarcloud-api-token: '{sonarcloud_api_token}'
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1804-builder-4c-4g
     project: 'sdc/sdc-workflow-designer'
@@ -76,6 +58,7 @@
     mvn-params: '-Djacoco.skip=false -Dsonar.branch={branch}'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m'
+    java-version: openjdk11
 
 - project:
     name: sdc-sdc-workflow-designer-clm
@@ -85,8 +68,13 @@
     project: sdc/sdc-workflow-designer
     project-name: 'sdc-sdc-workflow-designer'
     build-node: ubuntu1804-builder-4c-4g
-    branch: 'master'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'jakarta':
+          branch: 'jakarta'
     mvn-settings: 'sdc-sdc-workflow-designer-settings'
+    java-version: openjdk11
 
 - project:
     name: sdc-sdc-workflow-designer-info
@@ -96,3 +84,4 @@
     build-node: centos7-builder-2c-1g
     project: sdc/sdc-workflow-designer
     branch: master
+    java-version: openjdk11