From: Jessica Wagantall <jwagantall@linuxfoundation.org>
Date: Tue, 30 Jul 2019 21:05:21 +0000 (+0000)
Subject: Merge "Extend sonatype-clm.sh goals"
X-Git-Tag: v0.40.0~4
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=da7a332a3179b8b8ddb23f60086884af3dab1365;hp=6c2d75d8776959527346a9ea5095e4b0228adc70;p=releng%2Fglobal-jjb.git

Merge "Extend sonatype-clm.sh goals"
---

diff --git a/releasenotes/notes/release-job-download-raw-schema-637e554e5ad14f2c.yaml b/releasenotes/notes/release-job-download-raw-schema-637e554e5ad14f2c.yaml
new file mode 100644
index 00000000..e0e34c77
--- /dev/null
+++ b/releasenotes/notes/release-job-download-raw-schema-637e554e5ad14f2c.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Download raw version of release-schema.yaml to compare against
+    release files using lftools.
diff --git a/releasenotes/notes/standardize-nexus-proxy-release-job-2-9c904ce3b09d08da.yaml b/releasenotes/notes/standardize-nexus-proxy-release-job-2-9c904ce3b09d08da.yaml
new file mode 100644
index 00000000..23435673
--- /dev/null
+++ b/releasenotes/notes/standardize-nexus-proxy-release-job-2-9c904ce3b09d08da.yaml
@@ -0,0 +1,12 @@
+---
+upgrade:
+  - |
+    Projects using lf-release-jobs need to make sure they have the global
+    variable NEXUSPROXY added in Jenkins production and Jenkins sandbox
+    servers. The value of this variable should be the URL to the project's
+    Nexus server. Previous commit 118b7cbf171aca498d1a0a3a485bad990ad2e7b6
+    missed this variable.
+fixes:
+  - |
+    Avoid the usage of project specific variables. Do not use ODLNEXUSPROXY
+    var, but instead use a generalized variable.
diff --git a/shell/release-job.sh b/shell/release-job.sh
index e545ecac..ec59da09 100644
--- a/shell/release-job.sh
+++ b/shell/release-job.sh
@@ -37,7 +37,7 @@ fi
 NEXUS_URL="${NEXUSPROXY:-$NEXUS_URL}"
 
 # Fetch the release-schema.yaml
-wget -q https://github.com/lfit/releng-global-jjb/blob/master/schema/release-schema.yaml
+wget -q https://raw.githubusercontent.com/lfit/releng-global-jjb/master/schema/release-schema.yaml
 
 release_files=$(git diff HEAD^1 --name-only -- "releases/")
 echo "RELEASE FILES ARE AS FOLLOWS: $release_files"
@@ -69,7 +69,7 @@ for release_file in $release_files; do
         echo "LOGS_SERVER: $LOGS_SERVER"
         echo "NEXUS_URL: $NEXUS_URL"
         echo "NEXUS_PATH: $NEXUS_PATH"
-        echo "ODLNEXUSPROXY: $ODLNEXUSPROXY"
+        echo "NEXUSPROXY: $NEXUSPROXY"
         echo "JENKINS_HOSTNAME: $JENKINS_HOSTNAME"
         echo "SILO: $SILO"
         echo "PROJECT: $PROJECT"