Merge "Add docker clean macro"

diff --git a/jjb/lf-python-jobs.yaml b/jjb/lf-python-jobs.yaml
index 54bab29..680228a 100644 (file)
--- a/jjb/lf-python-jobs.yaml
+++ b/jjb/lf-python-jobs.yaml
@@ -111,6 +111,11 @@
     #####################
 
     parameters:
+      - lf-infra-parameters:
+          project: '{project}'
+          branch: '{branch}'
+          stream: '{stream}'
+          lftools-version: '{lftools-version}'
       - string:
           name: NEXUS_IQ_CLI_VERSION
           default: '{nexus-iq-cli-version}'

diff --git a/shell/create-netrc.sh b/shell/create-netrc.sh
index b309c54..81ac647 100644 (file)
--- a/shell/create-netrc.sh
+++ b/shell/create-netrc.sh
@@ -13,9 +13,9 @@ echo "---> create-netrc.sh"
 # Ensure we fail the job if any steps fail.
 set -eu -o pipefail
 
-ALT_NEXUS_URL="${ALT_NEXUS_URL}"
+ALT_NEXUS_URL="${ALT_NEXUS_URL:-None}"
 
-if [ -z "$ALT_NEXUS_URL" ]
+if [[ -z "$ALT_NEXUS_URL" || "$ALT_NEXUS_URL" == "None" ]]
 then
     NEXUS_URL="${NEXUSPROXY:-$NEXUS_URL}"
 else