From: Tim Rozet <trozet@redhat.com>
Date: Thu, 21 Jun 2018 17:56:02 +0000 (-0400)
Subject: Apex: Fix usage of gpg key import
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=4c34259866bd34d79fb5a100b8355404d9eca36a;p=releng.git

Apex: Fix usage of gpg key import

Removes using source to call the gpg import script. source will execute
the script in the current shell, which will exit the artifact upload.
Adds checking to make sure we ignore any failure with running the
script.

Change-Id: I587cf9584f9fa8c4d315b7b2328a6c7c55ae3b88
Signed-off-by: Tim Rozet <trozet@redhat.com>
---

diff --git a/jjb/apex/apex-upload-artifact.sh b/jjb/apex/apex-upload-artifact.sh
index 8743368fb..6acb2a582 100755
--- a/jjb/apex/apex-upload-artifact.sh
+++ b/jjb/apex/apex-upload-artifact.sh
@@ -24,7 +24,9 @@ importkey () {
   git clone https://gerrit.opnfv.org/gerrit/releng $WORKSPACE/releng/ &> /dev/null
   #this is where we import the siging key
   if [ -f $WORKSPACE/releng/utils/gpg_import_key.sh ]; then
-    source $WORKSPACE/releng/utils/gpg_import_key.sh
+    if ! $WORKSPACE/releng/utils/gpg_import_key.sh; then
+      echo "WARNING: Failed to run gpg key import"
+    fi
   fi
 }