From 2be489615dcf7c0da0fc20c33b7e2c665c85f751 Mon Sep 17 00:00:00 2001 From: sdawley Date: Tue, 18 Mar 2025 11:47:26 -0700 Subject: [PATCH 1/2] Updating job-config for 3.21. Adding UDI-base --- dependencies/VERSION | 2 +- .../openshift/devspaces-plugin-registry.yaml | 2 +- dependencies/job-config.json | 277 ++++++++++-------- product/updateVersionAndRegistryTags.sh | 2 +- 4 files changed, 157 insertions(+), 126 deletions(-) diff --git a/dependencies/VERSION b/dependencies/VERSION index b95829267..a91121ce3 100644 --- a/dependencies/VERSION +++ b/dependencies/VERSION @@ -1 +1 @@ -3.20 +3.21 diff --git a/dependencies/che-plugin-registry/deploy/openshift/devspaces-plugin-registry.yaml b/dependencies/che-plugin-registry/deploy/openshift/devspaces-plugin-registry.yaml index a0642710d..0c9049f20 100644 --- a/dependencies/che-plugin-registry/deploy/openshift/devspaces-plugin-registry.yaml +++ b/dependencies/che-plugin-registry/deploy/openshift/devspaces-plugin-registry.yaml @@ -119,7 +119,7 @@ parameters: displayName: Red Hat OpenShift Dev Spaces plugin registry image description: Red Hat OpenShift Dev Spaces plugin registry container image. Defaults to registry.redhat.io/devspaces/pluginregistry-rhel9 - name: IMAGE_TAG - value: '3.20' + value: '3.21' displayName: Red Hat OpenShift Dev Spaces plugin registry version description: Red Hat OpenShift Dev Spaces plugin registry version - name: MEMORY_LIMIT diff --git a/dependencies/job-config.json b/dependencies/job-config.json index 528751a40..a17551014 100644 --- a/dependencies/job-config.json +++ b/dependencies/job-config.json @@ -1,25 +1,25 @@ { "Purpose": "To set configurations of jenkins jobs including upstream branches, dependencies and disabled status", - "Version": "3.20", + "Version": "3.21", "Jobs": { "code": { - "3.18": { + "3.19": { "upstream_branch": [ - "7.95.x", + "7.98.x", "main" ], "disabled": true }, - "3.19": { + "3.20": { "upstream_branch": [ - "7.98.x", + "7.100.x", "main" ], "disabled": false }, - "3.20": { + "3.21": { "upstream_branch": [ - "7.100.x", + "7.102.x", "main" ], "disabled": false @@ -33,23 +33,23 @@ } }, "configbump": { - "3.18": { + "3.19": { "upstream_branch": [ - "7.95.x", + "7.98.x", "main" ], "disabled": true }, - "3.19": { + "3.20": { "upstream_branch": [ - "7.98.x", + "7.100.x", "main" ], "disabled": false }, - "3.20": { + "3.21": { "upstream_branch": [ - "7.100.x", + "7.102.x", "main" ], "disabled": false @@ -63,23 +63,23 @@ } }, "dashboard": { - "3.18": { + "3.19": { "upstream_branch": [ - "7.95.x", + "7.98.x", "main" ], "disabled": true }, - "3.19": { + "3.20": { "upstream_branch": [ - "7.98.x", + "7.100.x", "main" ], "disabled": false }, - "3.20": { + "3.21": { "upstream_branch": [ - "7.100.x", + "7.102.x", "main" ], "disabled": false @@ -93,23 +93,23 @@ } }, "imagepuller": { - "3.18": { + "3.19": { "upstream_branch": [ - "7.95.x", + "7.98.x", "main" ], "disabled": true }, - "3.19": { + "3.20": { "upstream_branch": [ - "7.98.x", + "7.100.x", "main" ], "disabled": false }, - "3.20": { + "3.21": { "upstream_branch": [ - "7.100.x", + "7.102.x", "main" ], "disabled": false @@ -128,7 +128,7 @@ "7.98.x", "main" ], - "disabled": false + "disabled": true }, "3.20": { "upstream_branch": [ @@ -137,6 +137,13 @@ ], "disabled": false }, + "3.21": { + "upstream_branch": [ + "7.102.x", + "main" + ], + "disabled": false + }, "3.x": { "upstream_branch": [ "main", @@ -146,23 +153,23 @@ } }, "machineexec": { - "3.18": { + "3.19": { "upstream_branch": [ - "7.95.x", + "7.98.x", "main" ], "disabled": true }, - "3.19": { + "3.20": { "upstream_branch": [ - "7.98.x", + "7.100.x", "main" ], "disabled": false }, - "3.20": { + "3.21": { "upstream_branch": [ - "7.100.x", + "7.102.x", "main" ], "disabled": false @@ -176,23 +183,23 @@ } }, "operator": { - "3.18": { + "3.19": { "upstream_branch": [ - "7.95.x", + "7.98.x", "main" ], "disabled": true }, - "3.19": { + "3.20": { "upstream_branch": [ - "7.98.x", + "7.100.x", "main" ], "disabled": false }, - "3.20": { + "3.21": { "upstream_branch": [ - "7.100.x", + "7.102.x", "main" ], "disabled": false @@ -206,23 +213,23 @@ } }, "server": { - "3.18": { + "3.19": { "upstream_branch": [ - "7.95.x", + "7.98.x", "main" ], "disabled": true }, - "3.19": { + "3.20": { "upstream_branch": [ - "7.98.x", + "7.100.x", "main" ], "disabled": false }, - "3.20": { + "3.21": { "upstream_branch": [ - "7.100.x", + "7.102.x", "main" ], "disabled": false @@ -236,19 +243,12 @@ } }, "pluginregistry": { - "3.18": { - "upstream_branch": [ - "devspaces-3.18-rhel-9", - "devspaces-3.18-rhel-9" - ], - "disabled": true - }, "3.19": { "upstream_branch": [ "devspaces-3.19-rhel-9", "devspaces-3.19-rhel-9" ], - "disabled": false + "disabled": true }, "3.20": { "upstream_branch": [ @@ -257,6 +257,13 @@ ], "disabled": false }, + "3.21": { + "upstream_branch": [ + "devspaces-3.21-rhel-9", + "devspaces-3.21-rhel-9" + ], + "disabled": false + }, "3.x": { "upstream_branch": [ "devspaces-3-rhel-9", @@ -266,21 +273,21 @@ } }, "idea": { - "3.18": { + "3.19": { "upstream_branch": [ "20221111", "20221111" ], "disabled": true }, - "3.19": { + "3.20": { "upstream_branch": [ "20221111", "20221111" ], "disabled": false }, - "3.20": { + "3.21": { "upstream_branch": [ "20221111", "20221111" @@ -296,21 +303,21 @@ } }, "traefik": { - "3.18": { + "3.19": { "upstream_branch": [ "v2.10.0", "v2.10.0" ], "disabled": true }, - "3.19": { + "3.20": { "upstream_branch": [ "v2.10.0", "v2.10.0" ], "disabled": false }, - "3.20": { + "3.21": { "upstream_branch": [ "v2.10.0", "v2.10.0" @@ -326,13 +333,13 @@ } }, "build-all-images": { - "3.18": { + "3.19": { "disabled": true }, - "3.19": { + "3.20": { "disabled": false }, - "3.20": { + "3.21": { "disabled": false }, "3.x": { @@ -340,20 +347,36 @@ } }, "udi": { - "3.18": { + "3.19": { "upstream_branch": [ - "devspaces-3.18-rhel-9", - "devspaces-3.18-rhel-9" + "devspaces-3.19-rhel-9", + "devspaces-3.19-rhel-9" ], "disabled": true }, - "3.19": { + "3.20": { "upstream_branch": [ - "devspaces-3.19-rhel-9", - "devspaces-3.19-rhel-9" + "devspaces-3.20-rhel-9", + "devspaces-3.20-rhel-9" ], "disabled": false }, + "3.21": { + "upstream_branch": [ + "devspaces-3.21-rhel-9", + "devspaces-3.21-rhel-9" + ], + "disabled": false + }, + "3.x": { + "upstream_branch": [ + "devspaces-3-rhel-9", + "devspaces-3-rhel-9" + ], + "disabled": false + } + }, + "udi-base": { "3.20": { "upstream_branch": [ "devspaces-3.20-rhel-9", @@ -361,6 +384,13 @@ ], "disabled": false }, + "3.21": { + "upstream_branch": [ + "devspaces-3.21-rhel-9", + "devspaces-3.21-rhel-9" + ], + "disabled": false + }, "3.x": { "upstream_branch": [ "devspaces-3-rhel-9", @@ -402,23 +432,23 @@ }, "Management-Jobs": { "dsc": { - "3.18": { + "3.19": { "upstream_branch": [ - "7.95.x", + "7.98.x", "main" ], "disabled": true }, - "3.19": { + "3.20": { "upstream_branch": [ - "7.98.x", + "7.100.x", "main" ], "disabled": false }, - "3.20": { + "3.21": { "upstream_branch": [ - "7.100.x", + "7.102.x", "main" ], "disabled": false @@ -432,23 +462,23 @@ } }, "operator-bundle": { - "3.18": { + "3.19": { "upstream_branch": [ - "7.95.x", + "7.98.x", "main" ], "disabled": true }, - "3.19": { + "3.20": { "upstream_branch": [ - "7.98.x", + "7.100.x", "main" ], "disabled": false }, - "3.20": { + "3.21": { "upstream_branch": [ - "7.100.x", + "7.102.x", "main" ], "disabled": false @@ -462,13 +492,13 @@ } }, "get-sources-rhpkg-container-build": { - "3.18": { + "3.19": { "disabled": true }, - "3.19": { + "3.20": { "disabled": false }, - "3.20": { + "3.21": { "disabled": false }, "3.x": { @@ -476,13 +506,13 @@ } }, "push-latest-container-to-quay": { - "3.18": { + "3.19": { "disabled": true }, - "3.19": { + "3.20": { "disabled": false }, - "3.20": { + "3.21": { "disabled": false }, "3.x": { @@ -490,13 +520,13 @@ } }, "sync-to-downstream": { - "3.18": { + "3.19": { "disabled": true }, - "3.19": { + "3.20": { "disabled": false }, - "3.20": { + "3.21": { "disabled": false }, "3.x": { @@ -504,13 +534,13 @@ } }, "update-digests": { - "3.18": { + "3.19": { "disabled": true }, - "3.19": { + "3.20": { "disabled": false }, - "3.20": { + "3.21": { "disabled": false }, "3.x": { @@ -518,13 +548,13 @@ } }, "slack-notification": { - "3.18": { + "3.19": { "disabled": true }, - "3.19": { + "3.20": { "disabled": false }, - "3.20": { + "3.21": { "disabled": false }, "3.x": { @@ -534,10 +564,6 @@ }, "CSVs": { "operator-bundle": { - "3.18": { - "CSV_VERSION": "3.18.1", - "CSV_VERSION_PREV": "3.18.0" - }, "3.19": { "CSV_VERSION": "3.19.0", "CSV_VERSION_PREV": "3.18.1-0.1739475915.p" @@ -546,93 +572,98 @@ "CSV_VERSION": "3.20.0", "CSV_VERSION_PREV": "3.19.0" }, + "3.21": { + "CSV_VERSION": "3.21.0", + "CSV_VERSION_PREV": "3.19.0" + }, "3.x": { - "CSV_VERSION": "3.20.0", + "CSV_VERSION": "3.21.0", "CSV_VERSION_PREV": "3.19.0" } } }, "Other": { "Errata": { - "3.18": "143502", "3.19": "145508", - "3.20": "147226", + "3.20": "n/a", + "3.21": "n/a", "3.x": "n/a" }, "Epic": { - "3.18": "CRW-7648", "3.19": "CRW-7972", - "3.20": "CRW-8327", + "3.20": "n/a", + "3.21": "n/a", "3.x": "n/a" }, "FLOATING_QUAY_TAGS": { - "3.18": "3.18", - "3.19": "latest", - "3.20": "next", + "3.19": "3.19", + "3.20": "latest", + "3.21": "next", "3.x": "next" }, "DEV_WORKSPACE_CONTROLLER": { - "3.18": "v0.13.0", "3.19": "v0.13.0", "3.20": "v0.13.0", + "3.21": "v0.13.0", "3.x": "v0.13.0" }, "DEV_HEADER_REWRITE_TRAEFIK_PLUGIN": { - "3.18": "v0.1.2", "3.19": "v0.1.2", "3.20": "v0.1.2", + "3.21": "v0.1.2", "3.x": "v0.1.2" }, "gopls": { - "3.18": "gopls/v0.10.1", "3.19": "gopls/v0.10.1", "3.20": "gopls/v0.10.1", + "3.21": "gopls/v0.10.1", "3.x": "gopls/v0.10.1" }, "xdebug": { - "3.18": "3.1.6", "3.19": "3.1.6", "3.20": "3.1.6", + "3.21": "3.1.6", "3.x": "3.1.6" }, "kubedock": { - "3.18": "0.11.0", "3.19": "0.11.0", "3.20": "0.11.0", + "3.21": "0.11.0", "3.x": "0.11.0" }, "stow": { - "3.18": "4ef5eca4a9d107b24e712bb4c2c91f47e7e0fb85", "3.19": "4ef5eca4a9d107b24e712bb4c2c91f47e7e0fb85", "3.20": "4ef5eca4a9d107b24e712bb4c2c91f47e7e0fb85", + "3.21": "4ef5eca4a9d107b24e712bb4c2c91f47e7e0fb85", "3.x": "4ef5eca4a9d107b24e712bb4c2c91f47e7e0fb85" }, "DEV_WORKSPACE_OPERATOR_TAG": { - "3.18": "0.32", "3.19": "0.33", "3.20": "0.34", - "3.x": "0.34" + "3.21": "0.35", + "3.x": "0.35" }, "CHE_OPENVSX_TAG": { - "3.18": "che-openvsx-v0.19.0", "3.19": "che-openvsx-v0.19.0", "3.20": "che-openvsx-v0.19.0", + "3.21": "che-openvsx-v0.19.0", "3.x": "che-openvsx-v0.19.0" }, "OPENSHIFT_VERSIONS_SUPPORTED": { - "3.18": [ + "3.19": [ "v4.17", "v4.16", "v4.15", "v4.14" ], - "3.19": [ + "3.20": [ + "v4.18", "v4.17", "v4.16", "v4.15", "v4.14" ], - "3.20": [ + "3.21": [ "v4.18", "v4.17", "v4.16", @@ -648,33 +679,33 @@ ] }, "OPENSHIFT_CONTENT_SET_VERSION": { - "3.18": "4.17", "3.19": "4.17", "3.20": "4.17", + "3.21": "4.17", "3.x": "4.17" }, "OCP_TOOLS_CONTENT_SET_VERSION": { - "3.18": "4.15", "3.19": "4.15", "3.20": "4.15", + "3.21": "4.15", "3.x": "4.15" }, "GOLANG_VERSION": { - "3.18": "1.16.2", "3.19": "1.16.2", "3.20": "1.16.2", + "3.21": "1.16.2", "3.x": "1.16.2" }, "NODE_VERSION": { - "3.18": "18.16.1", "3.19": "18.16.1", "3.20": "18.16.1", + "3.21": "18.16.1", "3.x": "18.16.1" }, "YARN_VERSION": { - "3.18": "1.22.19", "3.19": "1.22.19", "3.20": "1.22.19", + "3.21": "1.22.19", "3.x": "1.22.19" } }, diff --git a/product/updateVersionAndRegistryTags.sh b/product/updateVersionAndRegistryTags.sh index 013049671..a1d0c2189 100755 --- a/product/updateVersionAndRegistryTags.sh +++ b/product/updateVersionAndRegistryTags.sh @@ -11,7 +11,7 @@ # Update versions and upstream branches in dependencies/job-config.json and across the DEVSPACES repository WORKDIR="$(pwd)" JOB_CONFIG="${WORKDIR}/dependencies/job-config.json" -CHE_OFFSET=59 # DS 3.12 => (12 * 2) + 58 = 82 ==> Che 7.82 +CHE_OFFSET=60 # DS 3.12 => (12 * 2) + 58 = 82 ==> Che 7.82 DWO_OFFSET=14 # DS 3.12 => DWO 0.26 COPYRIGHT="# # Copyright (c) 2018-$(date +%Y) Red Hat, Inc. From 316e577aa481cb2c8741dbdc2d6c86a47c445117 Mon Sep 17 00:00:00 2001 From: sdawley Date: Tue, 18 Mar 2025 12:16:23 -0700 Subject: [PATCH 2/2] Add 3.20 release Jira --- dependencies/job-config.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies/job-config.json b/dependencies/job-config.json index a17551014..19de11ef1 100644 --- a/dependencies/job-config.json +++ b/dependencies/job-config.json @@ -585,13 +585,13 @@ "Other": { "Errata": { "3.19": "145508", - "3.20": "n/a", + "3.20": "147226", "3.21": "n/a", "3.x": "n/a" }, "Epic": { "3.19": "CRW-7972", - "3.20": "n/a", + "3.20": "CRW-8327", "3.21": "n/a", "3.x": "n/a" },