You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2021/10/20 13:57:59 UTC

[hbase] branch HBASE-26318 updated (cbc3743 -> 425548a)

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

zhangduo pushed a change to branch HBASE-26318
in repository https://gitbox.apache.org/repos/asf/hbase.git.


    omit cbc3743  fix
    omit 8d9b6b7  pass asf nightlies as parameter
    omit de3c3cc  fix syntax
    omit 335102f  fix syntax
    omit 24a3c98  fix syntax error
    omit fd0a4bd  test upload site
     new 425548a  test upload site

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (cbc3743)
            \
             N -- N -- N   refs/heads/HBASE-26318 (425548a)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 dev-support/hbase-personality.sh | 1 +
 1 file changed, 1 insertion(+)

[hbase] 01/01: test upload site

Posted by zh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

zhangduo pushed a commit to branch HBASE-26318
in repository https://gitbox.apache.org/repos/asf/hbase.git

commit 425548a8fb77aac643622aba388ed7453861071d
Author: Duo Zhang <zh...@apache.org>
AuthorDate: Wed Oct 20 21:57:14 2021 +0800

    test upload site
---
 dev-support/Jenkinsfile_GitHub                | 35 ++++++++++++++++++++++++---
 dev-support/hbase-personality.sh              | 10 +++++++-
 dev-support/jenkins_precommit_github_yetus.sh |  4 +++
 3 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/dev-support/Jenkinsfile_GitHub b/dev-support/Jenkinsfile_GitHub
index 530fc6d..c0b8fb2 100644
--- a/dev-support/Jenkinsfile_GitHub
+++ b/dev-support/Jenkinsfile_GitHub
@@ -53,6 +53,8 @@ pipeline {
         WORKDIR_REL_JDK8_HADOOP3_CHECK = 'yetus-jdk8-hadoop3-check'
         WORKDIR_REL_JDK11_HADOOP3_CHECK = 'yetus-jdk11-hadoop3-check'
         ASF_NIGHTLIES = 'https://nightlies.apache.org'
+        ASF_NIGHTLIES_BASE_ORI = "${ASF_NIGHTLIES}/hbase/${JOB_NAME}/${BUILD_NUMBER}"
+        ASF_NIGHTLIES_BASE = "${ASF_NIGHTLIES_BASE_ORI.replaceAll(' ', '%20')}"
     }
 
     parameters {
@@ -124,9 +126,34 @@ pipeline {
                     }
                     post {
                         always {
+                            sshPublisher(publishers: [
+                              sshPublisherDesc(configName: 'Nightlies',
+                                transfers: [
+                                  sshTransfer(remoteDirectory: "hbase/${JOB_NAME}/${BUILD_NUMBER}",
+                                    sourceFiles: "${env.WORKDIR_REL}/${env.PATCH_REL}/patch-site/*,${env.WORKDIR_REL}/${env.PATCH_REL}/*-site/**/*"
+                                  )
+                                ]
+                              )
+                            ])
+                            sh '''#!/bin/bash -e
+                            if [ -d "${WORKDIR_REL}/${PATCH_REL}/branch-site" ]; then
+                              echo "Remove ${WORKDIR_REL}/${PATCH_REL}/branch-site for saving space"
+                              rm -rf "${WORKDIR_REL}/${PATCH_REL}/branch-site"
+                              python ${SOURCEDIR}/dev-support/gen_redirect_html.py "${ASF_NIGHTLIES_BASE}/${WORKDIR_REL}/${PATCH_REL}/branch-site" > "${PATCHDIR}/branch-site.html"
+                            else
+                              echo "No branch-site, skipping"
+                            fi
+                            if [ -d "${WORKDIR_REL}/${PATCH_REL}/patch-site" ]; then
+                              echo "Remove ${WORKDIR_REL}/${PATCH_REL}/patch-site for saving space"
+                              rm -rf "${WORKDIR_REL}/${PATCH_REL}/patch-site"
+                              python ${SOURCEDIR}/dev-support/gen_redirect_html.py "${ASF_NIGHTLIES_BASE}/${WORKDIR_REL}/${PATCH_REL}/patch-site" > "${PATCHDIR}/patch-site.html"
+                            else
+                              echo "No patch-site, skipping"
+                            fi
+                            '''
                             // Has to be relative to WORKSPACE.
-                            archiveArtifacts artifacts: "${WORKDIR_REL}/${PATCH_REL}/*", excludes: "${WORKDIR_REL}/${PATCH_REL}/precommit"
-                            archiveArtifacts artifacts: "${WORKDIR_REL}/${PATCH_REL}/**/*", excludes: "${WORKDIR_REL}/${PATCH_REL}/precommit/**/*"
+                            archiveArtifacts artifacts: "${WORKDIR_REL}/${PATCH_REL}/*"
+                            archiveArtifacts artifacts: "${WORKDIR_REL}/${PATCH_REL}/**/*"
                             publishHTML target: [
                               allowMissing: true,
                               keepAll: true,
@@ -250,7 +277,7 @@ pipeline {
                             if [ -f "${PATCHDIR}/test_logs.zip" ]; then
                               echo "Remove ${PATCHDIR}/test_logs.zip for saving space"
                               rm -rf "${PATCHDIR}/test_logs.zip"
-                              python ${SOURCEDIR}/dev-support/gen_redirect_html.py "${ASF_NIGHTLIES}/hbase/${JOB_NAME}/${BUILD_NUMBER}/${WORKDIR_REL}/${PATCH_REL}" > "${PATCHDIR}/test_logs.html"
+                              python ${SOURCEDIR}/dev-support/gen_redirect_html.py "${ASF_NIGHTLIES_BASE}/${WORKDIR_REL}/${PATCH_REL}" > "${PATCHDIR}/test_logs.html"
                             else
                               echo "No test_logs.zip, skipping"
                             fi
@@ -381,7 +408,7 @@ pipeline {
                             if [ -f "${PATCHDIR}/test_logs.zip" ]; then
                               echo "Remove ${PATCHDIR}/test_logs.zip for saving space"
                               rm -rf "${PATCHDIR}/test_logs.zip"
-                              python ${SOURCEDIR}/dev-support/gen_redirect_html.py "${ASF_NIGHTLIES}/hbase/${JOB_NAME}/${BUILD_NUMBER}/${WORKDIR_REL}/${PATCH_REL}" > "${PATCHDIR}/test_logs.html"
+                              python ${SOURCEDIR}/dev-support/gen_redirect_html.py "${ASF_NIGHTLIES_BASE}/${WORKDIR_REL}/${PATCH_REL}" > "${PATCHDIR}/test_logs.html"
                             else
                               echo "No test_logs.zip, skipping"
                             fi
diff --git a/dev-support/hbase-personality.sh b/dev-support/hbase-personality.sh
index 6eb38e3..a4f91c8 100755
--- a/dev-support/hbase-personality.sh
+++ b/dev-support/hbase-personality.sh
@@ -115,6 +115,10 @@ function personality_parse_args
         delete_parameter "${i}"
         SKIP_ERRORPRONE=true
       ;;
+      --asf-nightlies-base)
+        delete_parameter "${i}"
+        ASF_NIGHTLIES_BASE=${i#*=}
+      ;;
     esac
   done
 }
@@ -414,7 +418,11 @@ function refguide_rebuild
   fi
 
   add_vote_table 0 refguide "${repostatus} has no errors when building the reference guide. See footer for rendered docs, which you should manually inspect."
-  add_footer_table refguide "@@BASE@@/${repostatus}-site/book.html"
+  if [[ -n "${ASF_NIGHTLIES_BASE}" ]]; then
+    add_footer_table refguide "${ASF_NIGHTLIES_BASE}/${repostatus}-site/book.html"
+  else
+    add_footer_table refguide "@@BASE@@/${repostatus}-site/book.html"
+  fi
   return 0
 }
 
diff --git a/dev-support/jenkins_precommit_github_yetus.sh b/dev-support/jenkins_precommit_github_yetus.sh
index 5bb2b1b..d77f831 100755
--- a/dev-support/jenkins_precommit_github_yetus.sh
+++ b/dev-support/jenkins_precommit_github_yetus.sh
@@ -143,6 +143,10 @@ fi
 YETUS_ARGS+=("--sentinel")
 # use emoji vote so it is easier to find the broken line
 YETUS_ARGS+=("--github-use-emoji-vote")
+# pass asf nightlies url in
+if [[ -n "${ASF_NIGHTLIES_BASE}" ]]; then
+  YETUS_ARGS+=("--asf-nightlies-base=${ASF_NIGHTLIES_BASE}")
+fi
 
 echo "Launching yetus with command line:"
 echo "${TESTPATCHBIN} ${YETUS_ARGS[*]}"