Merge "Remove policy/engine sonar report"

diff --git a/jjb/aaf/aaf-certservice-csit.yaml b/jjb/aaf/aaf-certservice-csit.yaml
index 990545b..078e0b6 100644 (file)
--- a/jjb/aaf/aaf-certservice-csit.yaml
+++ b/jjb/aaf/aaf-certservice-csit.yaml
@@ -6,8 +6,6 @@
           - "{project-name}-{stream}-csit-{functionality}"
       project-name: "aaf"
       stream:
-          - "master":
-                branch: "master"
           -  "frankfurt":
                 branch: "frankfurt"
       functionality:

diff --git a/jjb/aaf/aaf-certservice.yaml b/jjb/aaf/aaf-certservice.yaml
index 0fb6892..8aa7518 100644 (file)
--- a/jjb/aaf/aaf-certservice.yaml
+++ b/jjb/aaf/aaf-certservice.yaml
@@ -4,9 +4,6 @@
     name: aaf-certservice
     project-name: 'aaf-certservice'
     stream:
-        -   'master':
-                branch: 'master'
-                java-version: openjdk11
         -   'frankfurt':
                 branch: 'frankfurt'
                 java-version: openjdk11
@@ -51,7 +48,7 @@
     build-node: ubuntu1804-docker-8c-8g
     project: 'aaf/certservice'
     project-name: 'aaf-certservice'
-    branch: 'master'
+    branch: 'frankfurt'
     mvn-settings: 'aaf-certservice-settings'
     mvn-pom: 'certService/pom.xml'
     mvn-goals: 'clean install'
@@ -64,4 +61,4 @@
       - gerrit-info-yaml-verify
     build-node: centos7-builder-2c-1g
     project: aaf/certservice
-    branch: master
+    branch: frankfurt

diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index 60f1ad6..da5dfdc 100644 (file)
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -520,6 +520,7 @@
     project-type: freestyle
     node: '{build-node}'
     disabled: '{disabled}'
+    java-version: openjdk8
     properties:
       - infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
@@ -555,6 +556,9 @@
 
     builders:
       - lf-infra-pre-build
+      - lf-update-java-alternatives:
+          java-version: "{java-version}"
+
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'

diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml
index c787335..38cc304 100644 (file)
--- a/jjb/so/so.yaml
+++ b/jjb/so/so.yaml
@@ -33,6 +33,8 @@
           branch: 'frankfurt'
       - 'elalto':
           branch: 'elalto'
+      - 'dynamicBPMN':
+          branch: 'Dynamic_BPMN'
     mvn-settings: 'so-settings'
     files: '**'
     archive-artifacts: ''