Allow for multiple forbidden paths

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

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 8a1897310b796055366539be1934c291cebfada3..1e2abb3f4d8c1bdf574a21ddb0efa3edfef828ba 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, bgpcep, 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
@@ -448,7 +469,7 @@
           files:
             - file-id: global-settings
               variable: GLOBAL_SETTINGS_FILE
-            - file-id: integration-settings
+            - file-id: "{settings-project}-settings"
               variable: SETTINGS_FILE
       - integration-set-variables
       - inject:
@@ -522,10 +543,6 @@
                 - SUCCESS
                 - UNSTABLE
               build-steps:
-                - config-file-provider:
-                    files:
-                      - file-id: "odl-elastic-cloud"
-                        target: "${HOME}/.netrc"
                 - shell: |
                     #!/bin/bash
                     #The following script runs any configurable postplan stored in test/csit/postplans.
@@ -540,7 +557,6 @@
                             ${line}
                         done
                     fi
-                    rm ${HOME}/.netrc
           mark-unstable-if-failed: true
 
 - publisher: