Merge "[OOM] add honolulu branch to linting"

diff --git a/jjb/cps/cps-csit.yaml b/jjb/cps/cps-csit.yaml
index 4c8a981..6a42b61 100644 (file)
--- a/jjb/cps/cps-csit.yaml
+++ b/jjb/cps/cps-csit.yaml
@@ -17,6 +17,8 @@
                 branch: 'master'
           - 'honolulu':
                 branch: 'honolulu'
+          - 'istanbul':
+                branch: 'istanbul'
       mvn-settings: 'cps-settings'
       robot-options: ''
       branch: 'master'

diff --git a/jjb/cps/cps-ncmp-dmi-plugin.yaml b/jjb/cps/cps-ncmp-dmi-plugin.yaml
index 780c7c1..a060364 100644 (file)
--- a/jjb/cps/cps-ncmp-dmi-plugin.yaml
+++ b/jjb/cps/cps-ncmp-dmi-plugin.yaml
@@ -41,6 +41,8 @@
     stream:
       - 'master':
           branch: master
+      - 'istanbul':
+          branch: 'istanbul'
     mvn-settings: cps-ncmp-dmi-plugin-settings
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/cps/cps.yaml b/jjb/cps/cps.yaml
index cecfb79..107b32b 100644 (file)
--- a/jjb/cps/cps.yaml
+++ b/jjb/cps/cps.yaml
@@ -54,8 +54,10 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'istanbul':
+          branch: 'istanbul'
       - 'honolulu':
-            branch: 'honolulu'
+          branch: 'honolulu'
     mvn-settings: 'cps-settings'
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/msb/msb-apigateway.yaml b/jjb/msb/msb-apigateway.yaml
index f4d2365..b2d8bed 100644 (file)
--- a/jjb/msb/msb-apigateway.yaml
+++ b/jjb/msb/msb-apigateway.yaml
@@ -28,6 +28,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'istanbul':
+          branch: 'istanbul'
     mvn-settings: 'msb-apigateway-settings'
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/msb/msb-discovery.yaml b/jjb/msb/msb-discovery.yaml
index 84d75c8..72fab4c 100644 (file)
--- a/jjb/msb/msb-discovery.yaml
+++ b/jjb/msb/msb-discovery.yaml
@@ -22,6 +22,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'istanbul':
+          branch: 'istanbul'
     mvn-settings: 'msb-discovery-settings'
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/msb/msb-java-sdk.yaml b/jjb/msb/msb-java-sdk.yaml
index c7bb49b..5c599c3 100644 (file)
--- a/jjb/msb/msb-java-sdk.yaml
+++ b/jjb/msb/msb-java-sdk.yaml
@@ -13,6 +13,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'istanbul':
+          branch: 'istanbul'
     mvn-settings: 'msb-java-sdk-settings'
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/msb/msb-swagger-sdk.yaml b/jjb/msb/msb-swagger-sdk.yaml
index 376cc1a..00ac8a1 100644 (file)
--- a/jjb/msb/msb-swagger-sdk.yaml
+++ b/jjb/msb/msb-swagger-sdk.yaml
@@ -13,6 +13,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'istanbul':
+          branch: 'istanbul'
     mvn-settings: 'msb-swagger-sdk-settings'
     files: '**'
     archive-artifacts: ''

diff --git a/packer/common-packer b/packer/common-packer
index e23ebc7..3dcae18 160000 (submodule)
--- a/packer/common-packer
+++ b/packer/common-packer
@@ -1 +1 @@
-Subproject commit e23ebc7439c8692eff5aebf78782068ac1507221
+Subproject commit 3dcae183d810816f31950afbe1fa08fa948e61fe