Merge "Handle stacks with status DELETE_FAILED"

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

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 9537f9ecc579e4bea47155d8b2de7be323b96662..b71eea9d5514b5e34a8d7c887c5819717d26fa86 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -114,6 +114,7 @@
 
 - job-template:
     name: '{project}-csit-1node-{functionality}-{install}-{stream}'
+    # Keep synchronized with *-csit4-*-carbon please.
     disabled: false
 
     project-type: freestyle
@@ -1366,7 +1367,7 @@
       - integration-distribution-branch:
           branch: '{branch}'
       - distribution-karaf-version:
-          karaf-version: '{karaf-version}'
+          karaf-version: 'karaf3'
       - integration-distribution-git-url:
           git-url: '{git-url}'
       - string:
@@ -1448,7 +1449,7 @@
             block: true
             predefined-parameters: |
               BUNDLE_URL=$BUNDLE_URL
-              KARAF_VERSION=karaf3
+              KARAF_VERSION=$KARAF_VERSION
 
     publishers:
       - email-notification: