[hadoop] branch branch-3.3 updated: HADOOP-17056. shelldoc fails in hadoop-common. (#2045)

[aa...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

aajisaka pushed a commit to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/hadoop.git


The following commit(s) were added to refs/heads/branch-3.3 by this push:
     new c88bf7a  HADOOP-17056. shelldoc fails in hadoop-common. (#2045)
c88bf7a is described below

commit c88bf7acc1571e5348a1a5fb895e1f7cb45bf5c7
Author: Akira Ajisaka <aa...@apache.org>
AuthorDate: Wed Jun 3 18:01:37 2020 +0900

    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)
---
 dev-support/bin/yetus-wrapper         | 2 +-
 dev-support/docker/Dockerfile         | 3 +++
 dev-support/docker/Dockerfile_aarch64 | 3 +++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/dev-support/bin/yetus-wrapper b/dev-support/bin/yetus-wrapper
index b0f71f1..bca2316 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 1fcb646..b1a0982 100644
--- a/dev-support/docker/Dockerfile
+++ b/dev-support/docker/Dockerfile
@@ -209,6 +209,9 @@ 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.
 # So tell Yetus not to read the rest of the file:
diff --git a/dev-support/docker/Dockerfile_aarch64 b/dev-support/docker/Dockerfile_aarch64
index 8f5ebf0..00f53ae 100644
--- a/dev-support/docker/Dockerfile_aarch64
+++ b/dev-support/docker/Dockerfile_aarch64
@@ -218,6 +218,9 @@ RUN mkdir -p /opt/phantomjs \
 ###
 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.
 # So tell Yetus not to read the rest of the file:


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org