Allow usage of MRI distribution in csit

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

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 8a1897310b796055366539be1934c291cebfada3..9522fd937f99ed347d892269fb4b8a3029623f95 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -25,6 +25,10 @@
           controller-scope: "{controller-scope}"
           controller-use-features-boot: "{use-features-boot}"
           feature-elasticsearch-attribute: "{elasticsearch-attribute}"
+      - distribution-is-karaf-appl:
+          karaf-based-controller: "{karaf-based-controller}"
+      - distribution-karaf-version:
+          karaf-version: "{karaf-version}"
 
 - parameter:
     name: integration-controller-parameters
@@ -80,6 +84,14 @@
           default: "{branch}"
           description: "Distribution GIT branch"
 
+- parameter:
+    name: distribution-is-karaf-appl
+    parameters:
+      - string:
+          name: IS_KARAF_APPL
+          default: "{karaf-based-controller}"
+          description: "Boolean to let pipeline know if the project has a different deployer"
+
 - parameter:
     name: distribution-karaf-version
     # Arguments:
@@ -88,7 +100,7 @@
       - string:
           name: KARAF_VERSION
           default: "{karaf-version}"
-          description: "karaf3, karaf4, odl, affects ODL deploy scripts"
+          description: "karaf3, karaf4, odl, controller, netconf affects ODL deploy scripts"
 
 - parameter:
     name: integration-bundle-url
@@ -345,6 +357,15 @@
     builders:
       - shell: !include-raw: integration-deploy-controller-run-test.sh
 
+# Macro: integration-deply-non-karaf-controller-run-test
+# Operation: this macro deploys non-karaf controller application and run test
+# Used by: {project}-csit-1node-* job templates
+
+- builder:
+    name: integration-run-test
+    builders:
+      - shell: !include-raw: integration-run-test.sh
+
 # Macro: integration-configure-clustering
 # Operation: this macro configures the clustering
 # Used by: {project}-csit-3node-* job templates