Merge "Use release credentials only for merge job wrappers"

diff --git a/docs/jjb/lf-release-jobs.rst b/docs/jjb/lf-release-jobs.rst
index 00c43cf..eb4e802 100644 (file)
--- a/docs/jjb/lf-release-jobs.rst
+++ b/docs/jjb/lf-release-jobs.rst
@@ -117,12 +117,12 @@ Add a global credential to Jenkins called ``jenkins-release`` and set the ID: ``
 as its value insert the ``ssh-key`` that you uploaded to Gerrit.
 
 Add Global vars in Jenkins:
-Jenkins configre -> Global properties -> Environment variables
+Jenkins configure -> Global properties -> Environment variables
 
 ``RELEASE_USERNAME = $RELEASE_USERNAME``
 ``RELEASE_EMAIL = $RELEASE_EMAIL``
 
-Jenkins configre -> Managed Files -> Custom File
+Jenkins configure -> Managed Files -> Custom File
 
 id: signing-pubkey
 Name: SIGNING_PUBKEY (optional)
@@ -144,8 +144,8 @@ Jenkins Settings -> Managed files -> Add (or edit) -> Custom file
 Ci-management
 =============
 
-upgrade you projects global-jjb if needed
-add this to your global defaults file (eg: jjb/defaults.yaml)
+Upgrade your projects global-jjb if needed
+add this to your global defaults file (eg: jjb/defaults.yaml).
 
 .. code-block:: bash
 

diff --git a/releasenotes/notes/fix-if-release-job-00c86eecc6a92e2b.yaml b/releasenotes/notes/fix-if-release-job-00c86eecc6a92e2b.yaml
new file mode 100644 (file)
index 0000000..69a2f44
--- /dev/null
+++ b/releasenotes/notes/fix-if-release-job-00c86eecc6a92e2b.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Git fetch needs the dashed version git fetch
+    "$PATCH_DIR/${PROJECT//\//-}.bundle". Fix if statement.

diff --git a/shell/release-job.sh b/shell/release-job.sh
index ad118de..dfc65db 100644 (file)
--- a/shell/release-job.sh
+++ b/shell/release-job.sh
@@ -116,10 +116,10 @@ if git tag -v "$VERSION"; then
   echo "Repo already tagged $VERSION"
   echo "This job has already run exit 0"
   exit 0
-if
+fi
 
 git checkout "$(awk '{print $NF}' "$PATCH_DIR/taglist.log")"
-git fetch "$PATCH_DIR/$PROJECT.bundle"
+git fetch "$PATCH_DIR/${PROJECT//\//-}.bundle"
 git merge --ff-only FETCH_HEAD
 git tag -am "${PROJECT//\//-} $VERSION" "$VERSION"
 sigul --batch -c "$SIGUL_CONFIG" sign-git-tag "$SIGUL_KEY" "$VERSION" < "$SIGUL_PASSWORD"
@@ -145,5 +145,5 @@ fi
 
 # This function: if merge push to nexus. If verify output the proposed push command.
 nexus_release
-
-echo "########### End Script release-job.sh ###################################"
+#
+#echo "########### End Script release-job.sh ###################################"