From: Aric Gardner <agardner@linuxfoundation.org>
Date: Sun, 4 Aug 2019 23:26:45 +0000 (+0000)
Subject: Merge "Add release notes for lftools v0.25.3 release"
X-Git-Tag: v0.40.3
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=fa65bf37bec11c24f79561a42ee8258498a1230f;hp=6842737b2605b029bf1a199fc6158b81035c82d3;p=releng%2Fglobal-jjb.git

Merge "Add release notes for lftools v0.25.3 release"
---

diff --git a/jjb/lf-release-jobs.yaml b/jjb/lf-release-jobs.yaml
index f016e37b..3f226db4 100644
--- a/jjb/lf-release-jobs.yaml
+++ b/jjb/lf-release-jobs.yaml
@@ -124,7 +124,7 @@
               project-pattern: "{project}"
               branches:
                 - branch-compare-type: "ANT"
-                  branch-pattern: "**/master"
+                  branch-pattern: "**/{branch}"
               file-paths: "{obj:gerrit_trigger_file_paths}"
           skip-vote:
             successful: "{gerrit-skip-vote}"
@@ -204,5 +204,5 @@
               project-pattern: "{project}"
               branches:
                 - branch-compare-type: "ANT"
-                  branch-pattern: "**/master"
+                  branch-pattern: "**/{branch}"
               file-paths: "{obj:gerrit_trigger_file_paths}"
diff --git a/releasenotes/notes/fix-release-job-script-0179491d09b06e66.yaml b/releasenotes/notes/fix-release-job-script-0179491d09b06e66.yaml
new file mode 100644
index 00000000..c78c6e09
--- /dev/null
+++ b/releasenotes/notes/fix-release-job-script-0179491d09b06e66.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Fix the release job script to handle any trailing '/' set on log_dir
+    and also handle unbound variables correctly.
diff --git a/releasenotes/notes/update-release-jobs-gerrit-trigger-151a3849847e235a.yaml b/releasenotes/notes/update-release-jobs-gerrit-trigger-151a3849847e235a.yaml
new file mode 100644
index 00000000..62f04792
--- /dev/null
+++ b/releasenotes/notes/update-release-jobs-gerrit-trigger-151a3849847e235a.yaml
@@ -0,0 +1,6 @@
+---
+issues:
+  - |
+    Update release job template to tigger on any branch name, and not just
+    'master'. ODL projects branches are version '4.0.x' which requires
+    passing the branch name to the template.
diff --git a/shell/release-job.sh b/shell/release-job.sh
index a0e6b448..d9880cd3 100644
--- a/shell/release-job.sh
+++ b/shell/release-job.sh
@@ -34,6 +34,7 @@ if [ "${LOGS_SERVER}" == 'None' ]; then
     exit 1
 fi
 
+NEXUSPROXY="${NEXUSPROXY:-None}"
 NEXUS_URL="${NEXUSPROXY:-$NEXUS_URL}"
 
 # Fetch the release-schema.yaml
@@ -61,7 +62,8 @@ NEXUS_PATH="${SILO}/${JENKINS_HOSTNAME}/"
 LOGS_URL="${LOGS_SERVER}/${NEXUS_PATH}${LOG_DIR}"
 PATCH_DIR="$(mktemp -d)"
 
-wget --quiet -P "$PATCH_DIR" "${LOGS_URL}"staging-repo.txt.gz
+LOGS_URL=${LOGS_URL%/}  # strip any trailing '/'
+wget -P "$PATCH_DIR" "${LOGS_URL}/"staging-repo.txt.gz
 
 nexus_release(){
 for staging_url in $(zcat "$PATCH_DIR"/staging-repo.txt.gz | awk -e '{print $2}'); do