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 9522fd937f99ed347d892269fb4b8a3029623f95..1e2abb3f4d8c1bdf574a21ddb0efa3edfef828ba 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -100,7 +100,7 @@
       - string:
           name: KARAF_VERSION
           default: "{karaf-version}"
-          description: "karaf3, karaf4, odl, controller, netconf affects ODL deploy scripts"
+          description: "karaf3, karaf4, odl, bgpcep, controller, netconf affects ODL deploy scripts"
 
 - parameter:
     name: integration-bundle-url
@@ -469,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:
@@ -543,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.
@@ -561,7 +557,6 @@
                             ${line}
                         done
                     fi
-                    rm ${HOME}/.netrc
           mark-unstable-if-failed: true
 
 - publisher: