Skip to content

Commit

Permalink
[INFRA] Remove incubator/incubating for graduation (#44)
Browse files Browse the repository at this point in the history
Co-authored-by: Cheng Pan <[email protected]>
  • Loading branch information
SteNicholas and pan3793 authored Mar 27, 2024
1 parent 638c035 commit 949d8dc
Show file tree
Hide file tree
Showing 10 changed files with 39 additions and 99 deletions.
8 changes: 4 additions & 4 deletions .github/bin/build_docs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@ TAR_NAME=${REF_VERSION_NAME##*/}

if [[ "$REF_VERSION_NAME" == *"-tm"* ]] ;then
DIR_VERSION_NAME=$(echo "$TAR_NAME" | sed -r "s/v*(.*)\.tar\.gz/\1/g")
TAR_DIR_NAME=incubator-celeborn-$DOC_LINK_PATH
wget "https://github.com/apache/incubator-celeborn/releases/download/${REF_VERSION_NAME}"
TAR_DIR_NAME=celeborn-$DOC_LINK_PATH
wget "https://github.com/apache/celeborn/releases/download/${REF_VERSION_NAME}"
else
DIR_VERSION_NAME=$(echo "$TAR_NAME" | sed -r "s/v*(.*)\.tar\.gz/\1/g")
TAR_DIR_NAME=incubator-celeborn-$DIR_VERSION_NAME
wget "https://github.com/apache/incubator-celeborn/archive/refs/${REF_VERSION_NAME}"
TAR_DIR_NAME=celeborn-$DIR_VERSION_NAME
wget "https://github.com/apache/celeborn/archive/refs/${REF_VERSION_NAME}"
fi

tar -xzf $TAR_NAME
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
.python-version
.settings
/site/
incubator-celeborn-*/
celeborn-*/
*.zip
*.tar.gz
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Apache Celeborn(Incubating) Website
Apache Celeborn Website
===
22 changes: 0 additions & 22 deletions docs/asf/asf.md

This file was deleted.

22 changes: 0 additions & 22 deletions docs/asf/disclaimer.md

This file was deleted.

2 changes: 1 addition & 1 deletion docs/community/committer.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ Apache Celeborn community strives to be meritocratic. Thus, once someone has con
Being an Apache Celeborn committer does not necessarily mean you must commit code with your commit privilege to the codebase; it means you are committed to the Celeborn project and are productively contributing to our community’s success.

## Committer requirements
There are no strict rules for becoming a committer or PPMC member. Candidates for new committers are typically people that are active contributors and community members. Anyway, if the rules can be clarified a little bit, it can somehow clear the doubts in the minds of contributors and make the community more transparent, reasonable, and fair.
There are no strict rules for becoming a committer or PMC member. Candidates for new committers are typically people that are active contributors and community members. Anyway, if the rules can be clarified a little bit, it can somehow clear the doubts in the minds of contributors and make the community more transparent, reasonable, and fair.

#### Continuous contributions
Committer candidates should have a decent amount of continuous engagements and contributions (fixing bugs, adding new features, writing documentation, maintaining issues boards, code review, or answering community questions) to Celeborn either by contributing to the codebase of the main website or Celeborn’s GitHub repositories.
Expand Down
16 changes: 8 additions & 8 deletions docs/community/ppmc.md → docs/community/pmc.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ license: |
limitations under the License.
---

## Current Podling PMC Members
## Current PMC Members

| Name |
|--------------|
Expand All @@ -34,24 +34,24 @@ license: |
| Yu Li |


## Become A Podling PMC member of Apache Celeborn™
Anyone being supportive of the community and working in any of the CoPDoC areas can become an Apache Celeborn Podling PMC(PPMC) member. The CoPDoC is an acronym from ASF to describe how we recognize your contributions not only by code.
## Become A PMC member of Apache Celeborn™
Anyone being supportive of the community and working in any of the CoPDoC areas can become an Apache Celeborn PMC member. The CoPDoC is an acronym from ASF to describe how we recognize your contributions not only by code.

- Community - You can join us via our mailing list, issue trackers, discussions page to interact with community members, and share vision and knowledge
- Project - a clear vision and consensus are needed
- Documentation - without it, the stuff remains only in the minds of the authors
- Code - discussion goes nowhere without code


Apache Celeborn community strives to be meritocratic. Thus, once someone has contributed sufficiently to any area of CoPDoC they can be a candidate for PPMC membership and at last voted in as a Celeborn PPMC member. The PPMC should take an active role in watching committers develop as community participants.
Apache Celeborn community strives to be meritocratic. Thus, once someone has contributed sufficiently to any area of CoPDoC they can be a candidate for PMC membership and at last voted in as a Celeborn PMC member. The PMC should take an active role in watching committers develop as community participants.

## PPMC member requirements:
There are no strict rules for becoming a PPMC member. Candidates for new PPMC member are typically committers that are stilling actively participate in the community development after obtaining the committer membership, or contributors and community members that make significant contributions to the community for both code and contributor develop.
## PMC member requirements:
There are no strict rules for becoming a PMC member. Candidates for new PMC member are typically committers that are stilling actively participate in the community development after obtaining the committer membership, or contributors and community members that make significant contributions to the community for both code and contributor develop.

It is a clear goal of Celeborn to have all committers participate in the PPMC based on their contributions, which are considered at a community level (not just a technical one).
It is a clear goal of Celeborn to have all committers participate in the PMC based on their contributions, which are considered at a community level (not just a technical one).

#### Continuous contributions
PPMC member candidates should have a decent amount of continuous engagements and contributions (fixing bugs, adding new features, writing documentation, maintaining issues boards, code review, mentoring new contributors, and answering community questions) to the Celeborn codebase and community.
PMC member candidates should have a decent amount of continuous engagements and contributions (fixing bugs, adding new features, writing documentation, maintaining issues boards, code review, mentoring new contributors, and answering community questions) to the Celeborn codebase and community.

- +5 months with light activity and engagement.
- +4 months of medium activity and engagement.
Expand Down
34 changes: 14 additions & 20 deletions docs/community/release_guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Celeborn Release Guide

## Introduction

The Apache Celeborn (Incubating) project periodically declares and publishes releases. A release is one or more packages
The Apache Celeborn project periodically declares and publishes releases. A release is one or more packages
of the project artifact(s) that are approved for general public distribution and use. They may come with various
degrees of caveat regarding their perceived quality and potential for change, such as "alpha", "beta", "incubating",
"stable", etc.
Expand Down Expand Up @@ -142,7 +142,7 @@ The last step is to update the KEYS file with your code signing key
https://www.apache.org/dev/openpgp.html#export-public-key

```shell
svn checkout --depth=files "https://dist.apache.org/repos/dist/release/incubator/celeborn/" work/svn-celeborn
svn checkout --depth=files "https://dist.apache.org/repos/dist/release/celeborn/" work/svn-celeborn

(gpg --list-sigs "${ASF_USERNAME}@apache.org" && gpg --export --armor "${ASF_USERNAME}@apache.org") >> work/svn-celeborn/KEYS

Expand All @@ -151,7 +151,7 @@ svn commit --username "${ASF_USERNAME}" --password "${ASF_PASSWORD}" --message "

## Cut branch if for major release

celeborn use version pattern `{MAJOR_VERSION}.{MINOR_VERSION}.{PATCH_VERSION}[-{OPTIONAL_SUFFIX}]`, e.g. `0.3.1-incubating`.
celeborn use version pattern `{MAJOR_VERSION}.{MINOR_VERSION}.{PATCH_VERSION}[-{OPTIONAL_SUFFIX}]`, e.g. `0.5.0`.
__Major Release__ means `MAJOR_VERSION` or `MINOR_VERSION` changed, and __Patch Release__ means `PATCH_VERSION` changed.

The main step towards preparing a feature release is to create a release branch. This is done via standard Git branching
Expand All @@ -160,7 +160,7 @@ mechanism and should be announced to the community once the branch is created.
!!! note
If you are releasing a patch version, you can ignore this step.

The release branch pattern is `branch-{MAJOR_VERSION}.{MINOR_VERSION}`, e.g. `branch-0.3`.
The release branch pattern is `branch-{MAJOR_VERSION}.{MINOR_VERSION}`, e.g. `branch-0.5`.

After cutting release branch, don't forget bump version in `main` branch.

Expand All @@ -180,10 +180,10 @@ export RELEASE_RC_NO=<RC number, e.g. 0>
Considering that other committers may merge PRs during your release period, you should accomplish the version change
first, and then come back to the release candidate tag to continue the rest release process.

The tag pattern is `v${RELEASE_VERSION}-rc${RELEASE_RC_NO}`, e.g. `v0.3.1-incubating-rc0`
The tag pattern is `v${RELEASE_VERSION}-rc${RELEASE_RC_NO}`, e.g. `v0.5.0-rc0`

!!! note
After all the voting passed, be sure to create a final tag with the pattern: `v${RELEASE_VERSION}-incubating`
After all the voting passed, be sure to create a final tag with the pattern: `v${RELEASE_VERSION}`

```shell
# Bump to the release version
Expand Down Expand Up @@ -214,7 +214,7 @@ To make your release available in the staging repository, you must close the sta

- Generate a pre-release note from GitHub for the subsequent voting.

Goto the [release page](https://github.com/apache/incubator-celeborn/releases) and click the "Draft a new release" button, then it would jump to a new page to prepare the release.
Goto the [release page](https://github.com/apache/celeborn/releases) and click the "Draft a new release" button, then it would jump to a new page to prepare the release.

Filling in all the necessary information required by the form. And in the bottom of the form, choose the "This is a pre-release" checkbox. Finally, click the "Publish release" button to finish the step.

Expand All @@ -223,19 +223,14 @@ Filling in all the necessary information required by the form. And in the bottom

## Vote on the release candidate

The release voting takes place on the Apache Celeborn (Incubating) developers list (the (P)PMC is voting).
The release voting takes place on the Apache Celeborn developers list.

- If possible, attach a draft of the release notes with the email.
- Recommend represent voting closing time in UTC format.
- Make sure the email is in text format and the links are correct.

Once the vote is done, you should also send out a summary email with the totals, with a subject that looks
something like __[VOTE][RESULT] Release Apache Celeborn(Incubating) ...__

Then, you can move the release vote on the general incubator mailing list. Also, you should send out a summary email like dev ML voting.

!!! note
Any reason causes voting cancel. You should re-vote on the dev ML firstly.
something like __[VOTE][RESULT] Release Apache Celeborn ...__

## Finalize the Release

Expand All @@ -245,7 +240,7 @@ Then, you can move the release vote on the general incubator mailing list. Also,

After the vote passes, to upload the binaries to Apache mirrors, you move the binaries from dev directory (this should
be where they are voted) to release directory. This "moving" is the only way you can add stuff to the actual release
directory. (Note: only (P)PMC members can move to release directory)
directory. (Note: only PMC members can move to release directory)

Move the subdirectory in "dev" to the corresponding directory in "release". If you've added your signing key to the
KEYS file, also update the release copy.
Expand All @@ -254,7 +249,7 @@ KEYS file, also update the release copy.
build/release/release.sh finalize
```

Verify that the resources are present in https://www.apache.org/dist/incubator/celeborn/. It may take a while for them to be visible.
Verify that the resources are present in https://www.apache.org/dist/celeborn/. It may take a while for them to be visible.
This will be mirrored throughout the Apache network.

For Maven Central Repository, you can Release from the [Apache Nexus Repository Manager](https://repository.apache.org/).
Expand All @@ -267,7 +262,7 @@ After some time this will be synced to [Maven Central](https://search.maven.org/

### Update Website

Fork and clone [Apache Celeborn website](https://github.com/apache/incubator-celeborn-website)
Fork and clone [Apache Celeborn website](https://github.com/apache/celeborn-website)

1. Add a new markdown file in `docs/community/release_notes/`
2. Add a new segment in `docs/community/news.md`
Expand All @@ -278,8 +273,7 @@ Fork and clone [Apache Celeborn website](https://github.com/apache/incubator-cel
### Create an Announcement

Once everything is working, create an announcement and send an e-mail to the mailing list.
The mailing list includes: `[email protected]`, `[email protected]`,
`[email protected]`, `[email protected]`,`[email protected]`.
The mailing list includes: `[email protected]`, `[email protected]`, `[email protected]`,`[email protected]`.

!!! note
You must use the apache.org email to send announce to `[email protected]`.
Expand All @@ -292,7 +286,7 @@ Remove the deprecated dist repo directories at last.

```shell
cd work/svn-dev
svn delete https://dist.apache.org/repos/dist/dev/incubator/celeborn/{RELEASE_TAG} \
svn delete https://dist.apache.org/repos/dist/dev/celeborn/{RELEASE_TAG} \
--username "${ASF_USERNAME}" \
--password "${ASF_PASSWORD}" \
--message "Remove deprecated Apache Celeborn ${RELEASE_TAG}"
Expand Down
6 changes: 3 additions & 3 deletions docs/download.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ The latest version is {{ stable_version }}.

### All stable releases

All celeborn releases are available via [https://archive.apache.org/dist/incubator/celeborn/](https://archive.apache.org/dist/incubator/celeborn/) including checksums and
All celeborn releases are available via [https://archive.apache.org/dist/celeborn/](https://archive.apache.org/dist/celeborn/) including checksums and
signatures. At the time of writing, this includes the following versions:

* Apache Celeborn 0.4.0-incubating (2024-02-06) ([Source](https://archive.apache.org/dist/incubator/celeborn/celeborn-0.4.0-incubating/apache-celeborn-0.4.0-incubating-source.tgz), [Binaries](https://archive.apache.org/dist/incubator/celeborn/celeborn-0.4.0-incubating/))
Expand All @@ -60,11 +60,11 @@ signatures. At the time of writing, this includes the following versions:

Before entering Apache Incubator, it was named as Remote Shuffle Service.

[GitHub releases](https://github.com/apache/incubator-celeborn/releases)
[GitHub releases](https://github.com/apache/celeborn/releases)


## Verify the integrity

[KEYS](https://downloads.apache.org/incubator/celeborn/KEYS)
[KEYS](https://downloads.apache.org/celeborn/KEYS)

[Instructions](https://www.apache.org/info/verification.html)
24 changes: 7 additions & 17 deletions mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
# limitations under the License.
#

site_name: Apache Celeborn™ (Incubating)
repo_name: apache/incubator-celeborn
repo_url: https://gitbox.apache.org/repos/asf/incubator-celeborn.git
site_name: Apache Celeborn™
repo_name: apache/celeborn
repo_url: https://gitbox.apache.org/repos/asf/celeborn.git

plugins:
- search
Expand Down Expand Up @@ -56,20 +56,11 @@ extra:
- icon: fontawesome/brands/github

copyright: >
<img src="https://www.apachecon.com/event-images/acna2022-wide-dark.png" style="height: 100px;" alt="ApacheCon North America">
<img src="https://incubator.apache.org/images/incubator_feather_egg_logo_bw_crop.png" style="height: 87px; margin: 0 0 10px 0;">
<br>
Copyright © 2022 The Apache Software Foundation
Copyright © 2022-2024 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
<a href="https://privacy.apache.org/policies/privacy-policy-public.html">Privacy Policy<a/><br>
<br>
Apache Celeborn™, Apache Incubator, Apache, the Apache feather logo, and the Apache Incubator project logo are
trademarks or registered trademarks of The Apache Software Foundation.<br>
<br>
Apache Celeborn™ is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the
Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that
the infrastructure, communications, and decision making process have stabilized in a manner consistent with
other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or
stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.<br>
Apache Celeborn™, Apache, and the Apache feather logo are trademarks or registered trademarks of The Apache Software Foundation.<br>
<br>
Please visit <a href="https://www.apache.org/">Apache Software Foundation</a> for more details.<br>
<br>
Expand All @@ -82,16 +73,15 @@ nav:
- Join the Mailing Lists: community/maillist.md
- Project Management Committee: community/project_management_committee.md
- Become a Committer: community/committer.md
- Become a PPMC Member: community/ppmc.md
- Become a PMC Member: community/pmc.md
- Latest News: community/news.md
- Release Guide: community/release_guide.md
- Contributor Guide:
- Build and Test: community/contributor_guide/build_and_test.md
- Docs and Website: community/contributor_guide/docs_and_website.md
- Security: security.md
- Apache Software Foundation:
- Foundation: asf/asf.md
- Disclaimer: asf/disclaimer.md
- Foundation: https://www.apache.org/" target="_blank
- License: https://www.apache.org/licenses/" target="_blank
- Events: https://www.apache.org/events/current-event" target="_blank
- Sponsorship: https://www.apache.org/foundation/sponsorship.html" target="_blank
Expand Down

0 comments on commit 949d8dc

Please sign in to comment.