From 997f8f7b7961bc5a9011a7afbc16148ba0f971c2 Mon Sep 17 00:00:00 2001
From: sdawley <sdawley@redhat.com>
Date: Wed, 16 Apr 2025 14:46:27 -0700
Subject: [PATCH] CRW-8607 Update job-config for 3.22 release

---
 dependencies/VERSION                          |   2 +-
 .../openshift/devspaces-plugin-registry.yaml  |   2 +-
 dependencies/job-config.json                  | 185 +++++++++++++++---
 product/updateVersionAndRegistryTags.sh       |   2 +-
 4 files changed, 159 insertions(+), 32 deletions(-)

diff --git a/dependencies/VERSION b/dependencies/VERSION
index a91121ce3..8838d68a7 100644
--- a/dependencies/VERSION
+++ b/dependencies/VERSION
@@ -1 +1 @@
-3.21
+3.22
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 0c9049f20..44bd1e0f8 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.21'
+    value: '3.22'
     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 19de11ef1..7908c92f1 100644
--- a/dependencies/job-config.json
+++ b/dependencies/job-config.json
@@ -1,6 +1,6 @@
 {
   "Purpose": "To set configurations of jenkins jobs including upstream branches, dependencies and disabled status",
-  "Version": "3.21",
+  "Version": "3.22",
   "Jobs": {
     "code": {
       "3.19": {
@@ -24,6 +24,13 @@
         ],
         "disabled": false
       },
+      "3.22": {
+        "upstream_branch": [
+          "7.104.x",
+          "main"
+        ],
+        "disabled": false
+      },
       "3.x": {
         "upstream_branch": [
           "main",
@@ -54,6 +61,13 @@
         ],
         "disabled": false
       },
+      "3.22": {
+        "upstream_branch": [
+          "7.104.x",
+          "main"
+        ],
+        "disabled": false
+      },
       "3.x": {
         "upstream_branch": [
           "main",
@@ -84,6 +98,13 @@
         ],
         "disabled": false
       },
+      "3.22": {
+        "upstream_branch": [
+          "7.104.x",
+          "main"
+        ],
+        "disabled": false
+      },
       "3.x": {
         "upstream_branch": [
           "main",
@@ -114,6 +135,13 @@
         ],
         "disabled": false
       },
+      "3.22": {
+        "upstream_branch": [
+          "7.104.x",
+          "main"
+        ],
+        "disabled": false
+      },
       "3.x": {
         "upstream_branch": [
           "main",
@@ -144,6 +172,13 @@
         ],
         "disabled": false
       },
+      "3.22": {
+        "upstream_branch": [
+          "7.104.x",
+          "main"
+        ],
+        "disabled": false
+      },
       "3.x": {
         "upstream_branch": [
           "main",
@@ -174,6 +209,13 @@
         ],
         "disabled": false
       },
+      "3.22": {
+        "upstream_branch": [
+          "7.104.x",
+          "main"
+        ],
+        "disabled": false
+      },
       "3.x": {
         "upstream_branch": [
           "main",
@@ -204,6 +246,13 @@
         ],
         "disabled": false
       },
+      "3.22": {
+        "upstream_branch": [
+          "7.104.x",
+          "main"
+        ],
+        "disabled": false
+      },
       "3.x": {
         "upstream_branch": [
           "main",
@@ -234,6 +283,13 @@
         ],
         "disabled": false
       },
+      "3.22": {
+        "upstream_branch": [
+          "7.104.x",
+          "main"
+        ],
+        "disabled": false
+      },
       "3.x": {
         "upstream_branch": [
           "main",
@@ -264,6 +320,13 @@
         ],
         "disabled": false
       },
+      "3.22": {
+        "upstream_branch": [
+          "devspaces-3.22-rhel-9",
+          "devspaces-3.22-rhel-9"
+        ],
+        "disabled": false
+      },
       "3.x": {
         "upstream_branch": [
           "devspaces-3-rhel-9",
@@ -294,6 +357,13 @@
         ],
         "disabled": false
       },
+      "3.22": {
+        "upstream_branch": [
+          "20221111",
+          "20221111"
+        ],
+        "disabled": false
+      },
       "3.x": {
         "upstream_branch": [
           "20221111",
@@ -324,6 +394,13 @@
         ],
         "disabled": false
       },
+      "3.22": {
+        "upstream_branch": [
+          "v2.10.0",
+          "v2.10.0"
+        ],
+        "disabled": false
+      },
       "3.x": {
         "upstream_branch": [
           "v2.10.0",
@@ -342,6 +419,9 @@
       "3.21": {
         "disabled": false
       },
+      "3.22": {
+        "disabled": false
+      },
       "3.x": {
         "disabled": false
       }
@@ -368,26 +448,10 @@
         ],
         "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",
-          "devspaces-3.20-rhel-9"
-        ],
-        "disabled": false
-      },
-      "3.21": {
+      "3.22": {
         "upstream_branch": [
-          "devspaces-3.21-rhel-9",
-          "devspaces-3.21-rhel-9"
+          "devspaces-3.22-rhel-9",
+          "devspaces-3.22-rhel-9"
         ],
         "disabled": false
       },
@@ -412,7 +476,7 @@
           "devspaces-3.19-rhel-9",
           "devspaces-3.19-rhel-9"
         ],
-        "disabled": false
+        "disabled": true
       },
       "3.20": {
         "upstream_branch": [
@@ -421,6 +485,13 @@
         ],
         "disabled": false
       },
+      "3.22": {
+        "upstream_branch": [
+          "devspaces-3.22-rhel-9",
+          "devspaces-3.22-rhel-9"
+        ],
+        "disabled": false
+      },
       "3.x": {
         "upstream_branch": [
           "devspaces-3-rhel-9",
@@ -453,6 +524,13 @@
         ],
         "disabled": false
       },
+      "3.22": {
+        "upstream_branch": [
+          "7.104.x",
+          "main"
+        ],
+        "disabled": false
+      },
       "3.x": {
         "upstream_branch": [
           "main",
@@ -483,6 +561,13 @@
         ],
         "disabled": false
       },
+      "3.22": {
+        "upstream_branch": [
+          "7.104.x",
+          "main"
+        ],
+        "disabled": false
+      },
       "3.x": {
         "upstream_branch": [
           "main",
@@ -501,6 +586,9 @@
       "3.21": {
         "disabled": false
       },
+      "3.22": {
+        "disabled": false
+      },
       "3.x": {
         "disabled": false
       }
@@ -515,6 +603,9 @@
       "3.21": {
         "disabled": false
       },
+      "3.22": {
+        "disabled": false
+      },
       "3.x": {
         "disabled": false
       }
@@ -529,6 +620,9 @@
       "3.21": {
         "disabled": false
       },
+      "3.22": {
+        "disabled": false
+      },
       "3.x": {
         "disabled": false
       }
@@ -543,6 +637,9 @@
       "3.21": {
         "disabled": false
       },
+      "3.22": {
+        "disabled": false
+      },
       "3.x": {
         "disabled": false
       }
@@ -557,6 +654,9 @@
       "3.21": {
         "disabled": false
       },
+      "3.22": {
+        "disabled": false
+      },
       "3.x": {
         "disabled": false
       }
@@ -574,11 +674,15 @@
       },
       "3.21": {
         "CSV_VERSION": "3.21.0",
-        "CSV_VERSION_PREV": "3.19.0"
+        "CSV_VERSION_PREV": "3.20.0"
+      },
+      "3.22": {
+        "CSV_VERSION": "3.22.0",
+        "CSV_VERSION_PREV": "3.20.0"
       },
       "3.x": {
-        "CSV_VERSION": "3.21.0",
-        "CSV_VERSION_PREV": "3.19.0"
+        "CSV_VERSION": "3.22.0",
+        "CSV_VERSION_PREV": "3.20.0"
       }
     }
   },
@@ -586,67 +690,78 @@
     "Errata": {
       "3.19": "145508",
       "3.20": "147226",
-      "3.21": "n/a",
+      "3.21": "148277",
+      "3.22": "n/a",
       "3.x": "n/a"
     },
     "Epic": {
       "3.19": "CRW-7972",
       "3.20": "CRW-8327",
-      "3.21": "n/a",
+      "3.21": "CRW-8607",
+      "3.22": "n/a",
       "3.x": "n/a"
     },
     "FLOATING_QUAY_TAGS": {
       "3.19": "3.19",
-      "3.20": "latest",
-      "3.21": "next",
+      "3.20": "3.20",
+      "3.21": "latest",
+      "3.22": "next",
       "3.x": "next"
     },
     "DEV_WORKSPACE_CONTROLLER": {
       "3.19": "v0.13.0",
       "3.20": "v0.13.0",
       "3.21": "v0.13.0",
+      "3.22": "v0.13.0",
       "3.x": "v0.13.0"
     },
     "DEV_HEADER_REWRITE_TRAEFIK_PLUGIN": {
       "3.19": "v0.1.2",
       "3.20": "v0.1.2",
       "3.21": "v0.1.2",
+      "3.22": "v0.1.2",
       "3.x": "v0.1.2"
     },
     "gopls": {
       "3.19": "gopls/v0.10.1",
       "3.20": "gopls/v0.10.1",
       "3.21": "gopls/v0.10.1",
+      "3.22": "gopls/v0.10.1",
       "3.x": "gopls/v0.10.1"
     },
     "xdebug": {
       "3.19": "3.1.6",
       "3.20": "3.1.6",
       "3.21": "3.1.6",
+      "3.22": "3.1.6",
       "3.x": "3.1.6"
     },
     "kubedock": {
       "3.19": "0.11.0",
       "3.20": "0.11.0",
       "3.21": "0.11.0",
+      "3.22": "0.11.0",
       "3.x": "0.11.0"
     },
     "stow": {
       "3.19": "4ef5eca4a9d107b24e712bb4c2c91f47e7e0fb85",
       "3.20": "4ef5eca4a9d107b24e712bb4c2c91f47e7e0fb85",
       "3.21": "4ef5eca4a9d107b24e712bb4c2c91f47e7e0fb85",
+      "3.22": "4ef5eca4a9d107b24e712bb4c2c91f47e7e0fb85",
       "3.x": "4ef5eca4a9d107b24e712bb4c2c91f47e7e0fb85"
     },
     "DEV_WORKSPACE_OPERATOR_TAG": {
       "3.19": "0.33",
       "3.20": "0.34",
       "3.21": "0.35",
-      "3.x": "0.35"
+      "3.22": "0.36",
+      "3.x": "0.36"
     },
     "CHE_OPENVSX_TAG": {
       "3.19": "che-openvsx-v0.19.0",
       "3.20": "che-openvsx-v0.19.0",
       "3.21": "che-openvsx-v0.19.0",
+      "3.22": "che-openvsx-v0.19.0",
       "3.x": "che-openvsx-v0.19.0"
     },
     "OPENSHIFT_VERSIONS_SUPPORTED": {
@@ -670,6 +785,13 @@
         "v4.15",
         "v4.14"
       ],
+      "3.22": [
+        "v4.18",
+        "v4.17",
+        "v4.16",
+        "v4.15",
+        "v4.14"
+      ],
       "3.x": [
         "v4.18",
         "v4.17",
@@ -682,30 +804,35 @@
       "3.19": "4.17",
       "3.20": "4.17",
       "3.21": "4.17",
+      "3.22": "4.17",
       "3.x": "4.17"
     },
     "OCP_TOOLS_CONTENT_SET_VERSION": {
       "3.19": "4.15",
       "3.20": "4.15",
       "3.21": "4.15",
+      "3.22": "4.15",
       "3.x": "4.15"
     },
     "GOLANG_VERSION": {
       "3.19": "1.16.2",
       "3.20": "1.16.2",
       "3.21": "1.16.2",
+      "3.22": "1.16.2",
       "3.x": "1.16.2"
     },
     "NODE_VERSION": {
       "3.19": "18.16.1",
       "3.20": "18.16.1",
       "3.21": "18.16.1",
+      "3.22": "18.16.1",
       "3.x": "18.16.1"
     },
     "YARN_VERSION": {
       "3.19": "1.22.19",
       "3.20": "1.22.19",
       "3.21": "1.22.19",
+      "3.22": "1.22.19",
       "3.x": "1.22.19"
     }
   },
diff --git a/product/updateVersionAndRegistryTags.sh b/product/updateVersionAndRegistryTags.sh
index a1d0c2189..217a56307 100755
--- a/product/updateVersionAndRegistryTags.sh
+++ b/product/updateVersionAndRegistryTags.sh
@@ -222,7 +222,7 @@ updateJobConfig() {
   # Find and version - 2 to disable in loop (should only be needed for hotfix releases)
   VERSION_KEYS=($(cat ${JOB_CONFIG} | jq -r '.Jobs'[\"dashboard\"]' | keys[]')) # Using dashboard to find versions
   #If there are more than 4 versions throw an error until extra versions are weeded out.
-  if [[ ${#VERSION_KEYS[@]} -gt 4 ]]; then echo "There are more than 4 versions in the job-config.json, please remove one."; exit 1; fi
+  #if [[ ${#VERSION_KEYS[@]} -gt 4 ]]; then echo "There are more than 4 versions in the job-config.json, please remove one."; exit 1; fi
 
   if [[ $VERBOSE ]]; then echo "[DEBUG] Versions in job-config.json: ${VERSION_KEYS[@]}"; fi
   OLDEST="${VERSION_KEYS[0]}"