Merge "Remove all refs to python2"

diff --git a/jjb/lf-whitesource-jobs.yaml b/jjb/lf-whitesource-jobs.yaml
index f5f6fe1..20a3db9 100644 (file)
--- 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 (file)
index 0000000..8dfa51e
--- /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.