Merge "Add Beijing release jobs for dmaap/messagerouter"

diff --git a/jjb/aaf/aaf-sms.yaml b/jjb/aaf/aaf-sms.yaml
index 6a2d985..b8ccf73 100644 (file)
--- a/jjb/aaf/aaf-sms.yaml
+++ b/jjb/aaf/aaf-sms.yaml
@@ -8,7 +8,7 @@
       - gerrit-maven-clm
       - '{project-name}-{stream}-verify-golang'
       - '{project-name}-{stream}-merge-golang'
-      - '{project-name}-{stream}-{subproject}-release-java-daily':
+      - '{project-name}-{stream}-{subproject}-release-version-java-daily':
           pom:
             'sms-client/java/pom.xml'
       - '{project-name}-{stream}-docker-golang-shell-daily':

diff --git a/jjb/dcaegen2/dcaegen2.yaml b/jjb/dcaegen2/dcaegen2.yaml
index e84df66..5cde1b0 100644 (file)
--- a/jjb/dcaegen2/dcaegen2.yaml
+++ b/jjb/dcaegen2/dcaegen2.yaml
@@ -12,6 +12,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'beijing':
+          branch: 'beijing'
     mvn-settings: 'dcaegen2-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties

diff --git a/jjb/music/music-jar.yaml b/jjb/music/music-jar.yaml
index ead1c7a..457042a 100644 (file)
--- a/jjb/music/music-jar.yaml
+++ b/jjb/music/music-jar.yaml
@@ -18,7 +18,7 @@
       - 'jar-beijing':
           branch: 'beijing'
       - 'jar-release-2.5.5':
-          branch: 'release-2.5.3'
+          branch: 'release-2.5.5'
     mvn-settings: 'music-settings'
     files: '**'
     archive-artifacts: ''