Merge "Add guilin branch in demo jjb"

diff --git a/jjb/dcaegen2/dcaegen2-platform-plugins.yaml b/jjb/dcaegen2/dcaegen2-platform-plugins.yaml
index 3713146..60643eb 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-platform-plugins.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-plugins.yaml
@@ -11,6 +11,7 @@
     stream:
       - 'master':
           branch: 'master'
+          python-version: python3
       - 'guilin':
           branch: 'guilin'
     mvn-settings: 'dcaegen2-platform-plugins-settings'

diff --git a/jjb/oom/oom-helm.yaml b/jjb/oom/oom-helm.yaml
index 71d5774..789f7e7 100644 (file)
--- a/jjb/oom/oom-helm.yaml
+++ b/jjb/oom/oom-helm.yaml
@@ -23,6 +23,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'guilin':
+          branch: 'guilin'
       - 'frankfurt':
           branch: 'frankfurt'
       - 'dublin':

diff --git a/jjb/so/so-libs.yaml b/jjb/so/so-libs.yaml
index a515ee9..b6d6134 100644 (file)
--- a/jjb/so/so-libs.yaml
+++ b/jjb/so/so-libs.yaml
@@ -16,8 +16,9 @@
       - 'master':
           branch: 'master'
           java-version: openjdk11
-      - 'elalto':
-          branch: 'elalto'
+      - 'guilin':
+          branch: 'guilin'
+          java-version: openjdk11
       - 'frankfurt':
           branch: 'frankfurt'
     mvn-settings: 'so-libs-settings'
@@ -70,4 +71,4 @@
     build-node: centos7-builder-2c-1g
     project: so/libs
     branch: master
-    branch: elalto
+    branch: guilin

diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml
index d214334..d8a5ef7 100644 (file)
--- a/jjb/so/so.yaml
+++ b/jjb/so/so.yaml
@@ -31,8 +31,9 @@
           java-version: openjdk11
       - 'frankfurt':
           branch: 'frankfurt'
-      - 'elalto':
-          branch: 'elalto'
+      - 'guilin':
+          branch: 'guilin'
+          java-version: openjdk11
       - 'dynamicBPMN':
           branch: 'Dynamic_BPMN'
           java-version: openjdk11
@@ -113,4 +114,4 @@
     build-node: centos7-builder-2c-1g
     project: so
     branch: master
-    branch: frankfurt
+    branch: guilin