Skip to content

Commit

Permalink
sync with master
Browse files Browse the repository at this point in the history
  • Loading branch information
musienko-maxim committed Nov 4, 2024
2 parents d083f01 + 2d10027 commit 43ed4e1
Show file tree
Hide file tree
Showing 72 changed files with 3,724 additions and 2,828 deletions.
1 change: 1 addition & 0 deletions .che/che-editor.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
id: che-incubator/che-code/insiders
60 changes: 55 additions & 5 deletions .devfile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,34 @@
#
# SPDX-License-Identifier: EPL-2.0
#
schemaVersion: 2.1.0
schemaVersion: 2.2.2
metadata:
name: che
language: typescript
attributes:
controller.devfile.io/storage-type: ephemeral
controller.devfile.io/scc: container-build
controller.devfile.io/storage-type: per-workspace
projects:
- name: che
git:
remotes:
origin: 'https://github.com/eclipse/che.git'
checkoutFrom:
remote: origin
revision: main
components:
- name: devtools
container:
image: quay.io/mloriedo/universal-developer-image:ubi8-latest
memoryLimit: 4G
image: quay.io/devfile/universal-developer-image:ubi8-latest
memoryLimit: 12G
memoryRequest: 256Mi
cpuLimit: 500m
cpuLimit: '2'
cpuRequest: 30m
mountSources: true
sourceMapping: /projects
env:
- name: KUBEDOCK_ENABLED
value: 'true'
commands:
- id: update-contributing
exec:
Expand All @@ -28,3 +43,38 @@ commands:
exec:
commandLine: '.repositories-update-contributing.sh IN_DOCKER'
component: devtools
- id: tests-update-dependencies
exec:
commandLine: >-
cd tests/e2e &&
echo "Installing/Updating nvm" &&
curl -so- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.5/install.sh | bash &&
export NVM_DIR="$HOME/.nvm" && [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" &&
nvm --version &&
echo "Updating nodejs" &&
nvm install lts/hydrogen && nvm alias default lts/hydrogen && nvm use default &&
echo "Updating npm" &&
npm install -g npm &&
echo "Installing test dependencies" &&
rm -rf package-lock.json &&
npm install &&
npm uninstall chromedriver && npm install chromedriver --save-dev &&
cd ../../
component: devtools
- id: tests-lint-project
exec:
commandLine: >-
cd tests/e2e &&
npm run lint
component: devtools
- id: tests-build-tests
exec:
commandLine: >-
cd tests/e2e &&
npm run tsc
component: devtools
- id: tests-happy-path-remote
exec:
commandLine: >-
echo "TODO: Start pod in dogfooding user namespace and collect logs"
component: devtools
7 changes: 2 additions & 5 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
# Global Owners
* @nickboldt

# dockerfiles
dockerfiles/** @nickboldt
* @dmytro-ndp @SDawley

# e2e tests
tests/e2e/** @musienko-maxim @nickboldt @ScrewTSW @dmytro-ndp
tests/e2e/** @musienko-maxim @dmytro-ndp

# devworkspace happy path test
tests/devworkspace-happy-path/** @musienko-maxim
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/a_question.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ body:
Useful Links:
- 📄 Documentation: https://www.eclipse.org/che/docs
- 📄 Documentation: https://eclipse.dev/che/docs
- 📝 Contributing: https://github.com/eclipse/che/blob/master/CONTRIBUTING.md
💬 Eclipse Che has public chat on:
- Mattermost: https://mattermost.eclipse.org/eclipse/channels/eclipse-che
- Eclipse Cloud Dev Tools Slack: https://communityinviter.com/apps/ecd-tools/join-the-community
- type: textarea
id: summary
Expand Down
23 changes: 19 additions & 4 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ body:
Useful Links:
- 📄 Documentation: https://www.eclipse.org/che/docs
- 📄 Documentation: https://eclipse.dev/che/docs
- 📝 Contributing: https://github.com/eclipse/che/blob/master/CONTRIBUTING.md
💬 Eclipse Che has public chat on:
- Mattermost: https://mattermost.eclipse.org/eclipse/channels/eclipse-che
- Eclipse Cloud Dev Tools Slack: https://communityinviter.com/apps/ecd-tools/join-the-community
- type: textarea
id: describe-bug
Expand All @@ -33,8 +33,23 @@ body:
label: Che version
description: if workspace is running, version can be obtained with help/about menu
options:
- "7.78@latest"
- "7.93@latest"
- "next (development version)"
- "7.92"
- "7.91"
- "7.90"
- "7.89"
- "7.88"
- "7.87"
- "7.86"
- "7.85"
- "7.84"
- "7.83"
- "7.82"
- "7.81"
- "7.80"
- "7.79"
- "7.78"
- "7.77"
- "7.75"
- "7.74"
Expand Down Expand Up @@ -156,7 +171,7 @@ body:
Please copy and paste any relevant log output.
This will be automatically formatted into code, so no need for backticks
description: "How to collect logs: https://www.eclipse.org/che/docs/che-7/collecting-logs-using-chectl"
description: "How to collect logs: https://eclipse.dev/che/docs/stable/administration-guide/collecting-logs-using-chectl/"
render: shell

- type: textarea
Expand Down
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/enhancement.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ body:
Useful Links:
- 📄 Documentation: https://www.eclipse.org/che/docs
- 📄 Documentation: https://eclipse.dev/che/docs
- 📝 Contributing: https://github.com/eclipse/che/blob/master/CONTRIBUTING.md
💬 Eclipse Che has public chat on:
- Mattermost: https://mattermost.eclipse.org/eclipse/channels/eclipse-che
- Eclipse Cloud Dev Tools Slack: https://communityinviter.com/apps/ecd-tools/join-the-community
- type: textarea
id: problem
Expand Down
34 changes: 8 additions & 26 deletions .github/ISSUE_TEMPLATE/release.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,38 +14,20 @@ assignees: ''

The following will be released via [che-release](https://github.com/eclipse/che-release/blob/master/cico_release.sh) according to a series of phases:

1. [ ] che-machine-exec, che-server, che-e2e, che-devfile-registry, che-dashboard, jwtproxy, kubernetes image puller
2. [ ] che-theia
3. [ ] che-plugin-registry (once che-theia and machine-exec are done)
4. [ ] che-operator

Each phase will [send a Mattermost notification to the Eclipse Che releases channel](https://mattermost.eclipse.org/eclipse/channels/eclipse-che-releases).
Phase 1. [ ] che-code, configbump, che-machine-exec, che-server, devworkspace-generator, kubernetes-image-puller.
Phase 2. [ ] che-e2e, che-plugin-registry, che-dashboard .
Phase 3. [ ] che-devfile-registry.
Phase 4. [ ] che-operator.

Then, these steps will be done, once the above projects are released and PRs are merged:

- [ ] [chectl](https://github.com/che-incubator/chectl/pulls/che-bot) _(depends on che-operator)_
- [ ] [Che community operator PRs for K8S](https://github.com/k8s-operatorhub/community-operators/pulls/che-bot) and [Che community operator PRs for OS](https://github.com/redhat-openshift-ecosystem/community-operators-prod/pulls/che-bot) _(depends on che-operator)_
- [ ] [che-docs PR](https://github.com/eclipse/che-docs/pulls/che-bot) _(depends on che-operator)_

If this is a .0 release:

- [ ] complete current milestone
- [ ] move incomplete *deferred* issues to backlog
- [ ] move incomplete *WIP* issues to next milestone
- [ ] close completed issues
- [ ] close milestone

| Process <sup>[1]</sup> | Script | Action | Container(s) + Artifact(s) |
| --- | --- | --- | --- |
| [che-release](https://github.com/eclipse/che-release/blob/master/RELEASE.md) | [cico_release.sh](https://github.com/eclipse/che-release/blob/master/cico_release.sh) | [Action](https://github.com/eclipse/che-release/actions?query=workflow%3A%22Release+-+Orchestrate+Overall+Release+Phases%22) | n/a |
| [che-theia](https://github.com/eclipse/che-theia/blob/main/RELEASE.md) | [make-release.sh](https://github.com/eclipse/che-theia/blob/main/make-release.sh) | [Action](https://github.com/eclipse/che-theia/actions?query=workflow%3A%22Release+Che+Theia%22) | [`eclipse/che-theia`](https://quay.io/eclipse/che-theia) |
| [che-machine-exec](https://github.com/eclipse-che/che-machine-exec/blob/master/RELEASE.md) | [make-release.sh](https://github.com/eclipse-che/che-machine-exec/blob/master/make-release.sh) | [Action](https://github.com/eclipse-che/che-machine-exec/actions?query=workflow%3A%22Release+Che+Machine+Exec%22) | [`eclipse/che-machine-exec`](https://quay.io/eclipse/che-machine-exec)|
| [che-devfile-registry](https://github.com/eclipse/che-devfile-registry/blob/master/RELEASE.md) | [make-release.sh](https://github.com/eclipse/che-devfile-registry/blob/master/make-release.sh) | [Action](https://github.com/eclipse/che-devfile-registry/actions?query=workflow%3A%22Release+Che+Devfile+Registry%22) | [`eclipse/che-devfile-registry`](https://quay.io/eclipse/che-devfile-registry)|
| [che-plugin-registry](https://github.com/eclipse/che-plugin-registry/blob/master/RELEASE.md) | [make-release.sh](https://github.com/eclipse/che-plugin-registry/blob/master/make-release.sh) | [Action](https://github.com/eclipse/che-plugin-registry/actions?query=workflow%3A%22Release+Che+Plugin+Registry%22) | [`eclipse/che-plugin-registry`](https://quay.io/eclipse/che-plugin-registry)|
| [che-parent](https://github.com/eclipse/che-parent/blob/master/RELEASE.md) | [make-release.sh](https://github.com/eclipse/che-parent/blob/master/make-release.sh) | [Action](https://github.com/eclipse/che/actions?query=workflow%3A%22Release+Che+Server%22) | [che-server](https://search.maven.org/search?q=a:che-server) <sup>[2]</sup> |
| [che-dashboard](https://github.com/eclipse-che/che-dashboard/blob/main/RELEASE.md) | [make-release.sh](https://github.com/eclipse-che/che-dashboard/blob/master/make-release.sh) | [Action](https://github.com/eclipse-che/che-dashboard/actions?query=workflow%3A%22Release+Che+Dashboard%22) | [`che-dashboard`](https://quay.io/repository/eclipse/che-dashboard?tag=next&tab=tags) |
| [che](https://github.com/eclipse-che/che-server/blob/HEAD/RELEASE.md) | [make-release.sh](https://github.com/eclipse-che/che-server/blob/HEAD/make-release.sh) | [Action](https://github.com/eclipse-che/che-server/actions?query=workflow%3A%22Release+Che+Server%22) | [`eclipse/che-server`](https://quay.io/eclipse/che-server),<br/>[`eclipse/che-endpoint-watcher`](https://quay.io/eclipse/che-endpoint-watcher),<br/> [`eclipse/che-keycloak`](https://quay.io/eclipse/che-keycloak),<br/> [`eclipse/che-postgres`](https://quay.io/eclipse/che-postgres),<br/> [`eclipse/che-server`](https://quay.io/eclipse/che-server),<br/> [`eclipse/che-e2e`](https://quay.io/eclipse/che-e2e) |
| [che-operator](https://github.com/eclipse-che/che-operator/blob/master/RELEASE.md) | [make-release.sh](https://github.com/eclipse-che/che-operator/blob/master/make-release.sh) | [Action](https://github.com/eclipse-che/che-operator/actions?query=workflow%3A%22Release+Che+Operator%22) | [`eclipse/che-operator`](https://quay.io/eclipse/che-operator)|
| [chectl](https://github.com/che-incubator/chectl/blob/master/RELEASE.md) | [make-release.sh](https://github.com/che-incubator/chectl/blob/master/make-release.sh) | [Action](https://github.com/che-incubator/chectl/actions) | [chectl releases](https://github.com/che-incubator/chectl/releases)
Release can be marked as complete, and this issue can be closed after these steps:
- [ ] check for [remaining version update PRs](https://github.com/eclipse-che/che-release/actions/workflows/release-check-unmerged-PRs.yml) and merge/close them.
- [ ] finalize [release notes](https://github.com/eclipse/che/releases) for this release.

<sup>[1]</sup> Overall process owner: @mkuznyetsov
More information about the process [here](https://github.com/eclipse-che/che-release/blob/main/README.md)
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/task.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ body:
Useful Links:
- 📄 Documentation: https://www.eclipse.org/che/docs
- 📄 Documentation: https://eclipse.dev/che/docs
- 📝 Contributing: https://github.com/eclipse/che/blob/master/CONTRIBUTING.md
💬 Eclipse Che has public chat on:
- Mattermost: https://mattermost.eclipse.org/eclipse/channels/eclipse-che
- Eclipse Cloud Dev Tools Slack: https://communityinviter.com/apps/ecd-tools/join-the-community
- type: textarea
id: problem
Expand Down
32 changes: 32 additions & 0 deletions .github/workflows/need-triage-label.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: Label New Issues

on:
issues:
types: [opened]

jobs:
label-issue:
runs-on: ubuntu-latest

steps:
- name: Checkout repository
uses: actions/checkout@v4

- name: Add Label "status/need-triage" if no label starting with "severity" exists
env:
GITHUB_TOKEN: ${{ secrets.CHE_BOT_GITHUB_TOKEN }}
run: |
ISSUE_NUMBER=${{ github.event.issue.number }}
REPO=${{ github.repository }}
LABEL_TO_ADD="status/need-triage"
LABEL_PREFIX="severity"
# Get the issue labels
ISSUE_LABELS=$(gh issue view $ISSUE_NUMBER --json labels --jq '.labels[].name')
# Check if any label starts with 'severity'
if echo "$ISSUE_LABELS" | grep -q "^$LABEL_PREFIX"; then
echo "A label starting with '$LABEL_PREFIX' exists. No action needed."
else
echo "No label starting with '$LABEL_PREFIX' found. Adding '$LABEL_TO_ADD'."
# Add the label to the issue
gh issue edit $ISSUE_NUMBER --add-label "$LABEL_TO_ADD"
fi
22 changes: 15 additions & 7 deletions .github/workflows/pr-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,9 @@ env:
jobs:
pr-check:
runs-on: ubuntu-22.04

defaults:
run:
working-directory: tests/e2e
steps:
- name: Git checkout
uses: actions/checkout@v2
Expand All @@ -48,14 +50,23 @@ jobs:
with:
node-version: '16'

- name: Check compilation errors
run: |
npm ci
npm run tsc
- name: Check lint errors
run: |
npm run lint
- name: Start minikube
id: run-minikube
uses: che-incubator/setup-minikube-action@next
with:
minikube-version: v1.23.2

- name: Install chectl
run: bash <(curl -sL https://www.eclipse.org/che/chectl/) --channel=next
run: bash <(curl -sL https://che-incubator.github.io/chectl/install.sh) --channel=next

- name: Deploy Che
run: |
Expand All @@ -74,8 +85,8 @@ jobs:
chectl server:deploy \
--batch \
--platform minikube \
--k8spodwaittimeout=120000 \
--k8spodreadytimeout=120000 \
--k8spodwaittimeout=480000 \
--k8spodreadytimeout=480000 \
--che-operator-cr-patch-yaml "/tmp/github-minikube-checluster-patch.yaml"
#
Expand All @@ -92,8 +103,6 @@ jobs:
- name: Run Empty Workspace API test
run: |
cd tests/e2e
npm ci
export TS_PLATFORM=kubernetes &&
export TS_API_TEST_KUBERNETES_COMMAND_LINE_TOOL=kubectl &&
export TS_SELENIUM_VALUE_OPENSHIFT_OAUTH=false &&
Expand All @@ -109,7 +118,6 @@ jobs:
run: |
# for saving disk space we can remove the assembly folder because it is legacy code
rm -rf assembly
cd tests/e2e
docker build -t quay.io/eclipse/che-e2e:"${{ env.pr_number }}" -f build/dockerfiles/Dockerfile .
# we have already ran API test, built test image and do not need e2e test-code, remove for saving disk space
Expand Down
2 changes: 1 addition & 1 deletion .repositories.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ repositories:
- url: https://github.com/eclipse-che/che-website
name: website
description: >-
https://eclipse.org/che website source code.
https://eclipse.dev/che website source code.
devfile: https://github.com/eclipse-che/che-website/blob/main/.devfile.yaml
useCheReleaseLifecycle: false
- url: https://github.com/eclipse-che/che-workspace-client
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Repository | Component | Description | Devfile | Documentation
[machine-exec](https://github.com/eclipse-che/che-machine-exec) | | Interface to execute tasks and terminals on other containers within a workspace. | [devfile](https://github.com/eclipse-che/che-machine-exec/blob/main/devfile.yaml) | [doc](https://github.com/eclipse-che/che-machine-exec/blob/main/CONTRIBUTING.md)
[operator](https://github.com/eclipse-che/che-operator) | | Che operator to deploy, update and manage K8S/OpenShift resources of Che. | [devfile](https://github.com/eclipse-che/che-operator/blob/main/devfile.yaml) |
[plugin-registry](https://github.com/eclipse-che/che-plugin-registry) | | The default set of Che plugins (vscode extension + containers) or editors that could be installed on any Che workspaces. | |
[website](https://github.com/eclipse-che/che-website) | | https://eclipse.org/che website source code. | [devfile](https://github.com/eclipse-che/che-website/blob/main/.devfile.yaml) |
[website](https://github.com/eclipse-che/che-website) | | https://eclipse.dev/che website source code. | [devfile](https://github.com/eclipse-che/che-website/blob/main/.devfile.yaml) |
[workspace-client](https://github.com/eclipse-che/che-workspace-client) | | JS library to interact with a che-server. | |
[configbump](https://github.com/che-incubator/configbump) | | Simple Kubernetes controller that is able to quickly synchronize a set of config maps | |
[workspace-data-sync](https://github.com/che-incubator/workspace-data-sync) | | Provides the ability to increase I/O performance for a developer workspaces | |
Expand Down
Loading

0 comments on commit 43ed4e1

Please sign in to comment.