This is an automated email from the ASF dual-hosted git repository.
xxyu pushed a commit to branch kylin5-tmp
in repository https://gitbox.apache.org/repos/asf/kylin.git
The following commit(s) were added to refs/heads/kylin5-tmp by this push:
new e758a8ed33 Update
e758a8ed33 is described below
commit e758a8ed33cf67d3ac28b1be2e71ff3403e94968
Author: XiaoxiangYu <x...@apache.org>
AuthorDate: Mon Sep 11 15:55:23 2023 +0800
Update
---
.../release-machine/Dockerfile_2 | 2 +-
.../release-machine/create-release-machine.sh | 12 +++----
.../release-machine/release-publish.sh | 41 ++++++++++++----------
pom.xml | 11 ++++++
4 files changed, 40 insertions(+), 26 deletions(-)
diff --git a/build/release/release-pipeline-docker/release-machine/Dockerfile_2
b/build/release/release-pipeline-docker/release-machine/Dockerfile_2
index abdb44f632..da75a7c459 100644
--- a/build/release/release-pipeline-docker/release-machine/Dockerfile_2
+++ b/build/release/release-pipeline-docker/release-machine/Dockerfile_2
@@ -21,7 +21,7 @@
# 1. https://www.apache.org/legal/release-policy.html
# 2. https://infra.apache.org/release-publishing.html
-FROM release-machine:5.0-base
+FROM apachekylin/release-machine:5.0-base
COPY conf/settings.xml /root/.m2/settings.xml
COPY release-publish.sh /root/release-publish.sh
RUN chmod u+x /root/release-publish.sh
\ No newline at end of file
diff --git
a/build/release/release-pipeline-docker/release-machine/create-release-machine.sh
b/build/release/release-pipeline-docker/release-machine/create-release-machine.sh
index 497944cc6b..e5f6f9cc7d 100644
---
a/build/release/release-pipeline-docker/release-machine/create-release-machine.sh
+++
b/build/release/release-pipeline-docker/release-machine/create-release-machine.sh
@@ -22,12 +22,12 @@
docker image rm release-machine:latest
build_status='1'
-while [ "$build_status" != "0" ]
-do
- echo "Build release-machine from $(date)"
- docker build -f Dockerfile_1 -t release-machine:5.0-base .
- build_status="$?"
-done
+#while [ "$build_status" != "0" ]
+#do
+# echo "Build release-machine from $(date)"
+# docker build -f Dockerfile_1 -t release-machine:5.0-base .
+# build_status="$?"
+#done
docker build -f Dockerfile_2 -t release-machine:latest .
diff --git
a/build/release/release-pipeline-docker/release-machine/release-publish.sh
b/build/release/release-pipeline-docker/release-machine/release-publish.sh
index 615e0891ef..f6c126e207 100644
--- a/build/release/release-pipeline-docker/release-machine/release-publish.sh
+++ b/build/release/release-pipeline-docker/release-machine/release-publish.sh
@@ -80,18 +80,19 @@ fi
function read_config {
if [ "$MODE" = "batch" ] ;then
- return 0
- fi
- local PROMPT="$1"
- local DEFAULT="$2"
- local REPLY=
-
- read -p "$PROMPT [default is $DEFAULT]: " REPLY
- local RETVAL="${REPLY:-$DEFAULT}"
- if [ -z "$RETVAL" ]; then
- error "$PROMPT is must be provided."
+ echo "$DEFAULT"
+ elif [ "$MODE" = "" ]; then
+ local PROMPT="$1"
+ local DEFAULT="$2"
+ local REPLY=
+
+ read -p "$PROMPT [default is $DEFAULT]: " REPLY
+ local RETVAL="${REPLY:-$DEFAULT}"
+ if [ -z "$RETVAL" ]; then
+ error "$PROMPT is must be provided."
+ fi
+ echo "$RETVAL"
fi
- echo "$RETVAL"
}
function run_command {
@@ -134,13 +135,15 @@ RELEASE_VERSION=$(read_config "Which version are you
going to release?" "$RELEAS
NEXT_RELEASE_VERSION=$(read_config "Which version is the next development
version?" "$NEXT_RELEASE_VERSION")
RC_NUMBER="rc"$(read_config "Number for release candidate?" "$RC_NUMBER")
-export working_dir=/root/release-folder
-source_code_folder=$working_dir/source/kylin
+export working_dir=/root/kylin-folder
svn_folder=$working_dir/svn
+source_code_folder=$working_dir/source/kylin
+
packaging_folder=$source_code_folder/target/checkout
svn_stage_folder=$svn_folder/dev
rc_name=apache-kylin-"${RELEASE_VERSION}"-${RC_NUMBER}
release_candidate_folder=$svn_stage_folder/$rc_name
+final_release_folder=$svn_folder/release
branch_doc_1=document
branch_doc_2=doc5.0
@@ -202,12 +205,12 @@ function prepare_release {
then
mkdir -p ${source_code_folder}
info "Clone source code to ${source_code_folder} ."
- run_command "Clone Gitbox" git clone
"https://$ASF_USERNAME:$ASF_PASSWORD@$ASF_KYLIN_REPO"; -b "$GIT_BRANCH"
${source_code_folder}
+ run_command "Clone Gitbox" git clone
"https://$ASF_USERNAME:$ASF_PASSWORD@$ASF_KYLIN_REPO"; --single-branch --branch
"$GIT_BRANCH" ${source_code_folder}
fi
if [ ! -d "${release_candidate_folder}" ]
then
- mkdir -p ${release_candidate_folder}
+ mkdir -p "${release_candidate_folder}"
info "Clone svn working dir to $svn_folder ."
run_command "Clone ASF SVN" svn co $RELEASE_STAGING_LOCATION
$svn_stage_folder
fi
@@ -247,7 +250,7 @@ function publish_snapshot_source {
mkdir -p ${release_candidate_folder}
rm -rf target/apache-kylin-*ource-release.zip.asc.sha256
- # Move source code and signture of source code to release candidate
directory
+ # Move source code and signature of source code to release candidate
directory
cp target/apache-kylin-*source-release.zip* "${release_candidate_folder}"
return 0
}
@@ -279,7 +282,7 @@ function publish_snapshot_package {
function publish_release {
info "Publish release candidate after vote succeed."
- # TODO
+ svn co $RELEASE_LOCATION $final_release_folder
return 0
}
@@ -296,7 +299,7 @@ function preview_site() {
fi
cd $document_folder_src
if [ ! -d "${document_folder_elder}" ]; then
- run_command "Clone website for kylin4" git clone --branch
$branch_doc_1 "https://$ASF_USERNAME:$ASF_PASSWORD@$ASF_KYLIN_REPO";
$branch_doc_1
+ run_command "Clone website for kylin4" git clone --single-branch
--branch $branch_doc_1 "https://$ASF_USERNAME:$ASF_PASSWORD@$ASF_KYLIN_REPO";
$branch_doc_1
else
cd ${document_folder_elder}
git reset --hard HEAD~4
@@ -304,7 +307,7 @@ function preview_site() {
fi
if [ ! -d "${document_folder_newer}" ]; then
- run_command "Clone website for kylin5" git clone --branch
$branch_doc_2 "https://$ASF_USERNAME:$ASF_PASSWORD@$ASF_KYLIN_REPO";
$branch_doc_2
+ run_command "Clone website for kylin5" git clone --single-branch
--branch $branch_doc_2 "https://$ASF_USERNAME:$ASF_PASSWORD@$ASF_KYLIN_REPO";
$branch_doc_2
else
cd ${document_folder_newer}
git reset --hard HEAD~4
diff --git a/pom.xml b/pom.xml
index 8881e3c625..f20580d87c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3593,6 +3593,17 @@
<artifactId>maven-gpg-plugin</artifactId>
<configuration>
<skip>false</skip>
+ <gpgArguments>
+ <gpgArgument>--verbose</gpgArgument>
+ <gpgArgument>--no-tty</gpgArgument>
+ <gpgArgument>--batch</gpgArgument>
+ <gpgArgument>--pinentry-mode</gpgArgument>
+ <gpgArgument>loopback</gpgArgument>
+ </gpgArguments>
+ <keyname>FE51C3EF</keyname>
+ <defaultKeyring>false</defaultKeyring>
+ <useAgent>false</useAgent>
+ <interactive>false</interactive>
</configuration>
</plugin>
<!-- Override the parent assembly execution to customize
the assembly
