Merge "Allow setting custom builder node in linters job template"

diff --git a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml
index a3fd2ed..eec174a 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml
@@ -72,7 +72,7 @@
     branch: 'master'
     mvn-settings: 'dcaegen2-services-settings'
     mvn-params: '-f components/bbs-event-processor/pom.xml'
-    mvn-goals: 'clean install'
+    mvn-goals: 'clean install -Ddockerfile.skip'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
 - project:

diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml
index 71296e4..70d2c22 100644 (file)
--- a/jjb/sdc/sdc.yaml
+++ b/jjb/sdc/sdc.yaml
@@ -53,6 +53,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'sdc-settings'
     files: '**'
     archive-artifacts: ''