From 0b27b2ee6e54524b5ba4333a0ce3ff0ffb5bbc84 Mon Sep 17 00:00:00 2001 From: Jessica Wagantall Date: Thu, 12 Sep 2019 11:22:42 -0700 Subject: [PATCH] Fix WS CLI Agent calls Remove quotes from optional variable WSS_UNIFIED_AGENT_OPTIONS which, if empty, will cause WS Unified Agent CLI issues. Upgrade WS Unified Agent CLI to latest version 19.8.1 Change-Id: I3d21bad21bceee0a0c626b145c1ca74e0cd21ddc Signed-off-by: Jessica Wagantall --- jjb/lf-whitesource-jobs.yaml | 2 +- releasenotes/notes/update-ws-cli-agent-calls-540edfb9ec9afb9f.yaml | 7 +++++++ shell/whitesource-unified-agent-cli.sh | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 releasenotes/notes/update-ws-cli-agent-calls-540edfb9ec9afb9f.yaml diff --git a/jjb/lf-whitesource-jobs.yaml b/jjb/lf-whitesource-jobs.yaml index 1f267ff6..418565d1 100644 --- a/jjb/lf-whitesource-jobs.yaml +++ b/jjb/lf-whitesource-jobs.yaml @@ -100,7 +100,7 @@ submodule-timeout: 10 submodule-disable: false wss-unified-agent-opts: "" - wss-unified-agent-version: 19.7.1 + wss-unified-agent-version: 19.8.1 gerrit_trigger_file_paths: - compare-type: ANT diff --git a/releasenotes/notes/update-ws-cli-agent-calls-540edfb9ec9afb9f.yaml b/releasenotes/notes/update-ws-cli-agent-calls-540edfb9ec9afb9f.yaml new file mode 100644 index 00000000..2e53f9a5 --- /dev/null +++ b/releasenotes/notes/update-ws-cli-agent-calls-540edfb9ec9afb9f.yaml @@ -0,0 +1,7 @@ +--- +fixes: + - | + Remove quotes from optional var WSS_UNIFIED_AGENT_OPTIONS. + When empty, the quotes will cause WS Unified Agent failures. + - | + Upgrade WS Unified Agent CLI to latest version 19.8.1 diff --git a/shell/whitesource-unified-agent-cli.sh b/shell/whitesource-unified-agent-cli.sh index ff6db6e0..c2c8857d 100644 --- a/shell/whitesource-unified-agent-cli.sh +++ b/shell/whitesource-unified-agent-cli.sh @@ -23,5 +23,5 @@ wget -nv "${wss_unified_agent_url}" -O "${jar_location}" echo "---> Running WhiteSource Unified Agent CLI ..." java -jar "${jar_location}" -c wss-unified-agent.config \ -product "${WSS_PRODUCT_NAME}" -project "${WSS_PROJECT_NAME}" \ - -projectVersion "${GERRIT_BRANCH}" "${WSS_UNIFIED_AGENT_OPTIONS:-}" + -projectVersion "${GERRIT_BRANCH}" ${WSS_UNIFIED_AGENT_OPTIONS:-} rm "${jar_location}" -- 2.16.6