From: beierlm <mark.beierl@canonical.com>
Date: Thu, 17 Mar 2022 19:42:27 +0000 (-0400)
Subject: Bug 1912 Update GPG Signing
X-Git-Tag: v10.1.1-rc1~11
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=5e2073ee3acdc8d4d94da8fc0c42d54e19aee20d;p=osm%2Fdevops.git

Bug 1912 Update GPG Signing

Update the CLI arguments for GPG signing so that it reads the passphrase
passed in via the CLI.  This is needed as the version of GPG has been updated
and no longer accepts the old CLI arguments.

Fixes bug 1912

Change-Id: I0a850b3f1641edb917624be8fd94be78667d01fd
Signed-off-by: beierlm <mark.beierl@canonical.com>
(cherry picked from commit 0678de06317f49da496226587772a23635e3728c)
---

diff --git a/tools/gen-repo.sh b/tools/gen-repo.sh
index 24646d17..b5dec971 100755
--- a/tools/gen-repo.sh
+++ b/tools/gen-repo.sh
@@ -125,7 +125,7 @@ dump_vars
 $JFROG_CLI rt download --build "$BUILD" osm-release || FATAL "Failed to download"
 
 
-[ $PASSPHRASE_FILE ] && GPG_PASSPHRASE="--no-tty --no-use-agent --passphrase \"$(cat $PASSPHRASE_FILE)\""
+[ $PASSPHRASE_FILE ] && GPG_PASSPHRASE="--pinentry-mode=loopback --passphrase \"$(cat $PASSPHRASE_FILE)\""
 
 mkdir -p $BASE_DIR/dists
 
@@ -154,10 +154,10 @@ apt-ftparchive release dists/$OUT_REPO > dists/$OUT_REPO/Release
 #gzip -9fk dists/$OUT_REPO/Release
 
 rm -f dists/$OUT_REPO/InRelease
-eval gpg $GPG_PASSPHRASE --no-tty --default-key $GPGKEY --clearsign -o dists/$OUT_REPO/InRelease dists/$OUT_REPO/Release
+eval gpg $GPG_PASSPHRASE --default-key $GPGKEY --clearsign -o dists/$OUT_REPO/InRelease dists/$OUT_REPO/Release
 
 rm -f dists/$OUT_REPO/Release.gpg
-eval gpg $GPG_PASSPHRASE --no-tty --default-key $GPGKEY -abs -o dists/$OUT_REPO/Release.gpg dists/$OUT_REPO/Release
+eval gpg $GPG_PASSPHRASE --default-key $GPGKEY -abs -o dists/$OUT_REPO/Release.gpg dists/$OUT_REPO/Release
 
 echo "performing rsync of repo $RELEASE_DIR/dist/$OUT_REPO to osm-download.etsi.org:/repos/"
 cd $CURR_DIR/$REPO_BASE