From 86ae572786ca584b4421e60b7e1a6ae11854025d Mon Sep 17 00:00:00 2001
From: Jessica Wagantall <jwagantall@linuxfoundation.org>
Date: Thu, 19 Apr 2018 18:03:02 -0700
Subject: [PATCH] Update XC CLM job parameters

- Remove unused archive-artifacts log patterns
  - Many of these are Maven related and unused in Python.
- Adjust NEXUS_IQ_CLI_VERSION parameter name to unspecify
  CLI format.

Changes made in response to the comments in
I5e5c420539ab3a3e5b292620da4418c16d557221

Change-Id: I0dde9b18468d52574b969c1f83c93f8ff0950faa
Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
---
 jjb/lf-python-jobs.yaml | 19 +++++++------------
 shell/nexus-iq-cli.sh   |  6 ++++--
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/jjb/lf-python-jobs.yaml b/jjb/lf-python-jobs.yaml
index fc644c0c..fecaeff4 100644
--- a/jjb/lf-python-jobs.yaml
+++ b/jjb/lf-python-jobs.yaml
@@ -51,10 +51,7 @@
 
     archive-artifacts: >
       **/*.log
-      **/hs_err_*.log
-      **/target/**/feature.xml
-      **/target/failsafe-reports/failsafe-summary.xml
-      **/target/surefire-reports/*-output.txt
+    nexus-iq-cli-version: 1.44.0-01
 
     #####################
     # Job Configuration #
@@ -73,14 +70,6 @@
           branch: '{branch}'
           stream: '{stream}'
           lftools-version: '{lftools-version}'
-      - string:
-          name: NEXUS_IQ_CLI_JAR
-          default: nexus-iq-cli-1.44.0-01.jar
-          description: Nexus IQ CLI package to download and use.
-      - string:
-          name: ARCHIVE_ARTIFACTS
-          default: '{archive-artifacts}'
-          description: Artifacts to archive to the logs server.
 
     wrappers:
       - lf-infra-wrappers:
@@ -118,6 +107,12 @@
     # Job Configuration #
     #####################
 
+    parameters:
+      - string:
+          name: NEXUS_IQ_CLI_VERSION
+          default: '{nexus-iq-cli-version}'
+          description: Nexus IQ CLI package to download and use.
+
     triggers:
       # Build weekly on Saturdays
       - timed: 'H H * * 6'
diff --git a/shell/nexus-iq-cli.sh b/shell/nexus-iq-cli.sh
index d12e6700..43021f82 100644
--- a/shell/nexus-iq-cli.sh
+++ b/shell/nexus-iq-cli.sh
@@ -14,8 +14,10 @@
 # the repo
 
 set +x
-wget -nv https://download.sonatype.com/clm/scanner/${NEXUS_IQ_CLI_JAR} -O /tmp/${NEXUS_IQ_CLI_JAR}
+CLI_LOCATION="/tmp/nexus-iq-cli-${NEXUS_IQ_CLI_VERSION}.jar"
+wget -nv https://download.sonatype.com/clm/scanner/nexus-iq-cli-${NEXUS_IQ_CLI_VERSION}.jar -O ${CLI_LOCATION}
 echo "-a" > cli-auth.txt
 echo "${CLM_USER}:${CLM_PASSWORD}" >> cli-auth.txt
-java -jar /tmp/${NEXUS_IQ_CLI_JAR} @cli-auth.txt -xc -i ${CLM_PROJECT_NAME} -s https://nexus-iq.wl.linuxfoundation.org -t build .
+java -jar ${CLI_LOCATION} @cli-auth.txt -xc -i ${CLM_PROJECT_NAME} -s https://nexus-iq.wl.linuxfoundation.org -t build .
 rm cli-auth.txt
+rm ${CLI_LOCATION}
-- 
2.16.6