From aa19a2af17fa4269f3206bdaec23c10dc91dd11a Mon Sep 17 00:00:00 2001
From: Akira Ajisaka <aajisaka@apache.org>
Date: Wed, 3 Jun 2020 18:01:37 +0900
Subject: [PATCH] HADOOP-17056. shelldoc fails in hadoop-common. (#2045)

In the docker build image, skip GPG verification when downloading
Yetus tarball via yetus-wrapper.

(cherry picked from commit 9c290c08db4361de29f392b0569312c2623b8321)

 Conflicts:
	dev-support/docker/Dockerfile
	dev-support/docker/Dockerfile_aarch64
---
 dev-support/bin/yetus-wrapper | 2 +-
 dev-support/docker/Dockerfile | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/dev-support/bin/yetus-wrapper b/dev-support/bin/yetus-wrapper
index b0f71f105d8..bca2316ae67 100755
--- a/dev-support/bin/yetus-wrapper
+++ b/dev-support/bin/yetus-wrapper
@@ -144,7 +144,7 @@ else
   exit 1
 fi
 
-if [[ -n "${GPGBIN}" ]]; then
+if [[ -n "${GPGBIN}" && ! "${HADOOP_SKIP_YETUS_VERIFICATION}" = true ]]; then
   if ! mkdir -p .gpg; then
     yetus_error "ERROR: yetus-dl: Unable to create ${HADOOP_PATCHPROCESS}/.gpg"
     exit 1
diff --git a/dev-support/docker/Dockerfile b/dev-support/docker/Dockerfile
index a01815f9765..caec5ed6668 100644
--- a/dev-support/docker/Dockerfile
+++ b/dev-support/docker/Dockerfile
@@ -202,6 +202,8 @@ RUN curl -L -s -S \
 ###
 ENV MAVEN_OPTS -Xms256m -Xmx1536m
 
+# Skip gpg verification when downlonading Yetus via yetus-wrapper
+ENV HADOOP_SKIP_YETUS_VERIFICATION true
 
 ###
 # Everything past this point is either not needed for testing or breaks Yetus.