Had an if where I needed a fi 52/16452/2
authorAric Gardner <agardner@linuxfoundation.org>
Tue, 6 Aug 2019 02:08:41 +0000 (22:08 -0400)
committerJessica Wagantall <jwagantall@linuxfoundation.org>
Tue, 6 Aug 2019 02:14:18 +0000 (19:14 -0700)
Also the git fetch needs the dashed version
git fetch "$PATCH_DIR/${PROJECT//\//-}.bundle"

Signed-off-by: Aric Gardner <agardner@linuxfoundation.org>
Change-Id: Ib4245be2b46645fca93225a5c32efb904acd68c8

releasenotes/notes/fix-if-release-job-00c86eecc6a92e2b.yaml [new file with mode: 0644]
shell/release-job.sh

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
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Git fetch needs the dashed version git fetch
+    "$PATCH_DIR/${PROJECT//\//-}.bundle". Fix if statement.
index ad118de..dfc65db 100644 (file)
@@ -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 ###################################"