From e02f2ff2e44085002855d3b12b0c122c1e45e2bb Mon Sep 17 00:00:00 2001 From: Mykhailo Kuznietsov Date: Thu, 29 Aug 2024 22:56:27 +0300 Subject: [PATCH] remove devfile-registry from release scripts and workflows --- .../workflows/release-orchestrate-overall.yml | 11 ++++---- .github/workflows/update-base-images.yml | 4 +-- README.md | 4 +-- make-release.sh | 27 ++++--------------- updateBaseImagesInChe.sh | 1 - utils/approvePRs.sh | 1 - utils/check-branches.sh | 1 - utils/updateSecrets.chebot.txt | 1 - utils/updateSecrets.dockerhub.txt | 1 - utils/updateSecrets.quay.txt | 1 - 10 files changed, 12 insertions(+), 40 deletions(-) diff --git a/.github/workflows/release-orchestrate-overall.yml b/.github/workflows/release-orchestrate-overall.yml index 3f1c160..48f1f19 100644 --- a/.github/workflows/release-orchestrate-overall.yml +++ b/.github/workflows/release-orchestrate-overall.yml @@ -18,15 +18,14 @@ on: phases: description: ' # Comma-separated phases to perform. -#1: Code, MachineExec, Dashboard, Server, branches; -#2: E2E, PluginRegistry; -#3: DevfileRegistry; -#4: CheOperator; -# Default: 1,2,3,4 +#1: Code, MachineExec, Server, branches; +#2: E2E, PluginRegistry, Dashboard; +#3: CheOperator; +# Default: 1,2,3 # Omit phases that have successfully run. ' required: true - default: '1,2,3,4' + default: '1,2,3' jobs: pre_job: runs-on: ubuntu-22.04 diff --git a/.github/workflows/update-base-images.yml b/.github/workflows/update-base-images.yml index 2edf754..e759be6 100644 --- a/.github/workflows/update-base-images.yml +++ b/.github/workflows/update-base-images.yml @@ -19,8 +19,7 @@ on: che-incubator/kubernetes-image-puller-operator, devfile/devworkspace-operator, devfile/developer-images, - eclipse-che/che-dashboard, - eclipse-che/che-devfile-registry, + eclipse-che/che-dashboard, eclipse-che/che-machine-exec, eclipse-che/che-operator, eclipse-che/che-plugin-registry, @@ -47,7 +46,6 @@ jobs: - { repo: "devfile/devworkspace-operator", user: "CHE_INCUBATOR_BOT_GITHUB_TOKEN", commandFlags: "-maxdepth 3 -f *Dockerfile --pr" } - { repo: "devfile/developer-images", user: "CHE_INCUBATOR_BOT_GITHUB_TOKEN", commandFlags: "-maxdepth 3 -f *Dockerfile --pr" } - { repo: "eclipse-che/che-dashboard", user: "CHE_BOT_GITHUB_TOKEN", commandFlags: "-maxdepth 3 -f *Dockerfile --pr" } - - { repo: "eclipse-che/che-devfile-registry", user: "CHE_BOT_GITHUB_TOKEN", commandFlags: "-maxdepth 3 -f *Dockerfile --pr" } - { repo: "eclipse-che/che-machine-exec", user: "CHE_BOT_GITHUB_TOKEN", commandFlags: "-maxdepth 3 -f *Dockerfile --pr" } - { repo: "eclipse-che/che-operator", user: "CHE_BOT_GITHUB_TOKEN", commandFlags: "-maxdepth 1 -f *Dockerfile --pr" } - { repo: "eclipse-che/che-plugin-registry", user: "CHE_BOT_GITHUB_TOKEN", commandFlags: "-maxdepth 3 -f *Dockerfile --pr" } diff --git a/README.md b/README.md index e1455a7..4612cda 100644 --- a/README.md +++ b/README.md @@ -40,9 +40,7 @@ The projects covered by this workflow release container images, NPM artifacts, o | | [che-plugin-registry](https://github.com/eclipse-che/che-plugin-registry) | [![Release](https://github.com/eclipse-che/che-plugin-registry/actions/workflows/release.yml/badge.svg)](https://github.com/eclipse-che/che-plugin-registry/actions/workflows/release.yml) | [che-plugin-registry](https://quay.io/eclipse/che-plugin-registry) | | | [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) | | | | -| **Phase 3** | [che-devfile-registry](https://github.com/eclipse-che/che-devfile-registry) | [![Release](https://github.com/eclipse-che/che-devfile-registry/actions/workflows/release.yml/badge.svg)](https://github.com/eclipse-che/che-devfile-registry/actions/workflows/release.yml) | [che-devfile-registry](https://quay.io/eclipse/che-devfile-registry) | -| | -| **Phase 4** | [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) | +| **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) | 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. diff --git a/make-release.sh b/make-release.sh index ab6f541..a8435d6 100755 --- a/make-release.sh +++ b/make-release.sh @@ -16,12 +16,11 @@ usage () # Comma-separated phases to perform. #1: Code, Configbump, MachineExec, Server, devworkspace-generator, createBranches (kubernetes-image-puller); #2: E2E, PluginRegistry, Dashboard; -#3: DevfileRegistry; -#4: Operator; -# Default: 1,2,3,4 +#3: Operator; +# Default: 1,2,3 # Omit phases that have successfully run. " - echo "Example: $0 --version 7.75.0 --phases 1,2,3,4"; echo + echo "Example: $0 --version 7.75.0 --phases 1,2,3"; echo exit 1 } @@ -139,12 +138,6 @@ releaseDashboard() { invokeAction eclipse-che/che-dashboard "Release Che Dashboard" "3152474" "version=${CHE_VERSION}" } -#################### PHASE 3 #################### - -releaseDevfileRegistry() { - invokeAction eclipse-che/che-devfile-registry "Release Che Devfile Registry" "4191260" "version=${CHE_VERSION}" -} - #################### PHASE 4 #################### releaseCheOperator() { @@ -224,21 +217,11 @@ verifyContainerExistsWithTimeout ${REGISTRY}/${ORGANIZATION}/che-plugin-registry # shellcheck disable=SC2086 verifyContainerExistsWithTimeout ${REGISTRY}/${ORGANIZATION}/che-dashboard:${CHE_VERSION} 60 -#################### PHASE 3 #################### - -# Release devfile registry (depends on plugin registry) -if [[ ${PHASES} == *"3"* ]]; then - releaseDevfileRegistry -fi -wait -# shellcheck disable=SC2086 -verifyContainerExistsWithTimeout ${REGISTRY}/${ORGANIZATION}/che-devfile-registry:${CHE_VERSION} 60 - #################### PHASE 4 #################### -# Create operator PRs (depends on devfile registry) +# Create operator PRs (depends on all phases above) set +x -if [[ ${PHASES} == *"4"* ]]; then +if [[ ${PHASES} == *"3"* ]]; then releaseCheOperator fi wait diff --git a/updateBaseImagesInChe.sh b/updateBaseImagesInChe.sh index 59b45f3..20714d7 100755 --- a/updateBaseImagesInChe.sh +++ b/updateBaseImagesInChe.sh @@ -28,7 +28,6 @@ updateImagesInProject() } updateImagesInProject "eclipse-che/che-machine-exec" "main" "" & -updateImagesInProject "eclipse-che/che-devfile-registry" "main" "" & updateImagesInProject "eclipse-che/che-plugin-registry" "main" "" & updateImagesInProject "eclipse-che/che-dashboard" "main" "" & updateImagesInProject "che-incubator/chectl" "main" "" & diff --git a/utils/approvePRs.sh b/utils/approvePRs.sh index 0a927be..823bed2 100755 --- a/utils/approvePRs.sh +++ b/utils/approvePRs.sh @@ -21,7 +21,6 @@ che-incubator/kubernetes-image-puller-operator \ devfile/devworkspace-operator \ devfile/developer-images \ eclipse-che/che-dashboard \ -eclipse-che/che-devfile-registry \ eclipse-che/che-machine-exec \ eclipse-che/che-operator \ eclipse-che/che-plugin-registry \ diff --git a/utils/check-branches.sh b/utils/check-branches.sh index 8359f0a..6b5acac 100755 --- a/utils/check-branches.sh +++ b/utils/check-branches.sh @@ -13,7 +13,6 @@ REPO_LIST=( che-incubator/configbump che-incubator/kubernetes-image-puller eclipse-che/che-dashboard - eclipse-che/che-devfile-registry eclipse-che/che-machine-exec eclipse-che/che-operator eclipse-che/che-plugin-registry diff --git a/utils/updateSecrets.chebot.txt b/utils/updateSecrets.chebot.txt index e12f191..a744689 100644 --- a/utils/updateSecrets.chebot.txt +++ b/utils/updateSecrets.chebot.txt @@ -1,5 +1,4 @@ # che-bot secret -eclipse-che/che-devfile-registry eclipse-che/che-operator eclipse-che/che-plugin-registry eclipse-che/che-release diff --git a/utils/updateSecrets.dockerhub.txt b/utils/updateSecrets.dockerhub.txt index 0623fea..cfc69b9 100644 --- a/utils/updateSecrets.dockerhub.txt +++ b/utils/updateSecrets.dockerhub.txt @@ -4,7 +4,6 @@ che-dockerfiles/che-sidecar-kubernetes-tooling che-dockerfiles/che-sidecar-openshift-connector che-incubator/configbump eclipse-che/che-dashboard -eclipse-che/che-devfile-registry eclipse-che/che-machine-exec eclipse-che/che-operator eclipse-che/che-plugin-registry diff --git a/utils/updateSecrets.quay.txt b/utils/updateSecrets.quay.txt index 614adc0..4ad9de4 100644 --- a/utils/updateSecrets.quay.txt +++ b/utils/updateSecrets.quay.txt @@ -5,7 +5,6 @@ che-incubator/jetbrains-editor-images che-incubator/kubernetes-image-puller che-incubator/kubernetes-image-puller-operator eclipse-che/che-dashboard -eclipse-che/che-devfile-registry eclipse-che/che-machine-exec eclipse-che/che-operator eclipse-che/che-plugin-registry