Skip to content

Commit 136fa19

Browse files
authored
update Eclipse Che documentation (#92)
Signed-off-by: Mykhailo Kuznietsov <mkuznets@redhat.com>
1 parent ad9edb9 commit 136fa19

File tree

4 files changed

+16
-43
lines changed

4 files changed

+16
-43
lines changed

.github/CODEOWNERS

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# Global Owners
2-
* @nickboldt @mkuznyetsov @SDawley
2+
* @mkuznyetsov @SDawley

.github/workflows/release-orchestrate-overall.yml

+2-16
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# This Workflow performs a full release of Che
2-
name: Release - Orchestrate Overall Release Phases
2+
name: Release - Phases 1-3
33
on:
44
workflow_dispatch:
55
inputs:
@@ -17,10 +17,7 @@ on:
1717
default: '7.15.0'
1818
phases:
1919
description: '
20-
# Comma-separated phases to perform.
21-
#1: Code, JetBrainsIdeDevServer, MachineExec, Server, branches;
22-
#2: E2E, PluginRegistry, Dashboard;
23-
#3: CheOperator;
20+
# Comma-separated phases to perform (see README.md).
2421
# Default: 1,2,3
2522
# Omit phases that have successfully run.
2623
'
@@ -115,14 +112,3 @@ jobs:
115112
export CHE_INCUBATOR_BOT_GITHUB_TOKEN=${{ secrets.CHE_INCUBATOR_BOT_GITHUB_TOKEN }}
116113
set -e
117114
./make-release.sh -v ${CHE_VERSION} -p ${PHASES} --parent-version ${PARENT_VERSION}
118-
#- name: Create failure MM message
119-
#if: ${{ failure() }}
120-
#run: |
121-
#echo "{\"text\":\":no_entry_sign: Che Release Orchestrator ${{ github.event.inputs.version }} has failed: https://github.com/eclipse-che/che-release/actions/workflows/release-orchestrate-overall.yml\"}" > mattermost.json
122-
#- name: Send MM message
123-
#if: ${{ failure() }}
124-
#uses: mattermost/action-mattermost-notify@1.1.0
125-
#env:
126-
#MATTERMOST_WEBHOOK_URL: ${{ secrets.MATTERMOST_WEBHOOK_URL }}
127-
#MATTERMOST_CHANNEL: eclipse-che-releases
128-
#MATTERMOST_USERNAME: che-bot

README.md

+12-14
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
## Permissions
44

5-
1. Get push permission from @fbenoit to push applications
5+
1. Get push permission from @mkuznets @SDawley to push applications
66
* https://quay.io/organization/eclipse-che-operator-openshift/teams/pushers
77
* https://quay.io/application/eclipse-che-operator-openshift
88

9-
2. Get commit rights from @fbenoit to push community PRs
9+
2. Get commit rights from @mkuznets @SDawley to push community PRs
1010
* https://github.com/che-incubator/community-operators
1111

1212

@@ -25,7 +25,7 @@ The projects covered by this workflow release container images, NPM artifacts, o
2525

2626
### Statuses
2727

28-
| Phase | Project | Workflow Status | Quay Image or NPM Artifact |
28+
| Phase | Project | Workflow Status | Quay Image / Artifact |
2929
| :--- | :--- | :--- | :--- |
3030
| **Phase 1** | [che-code](https://github.com/che-incubator/che-code) | [![Release](https://github.com/che-incubator/che-code/actions/workflows/release.yml/badge.svg)](https://github.com/che-incubator/che-code/actions/workflows/release.yml) | [che-code](https://quay.io/che-incubator/che-code) |
3131
| | [jetbrains-ide-dev-server](https://github.com/che-incubator/jetbrains-ide-dev-server) | [![Release](https://github.com/che-incubator/jetbrains-ide-dev-server/actions/workflows/release.yml/badge.svg)](https://github.com/che-incubator/jetbrains-ide-dev-server/actions/workflows/release.yml) | [jetbrains-ide-dev-server](https://quay.io/che-incubator/che-idea-dev-server) |
@@ -40,15 +40,14 @@ The projects covered by this workflow release container images, NPM artifacts, o
4040
| | [che-dashboard](https://github.com/eclipse-che/che-dashboard) | [![release latest stable](https://github.com/eclipse-che/che-dashboard/actions/workflows/release.yml/badge.svg)](https://github.com/eclipse-che/che-dashboard/actions/workflows/release.yml) | [che-dashboard](https://quay.io/eclipse/che-dashboard) |
4141
| | |
4242
| **Phase 3** | [che-operator](https://github.com/eclipse-che/che-operator) | [![Release](https://github.com/eclipse-che/che-operator/actions/workflows/release.yml/badge.svg)](https://github.com/eclipse-che/che-operator/actions/workflows/release.yml) | [che-operator](https://quay.io/eclipse/che-operator) |
43-
44-
Che Operator requires PR checks and manual approvals. When everything has been verified, and the PRs generated in the previous step are merged, the following workflows will be triggered.
45-
46-
| Phase | Project | Workflow Status | Other Artifact |
47-
| :--- | :--- | :--- | :--- |
48-
| **Phase 5** | [community-operator](https://github.com/redhat-openshift-ecosystem/community-operators-prod) | [![Release](https://github.com/eclipse-che/che-operator/actions/workflows/release-community-operator-PRs.yml/badge.svg)](https://github.com/eclipse-che/che-operator/actions/workflows/release-community-operator-PRs.yml) | [create pull requests](https://github.com/operator-framework/community-operators/pulls?q=%22Update+eclipse-che+operator%22+is%3Aopen) to update to latest released version of Che in OperatorHub
43+
| | |
44+
| **Phase 4** | [community-operator](https://github.com/redhat-openshift-ecosystem/community-operators-prod) | [![Release](https://github.com/eclipse-che/che-operator/actions/workflows/release-community-operator-PRs.yml/badge.svg)](https://github.com/eclipse-che/che-operator/actions/workflows/release-community-operator-PRs.yml) | [create pull requests](https://github.com/operator-framework/community-operators/pulls?q=%22Update+eclipse-che+operator%22+is%3Aopen) to update to latest released version of Che in OperatorHub
4945
| | [chectl](https://github.com/che-incubator/chectl) | [![Release](https://github.com/eclipse-che/che-operator/actions/workflows/release-chectl.yml/badge.svg)](https://github.com/eclipse-che/che-operator/actions/workflows/release-chectl.yml) | [CLI tarballs](https://github.com/che-incubator/chectl/releases)
5046
| | [che-docs](https://github.com/eclipse/che-docs) | [![Release](https://github.com/eclipse-che/che-docs/actions/workflows/publication-builder.yaml/badge.svg)](https://github.com/eclipse-che/che-docs/actions/workflows/publication-builder.yaml) | tag and 3 pull requests to update to [latest Che](https://github.com/eclipse-che/che-docs/tree/publication)
51-
| | [che-website-publish](https://github.com/eclipse-cheche-website-publish) | [![Publish](https://github.com/eclipse-che/che-website-publish/actions/workflows/publish.yaml/badge.svg)](https://github.com/eclipse-che/che-website-publish/actions/workflows/publish.yaml) | update live [Che Docs website](https://eclipse.dev/che/docs/stable/) with published documentation (when che-docs PRs are merged)
47+
| | |
48+
| **Phase 5** | [che-website-publish](https://github.com/eclipse-cheche-website-publish) | [![Publish](https://github.com/eclipse-che/che-website-publish/actions/workflows/publish.yaml/badge.svg)](https://github.com/eclipse-che/che-website-publish/actions/workflows/publish.yaml) | update live [Che Docs website](https://eclipse.dev/che/docs/stable/) with published documentation (when che-docs PRs are merged)
49+
| | |
50+
| **Phase 6** | [release-check-unmerged-PRs](https://github.com/eclipse-cheche-website-publish) | [![Publish](https://github.com/eclipse-che/che-website-publish/actions/workflows/publish.yaml/badge.svg)](https://github.com/eclipse-che/che-website-publish/actions/workflows/publish.yaml) | update live [Che Docs website](https://eclipse.dev/che/docs/stable/) with published documentation (when che-docs PRs are merged)
5251

5352
### Notifications
5453

@@ -89,19 +88,18 @@ See [#forum-che](https://app.slack.com/client/TMU5A34SW/C05SD64M85R)
8988

9089
The [Release - Orchestrate Overall Release Phases]((https://github.com/eclipse-che/che-release/actions?query=workflow%3A%22Release+-+Orchestrate+Overall+Release+Phases%22)) action runs [make-release.sh](https://github.com/eclipse-che/che-release/blob/main/make-release.sh) to release the various Che containers and packages in the correct order. This ensures that dependencies between containers or packages can be met. See [make-release.sh](https://github.com/eclipse-che/che-release/blob/main/make-release.sh) for these dependencies. The list of phases is above.
9190

92-
9391
## Release procedure
94-
1. Original procedure was to [create new release issue to report status and collect any blocking issues](https://github.com/eclipse-che/che/issues/new?assignees=&labels=kind%2Frelease&template=release.md&title=Release+Che+7.FIXME), however the issue was usually empty since problems are resolved via Mattermost and Slack so communication is done there.
92+
1. [Create a new release issue and include it into the sprint planning](https://github.com/eclipse-che/che/issues/new?assignees=&labels=kind%2Frelease&template=release.md&title=Release+Eclipse+Che+7.NEWVERSION),
9593

96-
2. To start a release, use the [Release - Orchestrate Overall Release Phases](https://github.com/eclipse-che/che-release/actions/workflows/release-orchestrate-overall.yml) workflow to trigger workflows in other Che repos. Workflows triggered align to the repos noted in the previous section. In the input, provide the version of Che, and phases to run.
94+
2. Once all pending PRs/blocker issues are resolved, use the [Release - Phases 1-3](https://github.com/eclipse-che/che-release/actions/workflows/release-orchestrate-overall.yml) workflow to trigger Che release workflows. Workflows triggered align to the repos, that are corresponding with 1,2 and 3 phases. In the input, provide the version of Che, and phases to run.
9795

9896
2.1 If one of the workflows has crashed, inspect it. Apply fixes if needed, and restart it. You can restart individual workflow, or whole phase in orchestration job, whichever is simpler.
9997

10098
2.2 Keep in mind, that sometimes you'll need to [regenerate tags](https://github.com/eclipse-che/che/issues/18879), or skip certain substeps in that job. Also ensure that correct code is in place, whether it is main or bugfix branch.
10199

102100
2.3 Sometimes, the hotfix changes to the workflow can take too long to get approved and merged. In certain situations, we can use the modified workflow file, which is pushed in its own branch, and then trigger the workflow, while specifying the branch with our modified workflow.
103101

104-
3. When Che Operator PRs have been generated, you must wait for the approval of PR checks, that are in that repository. If there are any questions, you can forward them to the check maintaners (Deploy team). When PRs are merged, the last batch of projects will be triggered to release
102+
3. When Che Operator PRs have been generated, you must wait for the approval of PR checks, that are in that repository. If there are any questions, you can forward them to the [repository maintaners](https://github.com/eclipse-che/che-operator/blob/main/.github/CODEOWNERS#L2). When PRs are merged, the last batch of projects will be triggered to release
105103

106104
3.1 Chectl PR has to be closed manually, after they're generated, and all its associated PR checks are passed.
107105

make-release.sh

+1-12
Original file line numberDiff line numberDiff line change
@@ -85,15 +85,6 @@ evaluateCheVariables() {
8585
BASEBRANCH="${BRANCH}"
8686
fi
8787

88-
if [[ ${RELEASE_CHE_PARENT} != "true" ]]; then
89-
RELEASE_CHE_PARENT="false"
90-
fi
91-
92-
if [[ -z ${VERSION_CHE_PARENT} ]]; then
93-
# get latest higher 7.yy.z tag of Che Parent as version
94-
# shellcheck disable=SC2062
95-
VERSION_CHE_PARENT=$(git -c 'versionsort.suffix=-' ls-remote --tags https://github.com/eclipse/che-parent.git | cut --delimiter='/' --fields=3 | grep 7.* | sort --version-sort | tail --lines=1)
96-
fi
9788
echo "Basebranch: ${BASEBRANCH}"
9889
echo "Release Process Phases: '${PHASES}'"
9990
}
@@ -117,7 +108,7 @@ releaseMachineExec() {
117108
}
118109

119110
releaseCheServer() {
120-
invokeAction eclipse-che/che-server "Release Che Server" "9230035" "version=${CHE_VERSION},releaseParent=${RELEASE_CHE_PARENT},versionParent=${VERSION_CHE_PARENT}"
111+
invokeAction eclipse-che/che-server "Release Che Server" "9230035" "version=${CHE_VERSION}"
121112
}
122113

123114
releaseDevworkspaceGenerator() {
@@ -152,8 +143,6 @@ while [[ "$#" -gt 0 ]]; do
152143
case $1 in
153144
'-v'|'--version') CHE_VERSION="$2"; shift 1;;
154145
'-p'|'--phases') PHASES="$2"; shift 1;;
155-
'--release-parent') RELEASE_CHE_PARENT="true"; shift 0;;
156-
'--parent-version') VERSION_CHE_PARENT="$2"; shift 1;;
157146
esac
158147
shift 1
159148
done

0 commit comments

Comments
 (0)