From: Aric Gardner Date: Fri, 2 Aug 2019 01:27:18 +0000 (-0400) Subject: Import the pubkey and check the tag X-Git-Tag: v0.40.1~5 X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F10%2F16410%2F2;p=releng%2Fglobal-jjb.git Import the pubkey and check the tag with git tag -v $VERSION Signed-off-by: Aric Gardner Change-Id: I954dfa1c8ca09f64ff8a35c138290565de8de4b9 --- diff --git a/jjb/lf-release-jobs.yaml b/jjb/lf-release-jobs.yaml index 908881ea..02111ef7 100644 --- a/jjb/lf-release-jobs.yaml +++ b/jjb/lf-release-jobs.yaml @@ -91,6 +91,8 @@ variable: SIGUL_PASSWORD - file-id: sigul-pki variable: SIGUL_PKI + - file-id: onap-pubkey + target: "/tmp/onap-pubkey" - shell: !include-raw-escape: ../shell/sigul-configuration.sh - shell: !include-raw-escape: ../shell/sigul-install.sh - lf-release @@ -169,6 +171,8 @@ variable: SIGUL_PASSWORD - file-id: sigul-pki variable: SIGUL_PKI + - file-id: onap-pubkey + target: "/tmp/onap-pubkey" - shell: !include-raw-escape: ../shell/sigul-configuration.sh - shell: !include-raw-escape: ../shell/sigul-install.sh - lf-release diff --git a/releasenotes/notes/release-job-verify-sign-68e910725aa379ec.yaml b/releasenotes/notes/release-job-verify-sign-68e910725aa379ec.yaml new file mode 100644 index 00000000..3efcc861 --- /dev/null +++ b/releasenotes/notes/release-job-verify-sign-68e910725aa379ec.yaml @@ -0,0 +1,4 @@ +--- +fixes: + - | + Allow lf_release_verify and lf_release_merge to verify tag signature. diff --git a/shell/release-job.sh b/shell/release-job.sh index 783979a6..5b163c89 100644 --- a/shell/release-job.sh +++ b/shell/release-job.sh @@ -98,8 +98,11 @@ for release_file in $release_files; do 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" + echo "Showing latest signature for $PROJECT:" - git log --show-signature -n1 + gpg --import /tmp/onap-pubkey + echo "git tag -v "$VERSION"" + git tag -v "$VERSION" ########## Merge Part ##############