From: Aric Gardner Date: Tue, 6 Aug 2019 02:08:41 +0000 (-0400) Subject: Had an if where I needed a fi X-Git-Tag: v0.40.4~2 X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F52%2F16452%2F2;p=releng%2Fglobal-jjb.git Had an if where I needed a fi Also the git fetch needs the dashed version git fetch "$PATCH_DIR/${PROJECT//\//-}.bundle" Signed-off-by: Aric Gardner Change-Id: Ib4245be2b46645fca93225a5c32efb904acd68c8 --- diff --git a/releasenotes/notes/fix-if-release-job-00c86eecc6a92e2b.yaml b/releasenotes/notes/fix-if-release-job-00c86eecc6a92e2b.yaml new file mode 100644 index 00000000..69a2f44e --- /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 ad118ded..dfc65db7 100644 --- 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 ###################################"