From 76ee13a174ec2e94048d17f3dd1c5d0355518bf5 Mon Sep 17 00:00:00 2001 From: Jessica Wagantall Date: Wed, 10 Apr 2019 16:37:51 -0700 Subject: [PATCH 1/1] Use WS Agent config file internally After checking with legal, it was agreed to not allow tech teams to provide their own wss-unified-agent.config file for WhiteSource scans. Instead, this file should be managed in Jenkins Settings Files Change-Id: I20e330794ba28cb4c0f5206c290a734c1794b00e Signed-off-by: Jessica Wagantall --- jjb/lf-whitesource-jobs.yaml | 8 ++++---- releasenotes/notes/wss-unified-agent-config-592baf00daee99e9.yaml | 8 ++++++++ shell/whitesource-unified-agent-cli.sh | 2 +- 3 files changed, 13 insertions(+), 5 deletions(-) create mode 100644 releasenotes/notes/wss-unified-agent-config-592baf00daee99e9.yaml diff --git a/jjb/lf-whitesource-jobs.yaml b/jjb/lf-whitesource-jobs.yaml index 89673741..7dc5d507 100644 --- a/jjb/lf-whitesource-jobs.yaml +++ b/jjb/lf-whitesource-jobs.yaml @@ -7,6 +7,10 @@ - builder: name: lf-infra-wss-unified-agent-scan builders: + - config-file-provider: + files: + - file-id: wss-unified-agent.config + target: $WORKSPACE/wss-unified-agent.config - shell: !include-raw: - ../shell/whitesource-unified-agent-cli.sh @@ -105,10 +109,6 @@ name: WSS_PRODUCT_NAME default: '{wss-product-name}' description: Product to asociate the WhiteSource report in the dashboard. - - string: - name: WSS_UNIFIED_AGENT_CONFIG - default: '{wss-unified-agent-config}' - description: Path to wss-unifed-agent.config - string: name: WSS_UNIFIED_AGENT_OPTIONS default: '{wss-unified-agent-opts}' diff --git a/releasenotes/notes/wss-unified-agent-config-592baf00daee99e9.yaml b/releasenotes/notes/wss-unified-agent-config-592baf00daee99e9.yaml new file mode 100644 index 00000000..c722cfa7 --- /dev/null +++ b/releasenotes/notes/wss-unified-agent-config-592baf00daee99e9.yaml @@ -0,0 +1,8 @@ +--- +fixes: + - wss-unified-agent.config file should not be opened + for configuration to tech teams. The config file should + be part of Jenkins Settings Files and called via Managed + Files. + wss-unified-agent.config must be created in Jenkins config + files based on wss-unified-agent.config.example. diff --git a/shell/whitesource-unified-agent-cli.sh b/shell/whitesource-unified-agent-cli.sh index 750a1523..6918f9cb 100644 --- a/shell/whitesource-unified-agent-cli.sh +++ b/shell/whitesource-unified-agent-cli.sh @@ -21,7 +21,7 @@ jar_location="/tmp/wss-unified-agent-$WSS_UNIFIED_AGENT_VERSION.jar" wget -nv https://s3.amazonaws.com/unified-agent/wss-unified-agent-$WSS_UNIFIED_AGENT_VERSION.jar \ -O $jar_location echo "---> Running WhiteSource Unified Agent CLI ..." -java -jar $jar_location -c $WSS_UNIFIED_AGENT_CONFIG \ +java -jar $jar_location -c wss-unified-agent.config \ -product $WSS_PRODUCT_NAME -project $WSS_PROJECT_NAME \ ${WSS_UNIFIED_AGENT_OPTIONS:-} rm $jar_location -- 2.16.6