From 09801bcac5ad6e5f238435d552213969862ad0dd Mon Sep 17 00:00:00 2001 From: Rushabh Date: Thu, 22 Aug 2019 14:48:58 -0700 Subject: [PATCH 1/2] [HBASE-22852] Stop gpg agent daemons in hbase nightlies. --- .../jenkins-scripts/cache-apache-project-artifact.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dev-support/jenkins-scripts/cache-apache-project-artifact.sh b/dev-support/jenkins-scripts/cache-apache-project-artifact.sh index 57853c3d090e..32a759a07d06 100755 --- a/dev-support/jenkins-scripts/cache-apache-project-artifact.sh +++ b/dev-support/jenkins-scripts/cache-apache-project-artifact.sh @@ -123,6 +123,12 @@ if [ -n "${keys}" ]; then echo "signature good." fi +if [ -n "${keys}" ]; then + echo "Stopping gpg agent daemon" + gpgconf --homedir "${working_dir}/.gpg" --kill gpg-agent + echo "Stopped gpg agent daemon" +fi + echo "moving artifact into place at '${target}'" # ensure we're on the same filesystem mv "${working_dir}/artifact" "${target}.copying" From 62d5b2f2af2e2dd32317d16f7dcdf24bb6ee08e1 Mon Sep 17 00:00:00 2001 From: Rushabh Date: Fri, 23 Aug 2019 14:39:12 -0700 Subject: [PATCH 2/2] [HBASE-22852] Addressing review comment. --- .../jenkins-scripts/cache-apache-project-artifact.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dev-support/jenkins-scripts/cache-apache-project-artifact.sh b/dev-support/jenkins-scripts/cache-apache-project-artifact.sh index 32a759a07d06..5653b05cb4e2 100755 --- a/dev-support/jenkins-scripts/cache-apache-project-artifact.sh +++ b/dev-support/jenkins-scripts/cache-apache-project-artifact.sh @@ -78,6 +78,12 @@ else fi function cleanup { + if [ -n "${keys}" ]; then + echo "Stopping gpg agent daemon" + gpgconf --homedir "${working_dir}/.gpg" --kill gpg-agent + echo "Stopped gpg agent daemon" + fi + if [ "true" = "${cleanup}" ]; then echo "cleaning up temp space." rm -rf "${working_dir}" @@ -123,12 +129,6 @@ if [ -n "${keys}" ]; then echo "signature good." fi -if [ -n "${keys}" ]; then - echo "Stopping gpg agent daemon" - gpgconf --homedir "${working_dir}/.gpg" --kill gpg-agent - echo "Stopped gpg agent daemon" -fi - echo "moving artifact into place at '${target}'" # ensure we're on the same filesystem mv "${working_dir}/artifact" "${target}.copying"