diff --git a/dependencies/VERSION b/dependencies/VERSION index b2fb78a919..d22ba0602f 100644 --- a/dependencies/VERSION +++ b/dependencies/VERSION @@ -1 +1 @@ -3.18 +3.19 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 9b3f213885..e4056c582f 100644 --- a/dependencies/che-plugin-registry/deploy/openshift/devspaces-plugin-registry.yaml +++ b/dependencies/che-plugin-registry/deploy/openshift/devspaces-plugin-registry.yaml @@ -1,13 +1,3 @@ -# -# Copyright (c) 2018-2024 Red Hat, Inc. -# This program and the accompanying materials are made -# available under the terms of the Eclipse Public License 2.0 -# which is available at https://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 -# -# Contributors: -# Red Hat, Inc. - initial API and implementation apiVersion: template.openshift.io/v1 kind: Template metadata: @@ -120,7 +110,7 @@ parameters: description: Red Hat OpenShift Dev Spaces plugin registry container image. Defaults to registry.redhat.io/devspaces/pluginregistry-rhel8 - name: IMAGE_TAG - value: '3.18' + value: '3.19' 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 f8a1d53194..fd6d77a81f 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.18", + "Version": "3.19", "Jobs": { "code": { - "3.16": { + "3.17": { "upstream_branch": [ - "7.90.x", + "7.92.x", "main" ], "disabled": true }, - "3.17": { + "3.18": { "upstream_branch": [ - "7.92.x", + "7.95.x", "main" ], "disabled": false }, - "3.18": { + "3.19": { "upstream_branch": [ - "7.94.x", + "7.97.x", "main" ], "disabled": false @@ -33,23 +33,23 @@ } }, "configbump": { - "3.16": { + "3.17": { "upstream_branch": [ - "7.90.x", + "7.92.x", "main" ], "disabled": true }, - "3.17": { + "3.18": { "upstream_branch": [ - "7.92.x", + "7.95.x", "main" ], "disabled": false }, - "3.18": { + "3.19": { "upstream_branch": [ - "7.94.x", + "7.97.x", "main" ], "disabled": false @@ -63,23 +63,23 @@ } }, "dashboard": { - "3.16": { + "3.17": { "upstream_branch": [ - "7.90.x", + "7.92.x", "main" ], "disabled": true }, - "3.17": { + "3.18": { "upstream_branch": [ - "7.92.x", + "7.95.x", "main" ], "disabled": false }, - "3.18": { + "3.19": { "upstream_branch": [ - "7.94.x", + "7.97.x", "main" ], "disabled": false @@ -93,53 +93,23 @@ } }, "imagepuller": { - "3.16": { - "upstream_branch": [ - "7.90.x", - "main" - ], - "disabled": true - }, "3.17": { "upstream_branch": [ "7.92.x", "main" ], - "disabled": false - }, - "3.18": { - "upstream_branch": [ - "7.94.x", - "main" - ], - "disabled": false - }, - "3.x": { - "upstream_branch": [ - "main", - "main" - ], - "disabled": false - } - }, - "machineexec": { - "3.16": { - "upstream_branch": [ - "7.90.x", - "main" - ], "disabled": true }, - "3.17": { + "3.18": { "upstream_branch": [ - "7.92.x", + "7.95.x", "main" ], "disabled": false }, - "3.18": { + "3.19": { "upstream_branch": [ - "7.94.x", + "7.97.x", "main" ], "disabled": false @@ -153,23 +123,23 @@ } }, "operator": { - "3.16": { + "3.17": { "upstream_branch": [ - "7.90.x", + "7.92.x", "main" ], "disabled": true }, - "3.17": { + "3.18": { "upstream_branch": [ - "7.92.x", + "7.95.x", "main" ], "disabled": false }, - "3.18": { + "3.19": { "upstream_branch": [ - "7.94.x", + "7.97.x", "main" ], "disabled": false @@ -183,23 +153,23 @@ } }, "server": { - "3.16": { + "3.17": { "upstream_branch": [ - "7.90.x", + "7.92.x", "main" ], "disabled": true }, - "3.17": { + "3.18": { "upstream_branch": [ - "7.92.x", + "7.95.x", "main" ], "disabled": false }, - "3.18": { + "3.19": { "upstream_branch": [ - "7.94.x", + "7.97.x", "main" ], "disabled": false @@ -213,19 +183,12 @@ } }, "pluginregistry": { - "3.16": { - "upstream_branch": [ - "devspaces-3.16-rhel-8", - "devspaces-3.16-rhel-8" - ], - "disabled": true - }, "3.17": { "upstream_branch": [ "devspaces-3.17-rhel-8", "devspaces-3.17-rhel-8" ], - "disabled": false + "disabled": true }, "3.18": { "upstream_branch": [ @@ -234,6 +197,13 @@ ], "disabled": false }, + "3.19": { + "upstream_branch": [ + "devspaces-3.19-rhel-8", + "devspaces-3.19-rhel-8" + ], + "disabled": false + }, "3.x": { "upstream_branch": [ "devspaces-3-rhel-8", @@ -243,21 +213,21 @@ } }, "idea": { - "3.16": { + "3.17": { "upstream_branch": [ "20221111", "20221111" ], "disabled": true }, - "3.17": { + "3.18": { "upstream_branch": [ "20221111", "20221111" ], "disabled": false }, - "3.18": { + "3.19": { "upstream_branch": [ "20221111", "20221111" @@ -273,21 +243,21 @@ } }, "traefik": { - "3.16": { + "3.17": { "upstream_branch": [ "v2.10.0", "v2.10.0" ], "disabled": true }, - "3.17": { + "3.18": { "upstream_branch": [ "v2.10.0", "v2.10.0" ], "disabled": false }, - "3.18": { + "3.19": { "upstream_branch": [ "v2.10.0", "v2.10.0" @@ -303,13 +273,13 @@ } }, "build-all-images": { - "3.16": { + "3.17": { "disabled": true }, - "3.17": { + "3.18": { "disabled": false }, - "3.18": { + "3.19": { "disabled": false }, "3.x": { @@ -317,19 +287,12 @@ } }, "udi": { - "3.16": { - "upstream_branch": [ - "devspaces-3.16-rhel-8", - "devspaces-3.16-rhel-8" - ], - "disabled": true - }, "3.17": { "upstream_branch": [ "devspaces-3.17-rhel-8", "devspaces-3.17-rhel-8" ], - "disabled": false + "disabled": true }, "3.18": { "upstream_branch": [ @@ -338,6 +301,13 @@ ], "disabled": false }, + "3.19": { + "upstream_branch": [ + "devspaces-3.19-rhel-8", + "devspaces-3.19-rhel-8" + ], + "disabled": false + }, "3.x": { "upstream_branch": [ "devspaces-3-rhel-8", @@ -349,23 +319,23 @@ }, "Management-Jobs": { "dsc": { - "3.16": { + "3.17": { "upstream_branch": [ - "7.90.x", + "7.92.x", "main" ], "disabled": true }, - "3.17": { + "3.18": { "upstream_branch": [ - "7.92.x", + "7.95.x", "main" ], "disabled": false }, - "3.18": { + "3.19": { "upstream_branch": [ - "7.94.x", + "7.97.x", "main" ], "disabled": false @@ -379,23 +349,23 @@ } }, "operator-bundle": { - "3.16": { + "3.17": { "upstream_branch": [ - "7.90.x", + "7.92.x", "main" ], "disabled": true }, - "3.17": { + "3.18": { "upstream_branch": [ - "7.92.x", + "7.95.x", "main" ], "disabled": false }, - "3.18": { + "3.19": { "upstream_branch": [ - "7.94.x", + "7.97.x", "main" ], "disabled": false @@ -409,13 +379,13 @@ } }, "get-sources-rhpkg-container-build": { - "3.16": { + "3.17": { "disabled": true }, - "3.17": { + "3.18": { "disabled": false }, - "3.18": { + "3.19": { "disabled": false }, "3.x": { @@ -423,13 +393,13 @@ } }, "push-latest-container-to-quay": { - "3.16": { + "3.17": { "disabled": true }, - "3.17": { + "3.18": { "disabled": false }, - "3.18": { + "3.19": { "disabled": false }, "3.x": { @@ -437,13 +407,13 @@ } }, "sync-to-downstream": { - "3.16": { + "3.17": { "disabled": true }, - "3.17": { + "3.18": { "disabled": false }, - "3.18": { + "3.19": { "disabled": false }, "3.x": { @@ -451,27 +421,13 @@ } }, "update-digests": { - "3.16": { - "disabled": true - }, "3.17": { - "disabled": false - }, - "3.18": { - "disabled": false - }, - "3.x": { - "disabled": false - } - }, - "send-email-qe-build-list": { - "3.16": { "disabled": true }, - "3.17": { + "3.18": { "disabled": false }, - "3.18": { + "3.19": { "disabled": false }, "3.x": { @@ -479,13 +435,13 @@ } }, "slack-notification": { - "3.16": { + "3.17": { "disabled": true }, - "3.17": { + "3.18": { "disabled": false }, - "3.18": { + "3.19": { "disabled": false }, "3.x": { @@ -495,10 +451,6 @@ }, "CSVs": { "operator-bundle": { - "3.16": { - "CSV_VERSION": "3.16.1", - "CSV_VERSION_PREV": "3.16.0" - }, "3.17": { "CSV_VERSION": "3.17.0", "CSV_VERSION_PREV": "3.16.1" @@ -507,101 +459,104 @@ "CSV_VERSION": "3.18.0", "CSV_VERSION_PREV": "3.17.0" }, + "3.19": { + "CSV_VERSION": "3.19.0", + "CSV_VERSION_PREV": "3.17.0" + }, "3.x": { - "CSV_VERSION": "3.18.0", + "CSV_VERSION": "3.19.0", "CSV_VERSION_PREV": "3.17.0" } } }, "Other": { "Errata": { - "3.16": "137110", - "3.17": "n/a", + "3.17": "139981", "3.18": "n/a", + "3.19": "n/a", "3.x": "n/a" }, "Epic": { - "3.16": "CRW-6868", - "3.17": "n/a", + "3.17": "CRW-7528", "3.18": "n/a", + "3.19": "n/a", "3.x": "n/a" }, "FLOATING_QUAY_TAGS": { - "3.16": "3.16", - "3.17": "latest", - "3.18": "next", + "3.17": "3.17", + "3.18": "latest", + "3.19": "next", "3.x": "next" }, "DEV_WORKSPACE_CONTROLLER": { - "3.16": "v0.13.0", "3.17": "v0.13.0", "3.18": "v0.13.0", + "3.19": "v0.13.0", "3.x": "v0.13.0" }, "DEV_HEADER_REWRITE_TRAEFIK_PLUGIN": { - "3.16": "v0.1.2", "3.17": "v0.1.2", "3.18": "v0.1.2", + "3.19": "v0.1.2", "3.x": "v0.1.2" }, "gopls": { - "3.16": "gopls/v0.10.1", "3.17": "gopls/v0.10.1", "3.18": "gopls/v0.10.1", + "3.19": "gopls/v0.10.1", "3.x": "gopls/v0.10.1" }, "xdebug": { - "3.16": "3.1.6", "3.17": "3.1.6", "3.18": "3.1.6", + "3.19": "3.1.6", "3.x": "3.1.6" }, "kubedock": { - "3.16": "0.11.0", "3.17": "0.11.0", "3.18": "0.11.0", + "3.19": "0.11.0", "3.x": "0.11.0" }, "stow": { - "3.16": "4ef5eca4a9d107b24e712bb4c2c91f47e7e0fb85", "3.17": "4ef5eca4a9d107b24e712bb4c2c91f47e7e0fb85", "3.18": "4ef5eca4a9d107b24e712bb4c2c91f47e7e0fb85", + "3.19": "4ef5eca4a9d107b24e712bb4c2c91f47e7e0fb85", "3.x": "4ef5eca4a9d107b24e712bb4c2c91f47e7e0fb85" }, "DEV_WORKSPACE_OPERATOR_TAG": { - "3.16": "0.30", "3.17": "0.31", "3.18": "0.32", - "3.x": "0.32" + "3.19": "0.33", + "3.x": "0.33" }, "CHE_OPENVSX_TAG": { - "3.16": "che-openvsx-v0.15.8", "3.17": "che-openvsx-v0.15.8", "3.18": "che-openvsx-v0.15.8", + "3.19": "che-openvsx-v0.15.8", "3.x": "che-openvsx-v0.15.8" }, "OPENSHIFT_VERSIONS_SUPPORTED": { - "3.16": [ + "3.17": [ + "v4.17", "v4.16", "v4.15", "v4.14", "v4.13", "v4.12" ], - "3.17": [ + "3.18": [ "v4.17", "v4.16", "v4.15", "v4.14", - "v4.13", "v4.12" ], - "3.18": [ + "3.19": [ "v4.17", "v4.16", "v4.15", "v4.14", - "v4.13", "v4.12" ], "3.x": [ @@ -609,38 +564,37 @@ "v4.16", "v4.15", "v4.14", - "v4.13", "v4.12" ] }, "OPENSHIFT_CONTENT_SET_VERSION": { - "3.16": "4.12", "3.17": "4.12", "3.18": "4.12", + "3.19": "4.12", "3.x": "4.12" }, "OCP_TOOLS_CONTENT_SET_VERSION": { - "3.16": "4.12", "3.17": "4.12", "3.18": "4.12", + "3.19": "4.12", "3.x": "4.12" }, "GOLANG_VERSION": { - "3.16": "1.16.2", "3.17": "1.16.2", "3.18": "1.16.2", + "3.19": "1.16.2", "3.x": "1.16.2" }, "NODE_VERSION": { - "3.16": "18.16.1", "3.17": "18.16.1", "3.18": "18.16.1", + "3.19": "18.16.1", "3.x": "18.16.1" }, "YARN_VERSION": { - "3.16": "1.22.19", "3.17": "1.22.19", "3.18": "1.22.19", + "3.19": "1.22.19", "3.x": "1.22.19" } }, diff --git a/product/updateVersionAndRegistryTags.sh b/product/updateVersionAndRegistryTags.sh index 022c805b4c..008eae33c7 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=58 # DS 3.12 => (12 * 2) + 58 = 82 ==> Che 7.82 +CHE_OFFSET=59 # 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.