From 33d8d18e8981751af8602f497e53512478ee2696 Mon Sep 17 00:00:00 2001 From: Jessica Wagantall Date: Fri, 2 Aug 2019 16:04:08 -0700 Subject: [PATCH] Fix release-job.sh Use {GERRIT_PROJECT} when calling Gerrit in release-merge job. Change-Id: I0d62d5c713858e7e43b2fc6a6462813b01bea2f8 Signed-off-by: Jessica Wagantall --- .../notes/fix-release-merge-project-var-f0813d92a42db8b1.yaml | 4 ++++ shell/release-job.sh | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/fix-release-merge-project-var-f0813d92a42db8b1.yaml diff --git a/releasenotes/notes/fix-release-merge-project-var-f0813d92a42db8b1.yaml b/releasenotes/notes/fix-release-merge-project-var-f0813d92a42db8b1.yaml new file mode 100644 index 00000000..553d61ec --- /dev/null +++ b/releasenotes/notes/fix-release-merge-project-var-f0813d92a42db8b1.yaml @@ -0,0 +1,4 @@ +--- +fixes: + - | + Use {GERRIT_PROJECT} when calling Gerrit in release-merge job. diff --git a/shell/release-job.sh b/shell/release-job.sh index 68f35db3..a0e6b448 100644 --- a/shell/release-job.sh +++ b/shell/release-job.sh @@ -124,7 +124,7 @@ git tag -v "$VERSION" if [[ "$JOB_NAME" =~ "merge" ]]; then echo "Running merge" gerrit_ssh=$(echo "$GERRIT_URL" | awk -F"/" '{print $3}') - git remote set-url origin ssh://"$RELEASE_USERNAME"@"$gerrit_ssh":29418/$PROJECT + git remote set-url origin ssh://"$RELEASE_USERNAME"@"$gerrit_ssh":29418/$GERRIT_PROJECT git config user.name "$RELEASE_USERNAME" git config user.email "$RELEASE_EMAIL" echo -e "Host $gerrit_ssh\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config -- 2.16.6