[INFRA] Update release scripts and templates because of graduation

apache · Jan 4, 2023 · 60ece0c · 60ece0c
1 parent 5fdd44f
commit 60ece0c
Show file tree

Hide file tree

Showing 23 changed files with 59 additions and 267 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -31,7 +31,7 @@ body:
         encountered with the community. For best practices, if it is indeed a bug, please try your best to provide the reproducible
         steps. If you want to ask questions or share ideas, please [subscribe to our mailing list](mailto:[email protected])
         and send emails to [our mailing list](mailto:[email protected]), you can also head to our
-        [Discussions](https://github.com/apache/incubator-kyuubi/discussions) tab.
+        [Discussions](https://github.com/apache/kyuubi/discussions) tab.
 
   - type: checkboxes
     attributes:
@@ -47,7 +47,7 @@ body:
       label: Search before asking
       options:
         - label: >
-            I have searched in the [issues](https://github.com/apache/incubator-kyuubi/issues?q=is%3Aissue) and found no similar
+            I have searched in the [issues](https://github.com/apache/kyuubi/issues?q=is%3Aissue) and found no similar
             issues.
           required: true
 

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
@@ -18,11 +18,11 @@
 blank_issues_enabled: false
 contact_links:
   - name: Ask a question or get support
-    url: https://github.com/apache/incubator-kyuubi/discussions/categories/q-a
+    url: https://github.com/apache/kyuubi/discussions/categories/q-a
     about: Ask a question or request support for using Apache Kyuubi
   - name: Tell us your success story or use case
-    url: https://github.com/apache/incubator-kyuubi/discussions/925
+    url: https://github.com/apache/kyuubi/discussions/925
     about: Tell us your success story or use case using Apache Kyuubi
   - name: Kyuubi project improvement proposal
-    url: https://github.com/apache/incubator-kyuubi/discussions/categories/ideas
+    url: https://github.com/apache/kyuubi/discussions/categories/ideas
     about: a.k.a KPIP
diff --git a/.github/ISSUE_TEMPLATE/doc-improvement-report.yml b/.github/ISSUE_TEMPLATE/doc-improvement-report.yml
@@ -39,7 +39,7 @@ body:
       label: Search before asking
       options:
         - label: >
-            I have searched in the [issues](https://github.com/apache/incubator-kyuubi/issues?q=is%3Aissue) and found no similar
+            I have searched in the [issues](https://github.com/apache/kyuubi/issues?q=is%3Aissue) and found no similar
             issues.
           required: true
 

diff --git a/.github/ISSUE_TEMPLATE/feature-request.yml b/.github/ISSUE_TEMPLATE/feature-request.yml
@@ -39,7 +39,7 @@ body:
       label: Search before asking
       options:
         - label: >
-            I have searched in the [issues](https://github.com/apache/incubator-kyuubi/issues?q=is%3Aissue) and found no similar
+            I have searched in the [issues](https://github.com/apache/kyuubi/issues?q=is%3Aissue) and found no similar
             issues.
           required: true
 

diff --git a/.github/ISSUE_TEMPLATE/improve-test.yml b/.github/ISSUE_TEMPLATE/improve-test.yml
@@ -39,7 +39,7 @@ body:
       label: Search before asking
       options:
         - label: >
-            I have searched in the [issues](https://github.com/apache/incubator-kyuubi/issues?q=is%3Aissue) and found no similar
+            I have searched in the [issues](https://github.com/apache/kyuubi/issues?q=is%3Aissue) and found no similar
             issues.
           required: true
 

diff --git a/.github/ISSUE_TEMPLATE/improvement.yml b/.github/ISSUE_TEMPLATE/improvement.yml
@@ -41,7 +41,7 @@ body:
       label: Search before asking
       options:
         - label: >
-            I have searched in the [issues](https://github.com/apache/incubator-kyuubi/issues?q=is%3Aissue) and found no similar
+            I have searched in the [issues](https://github.com/apache/kyuubi/issues?q=is%3Aissue) and found no similar
             issues.
           required: true
 

diff --git a/.github/ISSUE_TEMPLATE/subtask.yml b/.github/ISSUE_TEMPLATE/subtask.yml
@@ -35,7 +35,7 @@ body:
       label: Search before asking
       options:
         - label: >
-            I have searched in the [issues](https://github.com/apache/incubator-kyuubi/issues) and found no similar
+            I have searched in the [issues](https://github.com/apache/kyuubi/issues) and found no similar
             issues.
           required: true
 

diff --git a/.github/ISSUE_TEMPLATE/umbrella.yml b/.github/ISSUE_TEMPLATE/umbrella.yml
@@ -35,7 +35,7 @@ body:
       label: Search before asking
       options:
         - label: >
-            I have searched in the [issues](https://github.com/apache/incubator-kyuubi/issues) and found no similar
+            I have searched in the [issues](https://github.com/apache/kyuubi/issues) and found no similar
             issues.
           required: true
 

diff --git a/build/release/generate_changelog.sh b/build/release/generate_changelog.sh
@@ -26,7 +26,7 @@ KYUUBI_DIR="$(cd "$(dirname "$0")"/../..; pwd)"
 CHANGELOG_DIR=$KYUUBI_DIR/docs/changelog
 RELEASE_VERSION="$(echo $CURRENT_RELEASE_TAG | cut -d "-" -f 1,2)"  ## use cut to remove -rc symbol
 CHANGELOG_PATH=$CHANGELOG_DIR/"$RELEASE_VERSION.md"
-KYUUBI_GITHUB_COMMIT_URL="https://github.com/apache/incubator-kyuubi/commit/"
+KYUUBI_GITHUB_COMMIT_URL="https://github.com/apache/kyuubi/commit/"
 
 function usage {
   set +x

diff --git a/build/release/release.sh b/build/release/release.sh
@@ -54,8 +54,8 @@ fi
 
 RELEASE_TAG="v${RELEASE_VERSION}-rc${RELEASE_RC_NO}"
 
-SVN_STAGING_REPO="https://dist.apache.org/repos/dist/dev/incubator/kyuubi"
-SVN_RELEASE_REPO="https://dist.apache.org/repos/dist/release/incubator/kyuubi"
+SVN_STAGING_REPO="https://dist.apache.org/repos/dist/dev/kyuubi"
+SVN_RELEASE_REPO="https://dist.apache.org/repos/dist/release/kyuubi"
 
 KYUUBI_DIR="$(cd "$(dirname "$0")"/../..; pwd)"
 RELEASE_DIR="${KYUUBI_DIR}/work/release"

diff --git a/build/release/script/announce.sh b/build/release/script/announce.sh
@@ -47,16 +47,15 @@ Hi all,
 The Apache Kyuubi community is pleased to announce that
 Apache Kyuubi ${release_version} has been released!
 
-Apache Kyuubi is a distributed multi-tenant JDBC server for
-large-scale data processing and analytics, built on top of Apache Spark
-and designed to support more engines (i.e. Apache Flink).
+Apache Kyuubi is a distributed and multi-tenant gateway to provide
+serverless SQL on data warehouses and lakehouses.
 
 Kyuubi provides a pure SQL gateway through Thrift JDBC/ODBC interface
 for end-users to manipulate large-scale data with pre-programmed and
 extensible Spark SQL engines.
 
 We are aiming to make Kyuubi an "out-of-the-box" tool for data warehouses
-and data lakes.
+and lakehouses.
 
 This "out-of-the-box" model minimizes the barriers and costs for end-users
 to use Spark at the client side.
@@ -82,5 +81,5 @@ Thanks,
 On behalf of Apache Kyuubi community
 EOF
 
-echo "please Use [email protected], [email protected], [email protected], [email protected]
+echo "please Use [email protected], [email protected], [email protected]
 see announce content in $ANNOUNCE"
diff --git a/build/release/script/dev_kyuubi_vote.sh b/build/release/script/dev_kyuubi_vote.sh
@@ -78,7 +78,7 @@ cat >${DEV_VOTE}<<EOF
 Title: [VOTE] Release Apache Kyuubi ${release_version} ${release_rc_no}
 
 Content:
-Hello Apache Kyuubi PPMC and Community,
+Hello Apache Kyuubi PMC and Community,
 
 Please vote on releasing the following candidate as
 Apache Kyuubi version ${release_version}.
@@ -93,13 +93,13 @@ To learn more about Apache Kyuubi, please see
 https://kyuubi.apache.org/
 
 The tag to be voted on is ${release_rc_tag} (commit ${git_commit_hash}):
-https://github.com/apache/incubator-kyuubi/tree/${release_rc_tag}
+https://github.com/apache/kyuubi/tree/${release_rc_tag}
 
 The release files, including signatures, digests, etc. can be found at:
-https://dist.apache.org/repos/dist/dev/incubator/kyuubi/${release_rc_tag}/
+https://dist.apache.org/repos/dist/dev/kyuubi/${release_rc_tag}/
 
 Signatures used for Kyuubi RCs can be found in this file:
-https://downloads.apache.org/incubator/kyuubi/KEYS
+https://downloads.apache.org/kyuubi/KEYS
 
 The staging repository for this release can be found at:
 https://repository.apache.org/content/repositories/orgapachekyuubi-${repo_no}/

diff --git a/build/release/script/general_incubator_vote.sh b/build/release/script/general_incubator_vote.sh
diff --git a/build/release/tmpl/dev_kyuubi_cancel_vote.tmpl b/build/release/tmpl/dev_kyuubi_cancel_vote.tmpl
@@ -18,7 +18,7 @@
 Title: [CANCEL][VOTE] Release Apache Kyuubi {release_version} {release_rc_no}
 
 Content:
-Hello Apache Kyuubi PPMC and Community,
+Hello Apache Kyuubi PMC and Community,
 
 We need to cancel the {release_rc_no} due to {issue_description}[1],
 and thank everyone who helped vote.

diff --git a/build/release/tmpl/dev_kyuubi_vote_result.tmpl b/build/release/tmpl/dev_kyuubi_vote_result.tmpl
@@ -18,7 +18,7 @@
 Title: [RESULT][VOTE] Release Apache Kyuubi {release_version} {release_rc_no}
 
 Content:
-Hello Apache Kyuubi PPMC and Community,
+Hello Apache Kyuubi PMC and Community,
 
 The vote closes now as 72hr have passed. The vote PASSES with
 
@@ -36,11 +36,8 @@ The vote closes now as 72hr have passed. The vote PASSES with
 The vote thread:
 {dev_kyuubi_vote_mail_address}
 
-I will now bring the vote to [email protected] to get approval
-by the IPMC.
-If this vote passes also, the release is accepted and will be published.
-
-Thanks to all who helped with the release!
+Thanks to all who helped with the release! I will be working
+on publishing the artifacts soon.
 
 Thanks,
 On behalf of Apache Kyuubi community
diff --git a/build/release/tmpl/general_incubator_vote_result.tmpl b/build/release/tmpl/general_incubator_vote_result.tmpl
diff --git a/charts/kyuubi/Chart.yaml b/charts/kyuubi/Chart.yaml
@@ -22,6 +22,6 @@ type: application
 version: 0.1.0
 appVersion: "master-snapshot"
 home: https://kyuubi.apache.org
-icon: https://raw.githubusercontent.com/apache/incubator-kyuubi/master/docs/imgs/logo.png
+icon: https://raw.githubusercontent.com/apache/kyuubi/master/docs/imgs/logo.png
 sources:
-  - https://github.com/apache/incubator-kyuubi
+  - https://github.com/apache/kyuubi
diff --git a/docker/playground/image/kyuubi-playground-kyuubi.Dockerfile b/docker/playground/image/kyuubi-playground-kyuubi.Dockerfile
@@ -25,7 +25,7 @@ ENV KYUUBI_HOME=/opt/kyuubi
 ENV KYUUBI_CONF_DIR=/etc/kyuubi/conf
 
 RUN set -x && \
-    wget -q ${APACHE_MIRROR}/incubator/kyuubi/kyuubi-${KYUUBI_VERSION}/apache-kyuubi-${KYUUBI_VERSION}-bin.tgz && \
+    wget -q ${APACHE_MIRROR}/kyuubi/kyuubi-${KYUUBI_VERSION}/apache-kyuubi-${KYUUBI_VERSION}-bin.tgz && \
     tar -xzf apache-kyuubi-${KYUUBI_VERSION}-bin.tgz -C /opt && \
     ln -s /opt/apache-kyuubi-${KYUUBI_VERSION}-bin ${KYUUBI_HOME} && \
     rm apache-kyuubi-${KYUUBI_VERSION}-bin.tgz && \