Merge "Update COE jobs"

[releng/builder.git] / jjb / integration / integration-templates.yaml

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 09bc1c1877df9a6a93c2c53bcf09c014a9c71d03..47c11a99d7b3cb94ad273adf09d18d6470ae7e91 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -1363,7 +1363,7 @@
       - integration-distribution-branch:
           branch: '{branch}'
       - distribution-karaf-version:
-          karaf-version: 'karaf3'
+          karaf-version: '{karaf-version}'
       - integration-distribution-git-url:
           git-url: '{git-url}'
       - string:
@@ -1422,7 +1422,7 @@
             - '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
           settings: integration-settings
           settings-type: cfp
-          global-settings: odl-global-settings
+          global-settings: global-settings
           global-settings-type: cfp
       - maven-target:
           maven-version: mvn33
@@ -1436,7 +1436,7 @@
             - '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
           settings: integration-settings
           settings-type: cfp
-          global-settings: odl-global-settings
+          global-settings: global-settings
           global-settings-type: cfp
       - integration-upload-distribution:
           dist-pom: distribution/pom.xml