From: Eric Ball <eball@linuxfoundation.org>
Date: Tue, 30 Mar 2021 21:14:51 +0000 (+0000)
Subject: Merge "Remove all refs to python2"
X-Git-Tag: v0.63.0~1
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=ca2ec8e82f3cdc1eb355f1aa29a968002ec3c9e6;hp=be5967e9662e443f47bb8a2522cfe907a8aa5669;p=releng%2Fglobal-jjb.git

Merge "Remove all refs to python2"
---

diff --git a/jjb/lf-whitesource-jobs.yaml b/jjb/lf-whitesource-jobs.yaml
index f5f6fe13..20a3db91 100644
--- a/jjb/lf-whitesource-jobs.yaml
+++ b/jjb/lf-whitesource-jobs.yaml
@@ -28,6 +28,8 @@
           files:
             - file-id: wss-unified-agent.config
               target: $WORKSPACE/wss-unified-agent.config
+            - file-id: global-settings
+              target: $WORKSPACE/global-settings.xml
       - shell: !include-raw:
           - ../shell/whitesource-unified-agent-cli.sh
 
diff --git a/releasenotes/notes/WS-Unified-Agent-Settings-7da696415f3cdb30.yaml b/releasenotes/notes/WS-Unified-Agent-Settings-7da696415f3cdb30.yaml
new file mode 100644
index 00000000..8dfa51e5
--- /dev/null
+++ b/releasenotes/notes/WS-Unified-Agent-Settings-7da696415f3cdb30.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Provision global-settings to replace the default
+    used by the Unified Agent.