From aa0372805ac3f737e8565d9c3cf8061ec197a7aa Mon Sep 17 00:00:00 2001
From: Mykhailo Kuznietsov <mkuznets@redhat.com>
Date: Mon, 2 Dec 2024 16:38:59 +0200
Subject: [PATCH 1/2] replace rhel-8 with rhel-9 references

Signed-off-by: Mykhailo Kuznietsov <mkuznets@redhat.com>
---
 .github/workflows/plugin-registry-build.yaml  |  2 +-
 .github/workflows/update-vsix-versions.yaml   |  2 +-
 README.adoc                                   | 12 +++++-----
 dependencies/LATEST_IMAGES.sh                 |  4 ++--
 dependencies/che-plugin-registry/README.md    | 12 +++++-----
 dependencies/che-plugin-registry/build.sh     |  8 +++----
 .../build/dockerfiles/Dockerfile              |  2 +-
 .../build/dockerfiles/rhel.Dockerfile         |  2 +-
 .../build/scripts/download_vsix.sh            |  2 +-
 dependencies/job-config.json                  | 24 +++++++++----------
 product/branding/README.adoc                  |  4 ++--
 product/buildAllInBrewCopyToQuay.sh           |  8 +++----
 product/buildInBrewCopyToQuay.sh              |  8 +++----
 product/bumpDockerfileVersions.sh             |  2 +-
 product/checkImagesInCSV.sh                   |  6 ++---
 product/collectBuildInfo.sh                   |  2 +-
 product/copyIIBsToQuay.sh                     | 10 ++++----
 product/copyVSIXToStage.sh                    |  2 +-
 product/getCommitSHAForTag.sh                 | 10 ++++----
 product/getLatestImageTags.sh                 | 22 ++++++++---------
 product/getRelatedImages.sh                   |  2 +-
 product/getTagForImage.sh                     |  2 +-
 product/ghira/ghira                           |  4 ++--
 product/installDevSpacesFromLatestIIB.sh      |  4 ++--
 product/rhpkg-container-build.sh              |  8 +++----
 product/tagRelease.sh                         |  8 +++----
 product/updateBaseImages.sh                   | 10 ++++----
 product/updateContainerYamlSHAs.sh            |  8 +++----
 product/updateGeneratedOperatorMetadata.sh    |  2 +-
 product/updatePNCBuildConfigs.sh              |  2 +-
 product/updateVersionAndRegistryTags.sh       |  8 +++----
 product/uploadAssetsToGHRelease.sh            |  4 ++--
 product/util2.groovy                          | 10 ++++----
 33 files changed, 108 insertions(+), 108 deletions(-)

diff --git a/.github/workflows/plugin-registry-build.yaml b/.github/workflows/plugin-registry-build.yaml
index afcfc3e6e0..be7a4f44b6 100644
--- a/.github/workflows/plugin-registry-build.yaml
+++ b/.github/workflows/plugin-registry-build.yaml
@@ -12,7 +12,7 @@ name: Plugin Registry - Build
 on:
   push:
     branches: 
-      - devspaces-3-rhel-8
+      - devspaces-3-rhel-9
     paths:
       - 'dependencies/che-plugin-registry/**'
 
diff --git a/.github/workflows/update-vsix-versions.yaml b/.github/workflows/update-vsix-versions.yaml
index 3f0ee26f1b..c28077dc4e 100644
--- a/.github/workflows/update-vsix-versions.yaml
+++ b/.github/workflows/update-vsix-versions.yaml
@@ -55,4 +55,4 @@ jobs:
         git push origin new-extension-version-branch
 
         # Create a pull request
-        gh pr create --title "chore: Auto-generated PR to update extnesions versions" --body "This pull request was automatically generated by GitHub Actions" --base devspaces-3-rhel-8
+        gh pr create --title "chore: Auto-generated PR to update extnesions versions" --body "This pull request was automatically generated by GitHub Actions" --base devspaces-3-rhel-9
diff --git a/README.adoc b/README.adoc
index 526a4edf48..60d0e4708e 100644
--- a/README.adoc
+++ b/README.adoc
@@ -4,13 +4,13 @@ Because these services are internal, in the interest of making all things open,
 
 ## What's inside?
 
-NOTE: the so-called master branch is deprecated and is no longer kept up to date. Instead, the latest nightly sources are in **devspaces-3-rhel-8 branch**, synced to upstream projects' main (or master) branches.
+NOTE: the so-called master branch is deprecated and is no longer kept up to date. Instead, the latest nightly sources are in **devspaces-3-rhel-9 branch**, synced to upstream projects' main (or master) branches.
 
-For the latest stable release, see the **devspaces-3.y-rhel-8** branch with the largest y value.
+For the latest stable release, see the **devspaces-3.y-rhel-9** branch with the largest y value.
 
 ---
 
-This repository no longer hosts the OpenShift Dev Spaces Server assembly that mainly inherits Eclipse Che artifacts and repackages some of them. Server has moved to link:https://github.com/redhat-developer/devspaces-images/blob/devspaces-3-rhel-8/devspaces-server/README.adoc#how-to-build-locally[devspaces-images/devspaces-server].
+This repository no longer hosts the OpenShift Dev Spaces Server assembly that mainly inherits Eclipse Che artifacts and repackages some of them. Server has moved to link:https://github.com/redhat-developer/devspaces-images/blob/devspaces-3-rhel-9/devspaces-server/README.adoc#how-to-build-locally[devspaces-images/devspaces-server].
 
 ### How to Build DS Containers Using casc Jenkins (REQUIRES VPN)
 
@@ -29,9 +29,9 @@ Folders under link:dependencies[/dependencies] are synced to https://github.com/
 
 The sync logic is in one of three places:
 
-* a Jenkins job - eg., link:https://github.com/redhat-developer/devspaces-images/blob/devspaces-3-rhel-8/crw-jenkins/jobs/DS_CI/dashboard_3.x.jenkinsfile[dashboard_3.x.jenkinsfile], 
-* a get-sources.sh script - eg., link:https://github.com/redhat-developer/devspaces-images/blob/devspaces-3-rhel-8/devspaces-dashboard/get-sources.sh[dashboard get-sources.sh], or
-* a sync-*.sh script - eg., link:https://github.com/redhat-developer/devspaces-images/blob/devspaces-3-rhel-8/devspaces-dashboard/build/scripts/sync.sh[dashboard/scripts/sync.sh]. 
+* a Jenkins job - eg., link:https://github.com/redhat-developer/devspaces-images/blob/devspaces-3-rhel-9/crw-jenkins/jobs/DS_CI/dashboard_3.x.jenkinsfile[dashboard_3.x.jenkinsfile], 
+* a get-sources.sh script - eg., link:https://github.com/redhat-developer/devspaces-images/blob/devspaces-3-rhel-9/devspaces-dashboard/get-sources.sh[dashboard get-sources.sh], or
+* a sync-*.sh script - eg., link:https://github.com/redhat-developer/devspaces-images/blob/devspaces-3-rhel-9/devspaces-dashboard/build/scripts/sync.sh[dashboard/scripts/sync.sh]. 
 
 Note over time we're trying to move all sync logic out of Jenkinsfiles and into scripts that can be run locally, so during outages build process can still be orchestrated. Goal is to have Jenkins simply call sync.sh scripts to perform syncs, and get-sources.sh scripts to collect assets from Jenkins (or other places) in order to commit those source tarballs + trigger Brew builds.
 
diff --git a/dependencies/LATEST_IMAGES.sh b/dependencies/LATEST_IMAGES.sh
index d8c6b5bb24..86c3337030 100755
--- a/dependencies/LATEST_IMAGES.sh
+++ b/dependencies/LATEST_IMAGES.sh
@@ -51,8 +51,8 @@ fi
 
 # try to compute branches from currently checked out branch; else fall back to hard coded value
 DWNSTM_BRANCH="$(git rev-parse --abbrev-ref HEAD 2>/dev/null || true)"
-if [[ $DWNSTM_BRANCH != "devspaces-3."*"-rhel-8" ]] && [[ $DWNSTM_BRANCH != "devspaces-3-rhel-8" ]]; then
-	DWNSTM_BRANCH="devspaces-${VERSION}-rhel-8"
+if [[ $DWNSTM_BRANCH != "devspaces-3."*"-rhel-9" ]] && [[ $DWNSTM_BRANCH != "devspaces-3-rhel-9" ]]; then
+	DWNSTM_BRANCH="devspaces-${VERSION}-rhel-9"
 fi
 
 # STEP 1 :: regenerate image tag list in LATEST_IMAGES
diff --git a/dependencies/che-plugin-registry/README.md b/dependencies/che-plugin-registry/README.md
index c195a99162..66c271fab6 100644
--- a/dependencies/che-plugin-registry/README.md
+++ b/dependencies/che-plugin-registry/README.md
@@ -11,7 +11,7 @@ Luckily there is an automatic way to build and publish .vsix files and their sou
 ## Plugin Registry Build Process
 The DS plugin registry is a fork of the upstream [Che plugin registry](https://github.com/eclipse-che/che-plugin-registry). While the build logic to build the actual registry is very similar to upstream, the steps required to actually build + publish the DS plugin registry images is quite different.
 
-To build the devfile registry for use with a specific Dev Spaces 3.yy version, it is necessary to check out the  appropriate `devspaces-3.yy-rhel-8` branch. This will ensure the build contains the correct tags and references to the images. The `devspaces-3-rhel-8` branch is for the upcoming 3.next release.
+To build the devfile registry for use with a specific Dev Spaces 3.yy version, it is necessary to check out the  appropriate `devspaces-3.yy-rhel-9` branch. This will ensure the build contains the correct tags and references to the images. The `devspaces-3-rhel-9` branch is for the upcoming 3.next release.
 
 ### Local DS Plugin Registry Build Process
 A local build works just like upstream -- use the `build.sh` script. The only difference in DS is that the resulting devfile.yaml files generated by the build process are zipped up into a .tar.gz file and copied into the container. This differs from upstream which just copies the output folder directly.
@@ -19,9 +19,9 @@ The default `OpenVSX` version used is `che-openvsx`, which will be built from ht
 
 ### DS Plugin Registry Build/Publish
 All contributions to the DS plugin registry should land in this repository. From there on, the following things happen:
-1. Code in this repository is synchronized from this repo to the [plugin registry directory in the devspaces-images repository](https://github.com/redhat-developer/devspaces-images/tree/devspaces-3-rhel-8/devspaces-pluginregistry) by a [Jenkins job](https://main-jenkins-csb-crwqe.apps.ocp-c1.prod.psi.redhat.com/job/DS_CI/job/pluginregistry_3.x).
-2. The job from step `1.` kicks off a subsequent [Jenkins job](https://main-jenkins-csb-crwqe.apps.ocp-c1.prod.psi.redhat.com/job/DS_CI/job/sync-to-downstream_2.x) that then runs the bootstrap build, which uses the sync'd code in [devspaces-images repository](https://github.com/redhat-developer/devspaces-images/tree/devspaces-3-rhel-8/devspaces-pluginregistry). The boostrap build builds the plugin registry in offline mode, using tagged image references. The resulting binaries and meta.yaml files are placed in a .tar.gz archive and the archive is committed to rhpkg for later usage in Brew.
-3. If step `2.` is successful then a Brew build is kicked off. The Brew build copies the generated content in the .tar.gz archive from step `2.` into the [Dockerfile](https://github.com/redhat-developer/devspaces/blob/devspaces-3-rhel-8/dependencies/che-plugin-registry/build/dockerfiles/Dockerfile) and completes the last stages of the plugin registry build.
+1. Code in this repository is synchronized from this repo to the [plugin registry directory in the devspaces-images repository](https://github.com/redhat-developer/devspaces-images/tree/devspaces-3-rhel-9/devspaces-pluginregistry) by a [Jenkins job](https://main-jenkins-csb-crwqe.apps.ocp-c1.prod.psi.redhat.com/job/DS_CI/job/pluginregistry_3.x).
+2. The job from step `1.` kicks off a subsequent [Jenkins job](https://main-jenkins-csb-crwqe.apps.ocp-c1.prod.psi.redhat.com/job/DS_CI/job/sync-to-downstream_2.x) that then runs the bootstrap build, which uses the sync'd code in [devspaces-images repository](https://github.com/redhat-developer/devspaces-images/tree/devspaces-3-rhel-9/devspaces-pluginregistry). The boostrap build builds the plugin registry in offline mode, using tagged image references. The resulting binaries and meta.yaml files are placed in a .tar.gz archive and the archive is committed to rhpkg for later usage in Brew.
+3. If step `2.` is successful then a Brew build is kicked off. The Brew build copies the generated content in the .tar.gz archive from step `2.` into the [Dockerfile](https://github.com/redhat-developer/devspaces/blob/devspaces-3-rhel-9/dependencies/che-plugin-registry/build/dockerfiles/Dockerfile) and completes the last stages of the plugin registry build.
 
 ## Building and Publishing Third Party Binaries for Plugin Registry Sidecar Containers
 
@@ -33,8 +33,8 @@ Sidecar image sources are then synced from the [devspaces-images](https://github
 
 For example, the udi sidecar: 
 
-* [devspaces-images/devspaces-udi](https://github.com/redhat-developer/devspaces-images/tree/devspaces-3-rhel-8/devspacesudi)
-* [containers/devspaces-udi](https://pkgs.devel.redhat.com/cgit/containers/devspaces-udi/tree/sources?h=devspaces-3-rhel-8)
+* [devspaces-images/devspaces-udi](https://github.com/redhat-developer/devspaces-images/tree/devspaces-3-rhel-9/devspacesudi)
+* [containers/devspaces-udi](https://pkgs.devel.redhat.com/cgit/containers/devspaces-udi/tree/sources?h=devspaces-3-rhel-9)
 
 ## License
 
diff --git a/dependencies/che-plugin-registry/build.sh b/dependencies/che-plugin-registry/build.sh
index 0cb01c9c2c..f8de0fb93e 100755
--- a/dependencies/che-plugin-registry/build.sh
+++ b/dependencies/che-plugin-registry/build.sh
@@ -151,8 +151,8 @@ prepareOpenvsxPackagingAsset() {
     fi
 
     SCRIPT_BRANCH="$(git rev-parse --abbrev-ref HEAD 2>/dev/null || true)"
-    if [[ $SCRIPT_BRANCH != "devspaces-3."*"-rhel-8" ]]; then
-        SCRIPT_BRANCH="devspaces-3-rhel-8"
+    if [[ $SCRIPT_BRANCH != "devspaces-3."*"-rhel-9" ]]; then
+        SCRIPT_BRANCH="devspaces-3-rhel-9"
     fi
 
     # save current branch name to the temporary file
@@ -219,8 +219,8 @@ else
     # try to compute branches from currently checked out branch; else fall back to hard coded value
     # where to find redhat-developer/devspaces/${SCRIPTS_BRANCH}/product/getLatestImageTags.sh
     SCRIPTS_BRANCH="$(git rev-parse --abbrev-ref HEAD 2>/dev/null || true)"
-    if [[ $SCRIPTS_BRANCH != "devspaces-3."*"-rhel-8" ]]; then
-        SCRIPTS_BRANCH="devspaces-3-rhel-8"
+    if [[ $SCRIPTS_BRANCH != "devspaces-3."*"-rhel-9" ]]; then
+        SCRIPTS_BRANCH="devspaces-3-rhel-9"
     fi
     echo "Load https://raw.githubusercontent.com/redhat-developer/devspaces/${SCRIPTS_BRANCH}/dependencies/job-config.json [3]"
     curl -sSLo /tmp/job-config.json https://raw.githubusercontent.com/redhat-developer/devspaces/${SCRIPTS_BRANCH}/dependencies/job-config.json
diff --git a/dependencies/che-plugin-registry/build/dockerfiles/Dockerfile b/dependencies/che-plugin-registry/build/dockerfiles/Dockerfile
index 1f25fadb35..847506e810 100644
--- a/dependencies/che-plugin-registry/build/dockerfiles/Dockerfile
+++ b/dependencies/che-plugin-registry/build/dockerfiles/Dockerfile
@@ -130,7 +130,7 @@ RUN \
     chgrp -R 0 /var/lib/pgsql /var/lib/pgsql/15 /var/lib/pgsql/data /var/lib/pgsql/backups && \
     mv /var/lib/pgsql/15/data/database /var/lib/pgsql/15/data/old
 
-ARG DS_BRANCH=devspaces-3-rhel-8
+ARG DS_BRANCH=devspaces-3-rhel-9
 ENV DS_BRANCH=${DS_BRANCH}
 
 ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
diff --git a/dependencies/che-plugin-registry/build/dockerfiles/rhel.Dockerfile b/dependencies/che-plugin-registry/build/dockerfiles/rhel.Dockerfile
index 8be5d12ee7..74e5afdc65 100644
--- a/dependencies/che-plugin-registry/build/dockerfiles/rhel.Dockerfile
+++ b/dependencies/che-plugin-registry/build/dockerfiles/rhel.Dockerfile
@@ -134,7 +134,7 @@ RUN \
     chgrp -R 0 /var/lib/pgsql /var/lib/pgsql/15 /var/lib/pgsql/data /var/lib/pgsql/backups && \
     mv /var/lib/pgsql/15/data/database /var/lib/pgsql/15/data/old
 
-ARG DS_BRANCH=devspaces-3-rhel-8
+ARG DS_BRANCH=devspaces-3-rhel-9
 ENV DS_BRANCH=${DS_BRANCH}
 
 ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
diff --git a/dependencies/che-plugin-registry/build/scripts/download_vsix.sh b/dependencies/che-plugin-registry/build/scripts/download_vsix.sh
index 06e34cf398..63596add8e 100755
--- a/dependencies/che-plugin-registry/build/scripts/download_vsix.sh
+++ b/dependencies/che-plugin-registry/build/scripts/download_vsix.sh
@@ -8,7 +8,7 @@ set -o pipefail
 openvsxJson="/openvsx-server/openvsx-sync.json"
 
 usage() {
-    echo "Usage: $0 -b devspaces-3.y-rhel-8 -j /path/to/openvsx-sync.json --no-download
+    echo "Usage: $0 -b devspaces-3.y-rhel-9 -j /path/to/openvsx-sync.json --no-download
 
 All arguments are optional.
 
diff --git a/dependencies/job-config.json b/dependencies/job-config.json
index d46ff15b9a..29f8ea0bcf 100644
--- a/dependencies/job-config.json
+++ b/dependencies/job-config.json
@@ -192,22 +192,22 @@
       },
       "3.18": {
         "upstream_branch": [
-          "devspaces-3.18-rhel-8",
-          "devspaces-3.18-rhel-8"
+          "devspaces-3.18-rhel-9",
+          "devspaces-3.18-rhel-9"
         ],
         "disabled": false
       },
       "3.19": {
         "upstream_branch": [
-          "devspaces-3.19-rhel-8",
-          "devspaces-3.19-rhel-8"
+          "devspaces-3.19-rhel-9",
+          "devspaces-3.19-rhel-9"
         ],
         "disabled": false
       },
       "3.x": {
         "upstream_branch": [
-          "devspaces-3-rhel-8",
-          "devspaces-3-rhel-8"
+          "devspaces-3-rhel-9",
+          "devspaces-3-rhel-9"
         ],
         "disabled": false
       }
@@ -296,22 +296,22 @@
       },
       "3.18": {
         "upstream_branch": [
-          "devspaces-3.18-rhel-8",
-          "devspaces-3.18-rhel-8"
+          "devspaces-3.18-rhel-9",
+          "devspaces-3.18-rhel-9"
         ],
         "disabled": false
       },
       "3.19": {
         "upstream_branch": [
-          "devspaces-3.19-rhel-8",
-          "devspaces-3.19-rhel-8"
+          "devspaces-3.19-rhel-9",
+          "devspaces-3.19-rhel-9"
         ],
         "disabled": false
       },
       "3.x": {
         "upstream_branch": [
-          "devspaces-3-rhel-8",
-          "devspaces-3-rhel-8"
+          "devspaces-3-rhel-9",
+          "devspaces-3-rhel-9"
         ],
         "disabled": false
       }
diff --git a/product/branding/README.adoc b/product/branding/README.adoc
index 532a6bd2b4..89d2f0ed30 100644
--- a/product/branding/README.adoc
+++ b/product/branding/README.adoc
@@ -8,9 +8,9 @@ Branding is currently in two places.
 
 ### Dashboard
 
-To reskin link:https://github.com/eclipse-che/che-dashboard[Che Dashboard], see link:https://github.com/redhat-developer/devspaces-images/tree/devspaces-3-rhel-8/devspaces-dashboard/README.adoc[dashboard].
+To reskin link:https://github.com/eclipse-che/che-dashboard[Che Dashboard], see link:https://github.com/redhat-developer/devspaces-images/tree/devspaces-3-rhel-9/devspaces-dashboard/README.adoc[dashboard].
 
 ### Microsoft Visual Studio Code - Open Source IDE
 
-To reskin link:https://github.com/che-incubator/che-code/[che-code], which is built from link:https://github.com/microsoft/vscode[Microsoft Visual Studio Code - Open Source IDE], see https://github.com/redhat-developer/devspaces-images/tree/devspaces-3-rhel-8/devspaces-code/branding[devspaces-images/devspaces-code/branding].
+To reskin link:https://github.com/che-incubator/che-code/[che-code], which is built from link:https://github.com/microsoft/vscode[Microsoft Visual Studio Code - Open Source IDE], see https://github.com/redhat-developer/devspaces-images/tree/devspaces-3-rhel-9/devspaces-code/branding[devspaces-images/devspaces-code/branding].
 
diff --git a/product/buildAllInBrewCopyToQuay.sh b/product/buildAllInBrewCopyToQuay.sh
index 4b1e4c933e..beaf863118 100755
--- a/product/buildAllInBrewCopyToQuay.sh
+++ b/product/buildAllInBrewCopyToQuay.sh
@@ -12,10 +12,10 @@
 # where to find redhat-developer/devspaces/${DWNSTM_BRANCH}/product/getLatestImageTags.sh
 DS_VERSION="3.y"
 DWNSTM_BRANCH="$(git rev-parse --abbrev-ref HEAD 2>/dev/null || true)"
-if [[ $DWNSTM_BRANCH != "devspaces-3."*"-rhel-8" ]]; then
-  DWNSTM_BRANCH="devspaces-3-rhel-8"
+if [[ $DWNSTM_BRANCH != "devspaces-3."*"-rhel-9" ]]; then
+  DWNSTM_BRANCH="devspaces-3-rhel-9"
 else 
-  DS_VERSION=${DWNSTM_BRANCH/devspaces-/}; DS_VERSION=${DS_VERSION/-rhel-8/}
+  DS_VERSION=${DWNSTM_BRANCH/devspaces-/}; DS_VERSION=${DS_VERSION/-rhel-9/}
 fi
 
 SCRIPT=$(readlink -f "$0"); SCRIPTPATH=$(dirname "$SCRIPT")
@@ -32,7 +32,7 @@ Example: $0 -t ${DS_VERSION} --sources /path/to/pkgs.devel/projects/
 }
 
 latestNext="--latest"
-if [[ ${DWNSTM_BRANCH} == "devspaces-3-rhel-8" ]]; then latestNext="--next"; fi
+if [[ ${DWNSTM_BRANCH} == "devspaces-3-rhel-9" ]]; then latestNext="--next"; fi
 
 PHASES="1 2"
 while [[ "$#" -gt 0 ]]; do
diff --git a/product/buildInBrewCopyToQuay.sh b/product/buildInBrewCopyToQuay.sh
index fede9df2c1..809d8ca4a0 100755
--- a/product/buildInBrewCopyToQuay.sh
+++ b/product/buildInBrewCopyToQuay.sh
@@ -12,10 +12,10 @@
 # where to find redhat-developer/devspaces/${DWNSTM_BRANCH}/product/getLatestImageTags.sh
 DS_VERSION="3.y"
 DWNSTM_BRANCH="$(git rev-parse --abbrev-ref HEAD 2>/dev/null || true)"
-if [[ $DWNSTM_BRANCH != "devspaces-3."*"-rhel-8" ]]; then
-  DWNSTM_BRANCH="devspaces-3-rhel-8"
+if [[ $DWNSTM_BRANCH != "devspaces-3."*"-rhel-9" ]]; then
+  DWNSTM_BRANCH="devspaces-3-rhel-9"
 else 
-  DS_VERSION=${DWNSTM_BRANCH/devspaces-/}; DS_VERSION=${DS_VERSION/-rhel-8/}
+  DS_VERSION=${DWNSTM_BRANCH/devspaces-/}; DS_VERSION=${DS_VERSION/-rhel-9/}
 fi
 BUILD_DIR=$(pwd)
 SCRIPT=$(readlink -f "$0"); SCRIPTPATH=$(dirname "$SCRIPT")
@@ -37,7 +37,7 @@ Options:
 }
 
 latestNext="latest"
-if [[ ${DWNSTM_BRANCH} == "devspaces-3-rhel-8" ]]; then latestNext="next"; fi
+if [[ ${DWNSTM_BRANCH} == "devspaces-3-rhel-9" ]]; then latestNext="next"; fi
 
 pullAssets=0
 while [[ "$#" -gt 0 ]]; do
diff --git a/product/bumpDockerfileVersions.sh b/product/bumpDockerfileVersions.sh
index ce8465fff1..27520e650f 100755
--- a/product/bumpDockerfileVersions.sh
+++ b/product/bumpDockerfileVersions.sh
@@ -5,7 +5,7 @@
 usage() {
     echo "
 Usage: $0 -b SOURCE_BRANCH -v CSV_VERSION
-Example: $0 -b devspaces-3-rhel-8 -v 3.yy
+Example: $0 -b devspaces-3-rhel-9 -v 3.yy
 "
     exit
 }
diff --git a/product/checkImagesInCSV.sh b/product/checkImagesInCSV.sh
index 0174a5a8b7..795e450fdc 100755
--- a/product/checkImagesInCSV.sh
+++ b/product/checkImagesInCSV.sh
@@ -31,7 +31,7 @@ if [[ -f dependencies/job-config.json ]]; then
 	jcjson=dependencies/job-config.json
 else
 	jcjson=/tmp/job-config.json
-	curl -sSLo $jcjson https://raw.githubusercontent.com/redhat-developer/devspaces/devspaces-3-rhel-8/dependencies/job-config.json
+	curl -sSLo $jcjson https://raw.githubusercontent.com/redhat-developer/devspaces/devspaces-3-rhel-9/dependencies/job-config.json
 fi
 PROD_VER=$(jq -r '.Version' $jcjson)
 # cleanup /tmp files
@@ -61,7 +61,7 @@ To compare latest image in Quay to latest CSV in bundle in latest IIB:
   TAG=$PROD_VER; \\
   IMG=devspaces/dashboard-rhel8; \\
   IMG=devspaces/pluginregistry-rhel8; \\
-  img_quay=\$(${SCRIPTPATH}/getLatestImageTags.sh -b devspaces-\${TAG}-rhel-8 --quay --tag \"\${TAG}-\" -c \${IMG}); echo \$img_quay; \\
+  img_quay=\$(${SCRIPTPATH}/getLatestImageTags.sh -b devspaces-\${TAG}-rhel-9 --quay --tag \"\${TAG}-\" -c \${IMG}); echo \$img_quay; \\
   img_iib=\$(${SCRIPTPATH}/checkImagesInCSV.sh --ds -t \${TAG} -o 4.12 -y -qq -i \${IMG}); echo \$img_iib; \\
   if [[ \$img_quay != \$img_iib ]]; then \\
     ${SCRIPTPATH}/checkImagesInCSV.sh --ds -t \${TAG} -o 4.12 -y -i \${IMG}; \\
@@ -117,7 +117,7 @@ for imageAndTag in $IMAGES; do
     # echo "Found containerTag = ${containerTag}"
 
     if [[ ! -x ${SCRIPTPATH}/containerExtract.sh ]]; then
-        curl -sSLO https://raw.githubusercontent.com/redhat-developer/devspaces/devspaces-3-rhel-8/product/containerExtract.sh
+        curl -sSLO https://raw.githubusercontent.com/redhat-developer/devspaces/devspaces-3-rhel-9/product/containerExtract.sh
         chmod +x containerExtract.sh
     fi
     rm -fr /tmp/${SOURCE_CONTAINER//\//-}-${containerTag}-*/
diff --git a/product/collectBuildInfo.sh b/product/collectBuildInfo.sh
index 3e551bc3a9..57d54d6231 100755
--- a/product/collectBuildInfo.sh
+++ b/product/collectBuildInfo.sh
@@ -33,7 +33,7 @@ Options:
   -h, --help       Show this help
 
 Example - collect metadata for the current builds in 
-https://github.com/redhat-developer/devspaces/blob/devspaces-3-rhel-8/dependencies/LATEST_IMAGES_COMMITS:
+https://github.com/redhat-developer/devspaces/blob/devspaces-3-rhel-9/dependencies/LATEST_IMAGES_COMMITS:
 
     for d in \$(cat /path/to/LATEST_IMAGES_COMMITS | grep Build | sed -r -e "s@.+buildID=@@"); do \\
       $0 -b \$d --append -f /tmp/collectBuildInfo.yml --csv /tmp/collectBuildInfo.csv ; \\
diff --git a/product/copyIIBsToQuay.sh b/product/copyIIBsToQuay.sh
index 7d39843c78..e74bbd404a 100755
--- a/product/copyIIBsToQuay.sh
+++ b/product/copyIIBsToQuay.sh
@@ -31,7 +31,7 @@ Options:
   -p, --push                 : Push IIB(s) to quay registry; default is to show commands but not copy anything
   --force                    : If target image exists, will re-filter and re-push it; otherwise skip to avoid updating image timestamps
   -t PROD_VER                : If x.y version/tag not set, will compute from dependencies/job-config.json file
-  -b MIDSTM_BRANCH           : If not set or run from a git repo will default to devspaces-3-rhel-8
+  -b MIDSTM_BRANCH           : If not set or run from a git repo will default to devspaces-3-rhel-9
   -o 'OCP_VER1 OCP_VER2 ...' : Space-separated list of OCP version(s) (e.g. 'v4.13 v4.12') to query and publish; defaults to job-config.json values
   -e, --extra-tags           : Extra tags to create, such as 3.5.0.RC-02-21-v4.13-x86_64
   -v                         : Verbose output: include additional information
@@ -42,11 +42,11 @@ Options:
 setDefaults () {
     #Moving everything into setDefaults so MIDSTM_BRANCH can be passed in as an argument and the script doesn't need to be run in release branches to promote release builds
     if [[ -z ${MIDSTM_BRANCH} ]]; then
-        MIDSTM_BRANCH=$(git rev-parse --abbrev-ref HEAD 2>/dev/null || echo "devspaces-3-rhel-8")
-        if [[ ${MIDSTM_BRANCH} != "devspaces-"*"-rhel-"* ]]; then MIDSTM_BRANCH="devspaces-3-rhel-8"; fi
+        MIDSTM_BRANCH=$(git rev-parse --abbrev-ref HEAD 2>/dev/null || echo "devspaces-3-rhel-9")
+        if [[ ${MIDSTM_BRANCH} != "devspaces-"*"-rhel-"* ]]; then MIDSTM_BRANCH="devspaces-3-rhel-9"; fi
     fi
 
-    if [[ "${MIDSTM_BRANCH}" =  "devspaces-3-rhel-8" ]]; then
+    if [[ "${MIDSTM_BRANCH}" =  "devspaces-3-rhel-9" ]]; then
         if [[ -f dependencies/job-config.json ]]; then
             jobconfigjson=dependencies/job-config.json
         elif [[ -f ${SCRIPT_DIR}/../dependencies/job-config.json ]]; then
@@ -54,7 +54,7 @@ setDefaults () {
         fi
     else
         pushd /tmp >/dev/null || exit
-        curl -sSLO https://raw.githubusercontent.com/redhat-developer/devspaces/devspaces-3-rhel-8/dependencies/job-config.json
+        curl -sSLO https://raw.githubusercontent.com/redhat-developer/devspaces/devspaces-3-rhel-9/dependencies/job-config.json
         jobconfigjson=/tmp/job-config.json
         popd >/dev/null || exit 
     fi
diff --git a/product/copyVSIXToStage.sh b/product/copyVSIXToStage.sh
index 8a25232e5d..34ac71d840 100755
--- a/product/copyVSIXToStage.sh
+++ b/product/copyVSIXToStage.sh
@@ -18,7 +18,7 @@ DS_VERSION=""
 
 usage ()
 {
-    echo "Usage: $0 -b devspaces-3.y-rhel-8 -v 3.y [-w WORKSPACE_DIR]
+    echo "Usage: $0 -b devspaces-3.y-rhel-9 -v 3.y [-w WORKSPACE_DIR]
 "
     exit
 }
diff --git a/product/getCommitSHAForTag.sh b/product/getCommitSHAForTag.sh
index ac27705ba2..689b389346 100755
--- a/product/getCommitSHAForTag.sh
+++ b/product/getCommitSHAForTag.sh
@@ -15,7 +15,7 @@
 if [[ ! -x /usr/bin/brew ]]; then 
 	echo "Brew is required. Please install brewkoji rpm from one of these repos:";
 	echo " * https://download.devel.redhat.com/rel-eng/RCMTOOLS/latest-RCMTOOLS-2-F-27/compose/Everything/x86_64/os/"
-	echo " * https://download.devel.redhat.com/rel-eng/RCMTOOLS/latest-RCMTOOLS-2-RHEL-8/compose/BaseOS/\$basearch/os/"
+	echo " * https://download.devel.redhat.com/rel-eng/RCMTOOLS/latest-RCMTOOLS-2-rhel-9/compose/BaseOS/\$basearch/os/"
 fi
 
 usage () {
@@ -31,12 +31,12 @@ if [[ $# -lt 1 ]]; then usage; fi
 
 # JOB_BRANCH=3.y
 # # could this be computed from $(git rev-parse --abbrev-ref HEAD) ?
-# DWNSTM_BRANCH="devspaces-${JOB_BRANCH}-rhel-8"
+# DWNSTM_BRANCH="devspaces-${JOB_BRANCH}-rhel-9"
 NUMTAGS=1 # by default show only the latest tag for each container; or show n latest ones
 CONTAINERS=""
 while [[ "$#" -gt 0 ]]; do
   case $1 in
-    '-j') JOB_BRANCH="$2"; DWNSTM_BRANCH="devspaces-${JOB_BRANCH}-rhel-8"; shift 2;; 
+    '-j') JOB_BRANCH="$2"; DWNSTM_BRANCH="devspaces-${JOB_BRANCH}-rhel-9"; shift 2;; 
     '-b') DWNSTM_BRANCH="$2"; shift 2;; 
     '--tag') BASETAG="$2"; shift 2;;
     '--candidatetag') candidateTag="$2"; shift 2;;
@@ -56,7 +56,7 @@ fi
 if [[ -z ${candidateTag} ]] && [[ ${DWNSTM_BRANCH} ]]; then
 	candidateTag="${DWNSTM_BRANCH}-container-candidate"
 elif [[ -z ${candidateTag} ]] && [[ ${BASETAG} ]]; then
-	candidateTag="devspaces-${BASETAG}-rhel-8-container-candidate"
+	candidateTag="devspaces-${BASETAG}-rhel-9-container-candidate"
 else
 	# instead of passing in a value, we'll compute it below from the specified image
 	true
@@ -72,7 +72,7 @@ for d in $CONTAINERS; do
 	TAG=${dd##*:}; # echo $TAG
 	if [[ ! $candidateTag ]]; then
 		# compute BASETAG and use that for candidateTag below, but we're using 
-		candidateTagUsed="devspaces-${TAG%%-*}-rhel-8-container-candidate"
+		candidateTagUsed="devspaces-${TAG%%-*}-rhel-9-container-candidate"
 	else
 		candidateTagUsed="${candidateTag}"
 	fi
diff --git a/product/getLatestImageTags.sh b/product/getLatestImageTags.sh
index 657c2640a9..a8e1e6a8d9 100755
--- a/product/getLatestImageTags.sh
+++ b/product/getLatestImageTags.sh
@@ -27,7 +27,7 @@ getVersion() {
 		jcjson=dependencies/job-config.json
 	else
 		jcjson=/tmp/job-config.json
-		curl -sSLo $jcjson https://raw.githubusercontent.com/redhat-developer/devspaces/devspaces-3-rhel-8/dependencies/job-config.json
+		curl -sSLo $jcjson https://raw.githubusercontent.com/redhat-developer/devspaces/devspaces-3-rhel-9/dependencies/job-config.json
 	fi
 	VERSION=$(jq -r '.Version' $jcjson)
 }
@@ -36,15 +36,15 @@ getVersion
 
 getDsVersion ()
 {
-	if [[ $DWNSTM_BRANCH != "devspaces-3."*"-rhel-8" ]] && [[ $DWNSTM_BRANCH != "devspaces-3-rhel-8" ]]; then
+	if [[ $DWNSTM_BRANCH != "devspaces-3."*"-rhel-9" ]] && [[ $DWNSTM_BRANCH != "devspaces-3-rhel-9" ]]; then
 		if [[ ${VERSION} != "" ]]; then
-			DWNSTM_BRANCH="devspaces-${VERSION}-rhel-8"
+			DWNSTM_BRANCH="devspaces-${VERSION}-rhel-9"
 		else 
-			DWNSTM_BRANCH="devspaces-3-rhel-8"
+			DWNSTM_BRANCH="devspaces-3-rhel-9"
 			VERSION="3.x"
 		fi
 	else
-		DS_VERSION=${DWNSTM_BRANCH/devspaces-/}; DS_VERSION=${DS_VERSION/-rhel-8/}
+		DS_VERSION=${DWNSTM_BRANCH/devspaces-/}; DS_VERSION=${DS_VERSION/-rhel-9/}
 		if [[ $DS_VERSION == 2 ]] || [[ $DS_VERSION == 3 ]]; then # invalid version
 			if [[ ${VERSION} ]]; then # use version from VERSION file
 				DS_VERSION=${VERSION}
@@ -106,7 +106,7 @@ PUSHTOQUAY=0 # utility method to pull then push to quay
 PUSHTOQUAYTAGS="" # utility method to pull then push to quay (extra tags to push)
 PUSHTOQUAYFORCE=0 # normally, don't repush a tag if it's already in the registry (to avoid re-timestamping it and updating tag history)
 SORTED=0 # if 0, use the order of containers in the DS*_CONTAINERS_* strings above; if 1, sort alphabetically
-latestNext="latest"; if [[ $DS_VERSION == "3.y" ]] || [[ $DWNSTM_BRANCH == "devspaces-3-rhel-8" ]]; then latestNext="next  "; fi
+latestNext="latest"; if [[ $DS_VERSION == "3.y" ]] || [[ $DWNSTM_BRANCH == "devspaces-3-rhel-9" ]]; then latestNext="next  "; fi
 
 # cleanup /tmp files
 cleanup_temp () {
@@ -159,7 +159,7 @@ REGISTRY="https://registry.redhat.io" # or https://brew-pulp-docker01.web.prod.e
 CONTAINERS=""
 while [[ "$#" -gt 0 ]]; do
   case $1 in
-    '-j') DS_VERSION="$2"; DWNSTM_BRANCH="devspaces-${DS_VERSION}-rhel-8"; shift 1;;
+    '-j') DS_VERSION="$2"; DWNSTM_BRANCH="devspaces-${DS_VERSION}-rhel-9"; shift 1;;
     '-b') DWNSTM_BRANCH="$2"; shift 1;; 
     '-c') CONTAINERS="${CONTAINERS} $2"; shift 1;;
     '-x') EXCLUDES="$2"; shift 1;;
@@ -181,7 +181,7 @@ while [[ "$#" -gt 0 ]]; do
 	'--latestNext') latestNext="$2"; shift 1;;
 	# since we have no next or latest tags for IIB images, append an OCP version and arch and filter for those by default
 	'-o')
-		if [[ $DWNSTM_BRANCH != "devspaces-3-rhel-8" ]] || [[ $DS_VERSION != "3.y" ]]; then 
+		if [[ $DWNSTM_BRANCH != "devspaces-3-rhel-9" ]] || [[ $DS_VERSION != "3.y" ]]; then 
 			latestNext="latest-$2-$(uname -m)"
 		else
 			latestNext="next-$2-$(uname -m)"
@@ -285,7 +285,7 @@ if [[ ${SHOWNVR} -eq 1 ]]; then
 	if [[ ! -x /usr/bin/brew ]]; then 
 		echo "Brew is required. Please install brewkoji rpm from one of these repos:";
 		echo " * https://download.devel.redhat.com/rel-eng/RCMTOOLS/latest-RCMTOOLS-2-F-27/compose/Everything/x86_64/os/"
-		echo " * https://download.devel.redhat.com/rel-eng/RCMTOOLS/latest-RCMTOOLS-2-RHEL-8/compose/BaseOS/\$basearch/os/"
+		echo " * https://download.devel.redhat.com/rel-eng/RCMTOOLS/latest-RCMTOOLS-2-rhel-9/compose/BaseOS/\$basearch/os/"
 		exit 1
 	fi
 
@@ -320,8 +320,8 @@ if [[ ${SHOWNVR} -eq 1 ]]; then
 			echo $result
 			(( n = n + 1 ))
 			if [[ $ERRATA_NUM ]]; then
-				prodver="RHOSDS-3-RHEL-8"
-				if [[ $DS_VERSION == "2"* ]]; then prodver="CRW-2.0-RHEL-8"; fi
+				prodver="RHOSDS-3-rhel-9"
+				if [[ $DS_VERSION == "2"* ]]; then prodver="CRW-2.0-rhel-9"; fi
 				# see API info in https://github.com/red-hat-storage/errata-tool/tree/master/errata_tool
 				cat <<EOT >> /tmp/errata-container-update-$result
 from errata_tool import Erratum
diff --git a/product/getRelatedImages.sh b/product/getRelatedImages.sh
index ccd990d010..d5ca2433f1 100755
--- a/product/getRelatedImages.sh
+++ b/product/getRelatedImages.sh
@@ -42,7 +42,7 @@ if [[ ! $VERSION ]] || [[ ! $DWO_VERSION ]]; then usage; exit 1; fi
 
 TMPDIR=`mktemp -d`; cd $TMPDIR
 if [[ ! -f /tmp/containerExtract.sh ]]; then
-    curl -sSLO https://raw.githubusercontent.com/redhat-developer/devspaces/devspaces-3-rhel-8/product/containerExtract.sh
+    curl -sSLO https://raw.githubusercontent.com/redhat-developer/devspaces/devspaces-3-rhel-9/product/containerExtract.sh
 else
     cp /tmp/containerExtract.sh $TMPDIR/
 fi
diff --git a/product/getTagForImage.sh b/product/getTagForImage.sh
index 3f2c3a2ee4..9a42dfb5fa 100755
--- a/product/getTagForImage.sh
+++ b/product/getTagForImage.sh
@@ -31,7 +31,7 @@ for d in $images; do
     c="";
     c="${d%:*}" # trim off the tag
     c="${c##*/}" # trim repo and org
-    c="${c##*devspaces-3-rhel8-}" # trim devspaces-3-rhel-8 prefix
+    c="${c##*devspaces-3-rhel8-}" # trim devspaces-3-rhel-9 prefix
     c="${c/-rhel8/}"  # trim container midfix
     c="${c##*devspaces-}"  # trim container prefix
     c="${c%%-container-*}"  # trim container suffix
diff --git a/product/ghira/ghira b/product/ghira/ghira
index f5f9968bea..7e6fee27b5 100755
--- a/product/ghira/ghira
+++ b/product/ghira/ghira
@@ -129,7 +129,7 @@ class IssueToJIRA:
     return ret
   
   def _map_fixVersions(data):
-    url = 'https://raw.githubusercontent.com/redhat-developer/devspaces/devspaces-3-rhel-8/dependencies/job-config.json'
+    url = 'https://raw.githubusercontent.com/redhat-developer/devspaces/devspaces-3-rhel-9/dependencies/job-config.json'
     resp = requests.get(url)
     if resp.status_code != 200:
       logging.error("Unable to fetch fix version mapping from " + str(url))
@@ -389,7 +389,7 @@ for i in pending_issues:
       continue
     # if we want to send emails for N&N issues that cannot be synced because they're too old - not found in job-config.json mapping - enable this block
     # else:
-    #   # if can't resolve old milestone in https://github.com/redhat-developer/devspaces/blob/devspaces-3-rhel-8/dependencies/job-config.json, it's too old to process as N&N 
+    #   # if can't resolve old milestone in https://github.com/redhat-developer/devspaces/blob/devspaces-3-rhel-9/dependencies/job-config.json, it's too old to process as N&N 
     #   logging.warning("Skip https://github.com/" + GITHUB_ORG + "/" + GITHUB_REPO + "/issues/%s -- Milestone (%s) is not found in job-config.json (too old?)" % (gh_issue_id, milestone))
     #   for l in i["labels"]:
     #     msg_to = get_area_lead_email(l["name"])
diff --git a/product/installDevSpacesFromLatestIIB.sh b/product/installDevSpacesFromLatestIIB.sh
index ffaf351ee2..70471a7e73 100755
--- a/product/installDevSpacesFromLatestIIB.sh
+++ b/product/installDevSpacesFromLatestIIB.sh
@@ -105,9 +105,9 @@ Options:
 
   --quay, --fast      : Install from quay.io/devspaces/iib:<DS_VERSION>-v4.yy-<OS_ARCH> (detected OCP version + arch) from fast channel
                       : Resolve images from quay.io using ImageContentSourcePolicy
-  --latest            : Install from quay.io/devspaces/iib:latest-v4.yy-<OS_ARCH>, from fast channel, built from stable devspaces-3.y-rhel-8 branch
+  --latest            : Install from quay.io/devspaces/iib:latest-v4.yy-<OS_ARCH>, from fast channel, built from stable devspaces-3.y-rhel-9 branch
                       : Resolve images from quay.io using ImageContentSourcePolicy
-  --next              : Install from quay.io/devspaces/iib:next-v4.yy-<OS_ARCH>, from fast channel, built from CI devspaces-3-rhel-8 branch
+  --next              : Install from quay.io/devspaces/iib:next-v4.yy-<OS_ARCH>, from fast channel, built from CI devspaces-3-rhel-9 branch
                       : Resolve images from quay.io using ImageContentSourcePolicy
                       : If --next, --disable-default-sources is implied so that we ONLY install DWO from quay, not RH Ecosystem Catalog
 
diff --git a/product/rhpkg-container-build.sh b/product/rhpkg-container-build.sh
index 2bcc254bd2..627fee801a 100755
--- a/product/rhpkg-container-build.sh
+++ b/product/rhpkg-container-build.sh
@@ -55,9 +55,9 @@ if [[ ${doRhpkgContainerBuild} -eq 1 ]]; then
       # and no longer need a get-sources.sh script to run rhpkg
       if [[ $SCRATCH_FLAGS ]]; then
         if [[ $JOB_BRANCH == "3.x" ]] || [[ $JOB_BRANCH == "" ]]; then 
-          TARGET_FLAGS="--target devspaces-3-rhel-8-containers-candidate"
+          TARGET_FLAGS="--target devspaces-3-rhel-9-containers-candidate"
         else
-          TARGET_FLAGS="--target devspaces-${JOB_BRANCH}-rhel-8-containers-candidate"
+          TARGET_FLAGS="--target devspaces-${JOB_BRANCH}-rhel-9-containers-candidate"
         fi
       fi
       # invoke a non-cachito-friendly build with a special get-sources.sh
@@ -67,7 +67,7 @@ if [[ ${doRhpkgContainerBuild} -eq 1 ]]; then
       # invoke brew container-build
       # REQUIRE: brewkoji koji-containerbuild
       gitbranch="$(git rev-parse --abbrev-ref HEAD)"
-      if [[ $SCRATCH_FLAGS == "--scratch" ]]; then gitbranch="devspaces-3-rhel-8"; fi
+      if [[ $SCRATCH_FLAGS == "--scratch" ]]; then gitbranch="devspaces-3-rhel-9"; fi
       target=${gitbranch}-containers-candidate
       repo="$(git remote -v | grep origin | head -1 | sed -r -e "s#.+/containers/(.+) \(fetch.+#\1#")"
       sha="$(git rev-parse HEAD)"
@@ -185,7 +185,7 @@ TASK_ID="${TASK_URL##*=}"
 BUILD_DESC=$(echo $REPO_PATH | sed -r \
     -e 's#registry-proxy.engineering.redhat.com/rh-osbs/devspaces-#quay.io/devspaces/#g' \
     -e 's#(quay.io/devspaces/.+-rhel8:[0-9.-]+) *#<a href="https://\1">\1</a> #g' \
-    -e 's#(quay.io/devspaces)/(operator|operator-bundle):([0-9.-]+) *#<a href="https://\1/devspaces-3-rhel-8-\2:\3">\1/devspaces-3-rhel-8-\2:\3</a> #g'
+    -e 's#(quay.io/devspaces)/(operator|operator-bundle):([0-9.-]+) *#<a href="https://\1/devspaces-3-rhel-9-\2:\3">\1/devspaces-3-rhel-9-\2:\3</a> #g'
 )
 BUILD_RESULT="SUCCESS"
 if [[ ${BUILD_DESC} == *"UNKNOWN"* ]]; then BUILD_RESULT="UNSTABLE"; fi
diff --git a/product/tagRelease.sh b/product/tagRelease.sh
index ecba85bee7..6184aa031f 100755
--- a/product/tagRelease.sh
+++ b/product/tagRelease.sh
@@ -15,8 +15,8 @@ SCRIPT=$(readlink -f "$0"); SCRIPTPATH=$(dirname "$SCRIPT")
 # defaults
 # try to compute branches from currently checked out branch; else fall back to hard coded value
 TARGET_BRANCH="$(git rev-parse --abbrev-ref HEAD 2>/dev/null || true)"
-if [[ $TARGET_BRANCH != "devspaces-3."*"-rhel-8" ]]; then
-	TARGET_BRANCH="devspaces-3-rhel-8"
+if [[ $TARGET_BRANCH != "devspaces-3."*"-rhel-9" ]]; then
+	TARGET_BRANCH="devspaces-3-rhel-9"
 fi
 pkgs_devel_branch=${TARGET_BRANCH}
 
@@ -38,7 +38,7 @@ Example:
 To create or update existing branches and update related PNC build-configs:
   $0 -t DS_VERSION --branchfrom SOURCE_GH_BRANCH -gh TARGET_GH_BRANCH -ghtoken GITHUB_TOKEN
 Example: 
-  $0 -t DS_VERSION --branchfrom devspaces-3-rhel-8 -gh ${TARGET_BRANCH} -ghtoken \$GITHUB_TOKEN
+  $0 -t DS_VERSION --branchfrom devspaces-3-rhel-9 -gh ${TARGET_BRANCH} -ghtoken \$GITHUB_TOKEN
 "
 	exit 1
 fi
@@ -121,7 +121,7 @@ updateSampleDevfileReferences () {
 	if [[ $DS_VERSION ]]; then
 		DS_TAG="$DS_VERSION"
 	else
-		DS_TAG="${TARGET_BRANCH//-rhel-8}"; DS_TAG="${DS_TAG//devspaces-}"
+		DS_TAG="${TARGET_BRANCH//-rhel-9}"; DS_TAG="${DS_TAG//devspaces-}"
 	fi
 	# echo "[DEBUG] update $devfile with DS_TAG = $DS_TAG"
 	sed -r -i $devfile \
diff --git a/product/updateBaseImages.sh b/product/updateBaseImages.sh
index 7b40652ae8..255c020300 100755
--- a/product/updateBaseImages.sh
+++ b/product/updateBaseImages.sh
@@ -36,10 +36,10 @@ WORKDIR=$(pwd)
 # try to compute branches from currently checked out branch; else fall back to hard coded value
 # where to find redhat-developer/devspaces/${SCRIPTS_BRANCH}/product/getLatestImageTags.sh
 SCRIPTS_BRANCH="$(git rev-parse --abbrev-ref HEAD 2>/dev/null || true)"
-if [[ $SCRIPTS_BRANCH != "devspaces-3."*"-rhel-8" ]]; then
-	SCRIPTS_BRANCH="devspaces-3-rhel-8"
+if [[ $SCRIPTS_BRANCH != "devspaces-3."*"-rhel-9" ]]; then
+	SCRIPTS_BRANCH="devspaces-3-rhel-9"
 fi
-# where to find source branch to update, devspaces-3.y-rhel-8, 7.yy.x, etc.
+# where to find source branch to update, devspaces-3.y-rhel-9, 7.yy.x, etc.
 SOURCES_BRANCH=${SCRIPTS_BRANCH}
 
 DOCKERFILE="Dockerfile"
@@ -76,7 +76,7 @@ $0 -b 7.yy.x -w \$(pwd) -f \*ockerfile -maxdepth 5 -o
 "
 	echo "Options: 
 	--sources-branch, -b  set sources branch (project to update), eg., 7.yy.x
-	--scripts-branch, -sb set scripts branch (project with helper scripts), eg., devspaces-3.y-rhel-8
+	--scripts-branch, -sb set scripts branch (project with helper scripts), eg., devspaces-3.y-rhel-9
 	--no-commit, -n	do not commit to BRANCH
 	--no-push, -p	do not push to BRANCH
 	--tag			regex match to restrict results, eg., '1\.13|8\.[0-9]-' to find golang 1.13 (not 1.14) and any ubi 8-x- tag
@@ -203,7 +203,7 @@ for d in $(find "${WORKDIR}/" -maxdepth "${MAXDEPTH}" -name "${DOCKERFILE}" | so
 		# pull latest commits
 		if [[ -d ${d%%/${DOCKERFILE}} ]]; then pushd "${d%%/${DOCKERFILE}}" >/dev/null; pushedIn=1; fi
 		if [[ "${d%/${DOCKERFILE}}" == *"-rhel8" ]]; then
-			BRANCHUSED=${SOURCES_BRANCH/rhel-7/rhel-8}
+			BRANCHUSED=${SOURCES_BRANCH/rhel-7/rhel-8/rhel-9}
 		else
 			BRANCHUSED=${SOURCES_BRANCH}
 		fi
diff --git a/product/updateContainerYamlSHAs.sh b/product/updateContainerYamlSHAs.sh
index 4086bfb42e..05b533ded5 100755
--- a/product/updateContainerYamlSHAs.sh
+++ b/product/updateContainerYamlSHAs.sh
@@ -16,7 +16,7 @@
 #     repo: https://github.com/golang/tools
 #     ref: fd02dfae644ce04dfd4bb3828cf576b9d8717f79
 # Must hardcoded a value in job-config.json, mapping to the .remote_source's .name in container.yaml (eg., gopls)
-# ==> https://github.com/redhat-developer/devspaces/blob/devspaces-3-rhel-8/dependencies/job-config.json#L553 (look for gopls)
+# ==> https://github.com/redhat-developer/devspaces/blob/devspaces-3-rhel-9/dependencies/job-config.json#L553 (look for gopls)
 
 set -e
 
@@ -32,7 +32,7 @@ Options:
 
 Example:
 
-  $0 -b devspaces-3-rhel-8 /tmp/container.yaml
+  $0 -b devspaces-3-rhel-9 /tmp/container.yaml
 "
 }
 
@@ -46,7 +46,7 @@ done
 
 if [[ ! $MIDSTM_BRANCH ]] || [[ ! $yamls ]]; then usage; exit 1; fi
 
-if [[ $MIDSTM_BRANCH == "devspaces-3-rhel-8" ]]; then
+if [[ $MIDSTM_BRANCH == "devspaces-3-rhel-9" ]]; then
   JOB_BRANCH=3.x
 else 
   JOB_BRANCH=${MIDSTM_BRANCH%-rhel-*};JOB_BRANCH=${JOB_BRANCH#devspaces-}
@@ -66,7 +66,7 @@ for yaml in $yamls; do
           name=$(cat ${yaml} | yq -r '.remote_sources[]|select(.remote_source.repo=="'$repo'")' | yq -r ".name")
 
           JCJ=/tmp/job-config.json
-          curl -sSLo ${JCJ} https://raw.githubusercontent.com/redhat-developer/devspaces/devspaces-3-rhel-8/dependencies/job-config.json
+          curl -sSLo ${JCJ} https://raw.githubusercontent.com/redhat-developer/devspaces/devspaces-3-rhel-9/dependencies/job-config.json
           # check if there's an entry (both a key and a version) for this remote source in JCJ
           branchOrTag="$(jq -r --arg name "$name" --arg ver "$JOB_BRANCH" '.Other[$name][$ver]' $JCJ)"
 
diff --git a/product/updateGeneratedOperatorMetadata.sh b/product/updateGeneratedOperatorMetadata.sh
index bc28b28342..604bbeae02 100755
--- a/product/updateGeneratedOperatorMetadata.sh
+++ b/product/updateGeneratedOperatorMetadata.sh
@@ -14,7 +14,7 @@
 usage () 
 {
     echo "Usage: $0 -b [midstream branch] -t [quay tag] -s [sources to update]"
-    echo "Example: $0 -b devspaces-3.y-rhel-8 -t 3.y -s /path/to/github/redhat-developer/devspaces-images/"
+    echo "Example: $0 -b devspaces-3.y-rhel-9 -t 3.y -s /path/to/github/redhat-developer/devspaces-images/"
 	echo ""
     exit
 }
diff --git a/product/updatePNCBuildConfigs.sh b/product/updatePNCBuildConfigs.sh
index af8256e2a2..fabf6f4d26 100755
--- a/product/updatePNCBuildConfigs.sh
+++ b/product/updatePNCBuildConfigs.sh
@@ -56,7 +56,7 @@ configureProductVersion() {
 
 configureLatestBuildConfig() {
   local product_version="$1"
-  curl -sSLo /tmp/job-config.json https://raw.githubusercontent.com/redhat-developer/devspaces/devspaces-3-rhel-8/dependencies/job-config.json
+  curl -sSLo /tmp/job-config.json https://raw.githubusercontent.com/redhat-developer/devspaces/devspaces-3-rhel-9/dependencies/job-config.json
   build_config_id=$(pnc build-config list --query "project.name==$project_name;productVersion.version==$product_version;name!=devspaces-server-build-main" | yq -r '.[].id')
   if [[ $build_config_id ]]; then
     echo "[INFO] detected existing PNC build-config for $product_version: https://orch.psi.redhat.com/pnc-web/#/projects/${project_id}/build-configs/${build_config_id}"
diff --git a/product/updateVersionAndRegistryTags.sh b/product/updateVersionAndRegistryTags.sh
index 008eae33c7..c801e1b8a7 100755
--- a/product/updateVersionAndRegistryTags.sh
+++ b/product/updateVersionAndRegistryTags.sh
@@ -25,7 +25,7 @@ COPYRIGHT="#
 #    Red Hat, Inc. - initial API and implementation
 "
 doupdateversion=1 #by default update the VERSION files
-BRANCH="devspaces-3-rhel-8"
+BRANCH="devspaces-3-rhel-9"
 PR_BRANCH="pr-update-version-and-registry-tags-$(date +%s)"
 OPENBROWSERFLAG="" # if a PR is generated, open it in a browser
 docommit=1 # by default DO commit the change
@@ -105,7 +105,7 @@ computeLatestCSV() {
   # extract the CSV version from the container as with CVE respins, the CSV version != the nominal container tag or JIRA version 2.13.1
   #if [[ ! -x ${SCRIPTPATH}/containerExtract.sh ]]; then
   if [[ ! -x ${WORKDIR}/product/containerExtract.sh ]]; then
-      curl -sSLO https://raw.githubusercontent.com/redhat-developer/devspaces/devspaces-3-rhel-8/product/containerExtract.sh
+      curl -sSLO https://raw.githubusercontent.com/redhat-developer/devspaces/devspaces-3-rhel-9/product/containerExtract.sh
       chmod +x containerExtract.sh
   fi
   rm -fr /tmp/${SOURCE_CONTAINER//\//-}-${containerTag}-*/
@@ -122,7 +122,7 @@ computeLatestCSV() {
   # CRW-4324, CRW-4354 DO NOT keep freshmaker suffix for previous CSV versions!!! 
   # Using FM versions WILL break CVP tests when the image doesn't exist for all OCP versions or hasn't been released yet to RHEC (which happens intermittently)
   # We ship using open-ended OCP version range: see com.redhat.openshift.versions 
-  # in https://github.com/redhat-developer/devspaces-images/blob/devspaces-3-rhel-8/devspaces-operator-bundle/Dockerfile#L31)
+  # in https://github.com/redhat-developer/devspaces-images/blob/devspaces-3-rhel-9/devspaces-operator-bundle/Dockerfile#L31)
   # We must assume that the Freshmaker lifecycle will do its own thing with olm.substitutesFor (grafting their fixes onto our single-stream graph) rather than injecting itself into our graph directly and pruning out older releases
   # See also https://issues.redhat.com/browse/CWFHEALTH-2003 https://issues.redhat.com/browse/CLOUDWF-9099 https://issues.redhat.com/browse/CLOUDDST-18632
   echo "Found CSV_VERSION_PREV = ${CSV_VERSION_PREV}"
@@ -234,7 +234,7 @@ updateJobConfig() {
     if [[ $VERBOSE ]]; then echo "[DEBUG] Updating upstream branches."; fi
     replaceField "${JOB_CONFIG}" "(.\"${JOB_KEY}\"[][\"${DEVSPACES_VERSION}\"][\"upstream_branch\"]|select(.[]?|contains(\".x\")))" "[\"7.${CHE_Y}.x\",\"main\"]"
     replaceField "${JOB_CONFIG}" "(.\"${JOB_KEY}\"[][\"${DEVSPACES_VERSION}\"][\"upstream_branch\"]|select(.[]?==\"main\"))" "[\"7.${CHE_Y}.x\",\"main\"]"
-    replaceField "${JOB_CONFIG}" "(.\"${JOB_KEY}\"[][\"${DEVSPACES_VERSION}\"][\"upstream_branch\"]|select(.[]?==\"devspaces-3-rhel-8\"))" "[\"devspaces-${DEVSPACES_VERSION}-rhel-8\",\"devspaces-${DEVSPACES_VERSION}-rhel-8\"]"
+    replaceField "${JOB_CONFIG}" "(.\"${JOB_KEY}\"[][\"${DEVSPACES_VERSION}\"][\"upstream_branch\"]|select(.[]?==\"devspaces-3-rhel-9\"))" "[\"devspaces-${DEVSPACES_VERSION}-rhel-9\",\"devspaces-${DEVSPACES_VERSION}-rhel-9\"]"
 
     if [[ $VERBOSE ]]; then echo "Make sure \"current\" jobs are enabled"; fi
     replaceField "${JOB_CONFIG}" "(.\"${JOB_KEY}\"[][\"${DEVSPACES_VERSION}\"][\"disabled\"]|select(.==true))" 'false'
diff --git a/product/uploadAssetsToGHRelease.sh b/product/uploadAssetsToGHRelease.sh
index 84a0e5d4c0..3edf1aa042 100755
--- a/product/uploadAssetsToGHRelease.sh
+++ b/product/uploadAssetsToGHRelease.sh
@@ -29,8 +29,8 @@ DELETE_ASSETS=0 # this also deletes the release in which the assets are stored
 PUBLISH_ASSETS=0 # publish asset(s) to GH
 PULL_ASSETS=0 # pull asset(s) from GH
 PRE_RELEASE="--prerelease" # by default create pre-releases
-MIDSTM_BRANCH=$(git rev-parse --abbrev-ref HEAD 2>/dev/null || echo "devspaces-3-rhel-8")
-if [[ ${MIDSTM_BRANCH} != "devspaces-"*"-rhel-"* ]]; then MIDSTM_BRANCH="devspaces-3-rhel-8"; fi
+MIDSTM_BRANCH=$(git rev-parse --abbrev-ref HEAD 2>/dev/null || echo "devspaces-3-rhel-9")
+if [[ ${MIDSTM_BRANCH} != "devspaces-"*"-rhel-"* ]]; then MIDSTM_BRANCH="devspaces-3-rhel-9"; fi
 
 usageGHT() {
     echo 'Setup:
diff --git a/product/util2.groovy b/product/util2.groovy
index 0f0d37ee06..e8f71ac293 100755
--- a/product/util2.groovy
+++ b/product/util2.groovy
@@ -43,11 +43,11 @@ def String getDsVersion(String MIDSTM_BRANCH) {
 // JOB_BRANCH defines which set of jobs to run, eg., dashboard_ + JOB_BRANCH
 def String getJobBranch(String MIDSTM_BRANCH) {
   if (JOB_BRANCH.equals("") || JOB_BRANCH == null) {
-    if (MIDSTM_BRANCH.equals("devspaces-3-rhel-8") || MIDSTM_BRANCH.equals("main")) {
+    if (MIDSTM_BRANCH.equals("devspaces-3-rhel-9") || MIDSTM_BRANCH.equals("main")) {
       JOB_BRANCH="3.x"
     } else {
       // for 3.y (and 2.y)
-      JOB_BRANCH=MIDSTM_BRANCH.replaceAll("devspaces-","").replaceAll("crw-","").replaceAll("-rhel-8","")
+      JOB_BRANCH=MIDSTM_BRANCH.replaceAll("devspaces-","").replaceAll("crw-","").replaceAll("-rhel-9","")
     }
   }
   return JOB_BRANCH
@@ -134,9 +134,9 @@ def updateBaseImages(String REPO_PATH, String SOURCES_BRANCH, String FLAGS="", S
     getDsVersion(SOURCES_BRANCH)
   }
   if (!SCRIPTS_BRANCH?.trim() && DS_BRANCH_F?.trim()) {
-    SCRIPTS_BRANCH = DS_BRANCH_F // this should work for midstream/downstream branches like devspaces-3.1-rhel-8
+    SCRIPTS_BRANCH = DS_BRANCH_F // this should work for midstream/downstream branches like devspaces-3.18-rhel-9
   } else if (!SCRIPTS_BRANCH?.trim() && MIDSTM_BRANCH?.trim()) {
-    SCRIPTS_BRANCH = MIDSTM_BRANCH // this should work for midstream/downstream branches like devspaces-3.1-rhel-8
+    SCRIPTS_BRANCH = MIDSTM_BRANCH // this should work for midstream/downstream branches like devspaces-3.1-rhel-9
   } else if (!SCRIPTS_BRANCH?.trim() && JOB_BRANCH?.trim()) {
     SCRIPTS_BRANCH = JOB_BRANCH // this might fail if the JOB_BRANCH is 2.6 and there's no such branch
   }
@@ -435,7 +435,7 @@ fi
 '''
   return sh(
     returnStdout: true, 
-    // -b devspaces-3.0-rhel-8 -c devspaces/server-rhel8 --tag "3.0-" --quay
+    // -b devspaces-3.18-rhel-9 -c devspaces/server-rhel8 --tag "3.18-" --quay
     script: './getLatestImageTags.sh -b ' + MIDSTM_BRANCH + ' -c "' + orgAndImage + '" --tag "' + tag + '" --' + repo
   ).trim()
 }

From bba8dfaa0eb30d4f40c45348b24827e99e18f2bd Mon Sep 17 00:00:00 2001
From: sdawley <sdawley@redhat.com>
Date: Tue, 3 Dec 2024 13:13:13 -0800
Subject: [PATCH 2/2] Change container tags from -rhel8 to rhel9

---
 .devfile.yaml                                 |  2 +-
 dependencies/che-plugin-registry/build.sh     |  2 +-
 .../openshift/devspaces-plugin-registry.yaml  |  4 +--
 product/buildInBrewCopyToQuay.sh              |  6 ++--
 product/checkImagesInCSV.sh                   |  8 ++---
 product/collectBuildInfo.sh                   |  2 +-
 product/containerExtract.sh                   |  2 +-
 product/copyImageToQuay.sh                    |  2 +-
 product/getCommitSHAForTag.sh                 | 14 ++++----
 product/getLatestImageTags.sh                 | 34 +++++++++----------
 product/getTagForImage.sh                     |  8 ++---
 product/getTagForSHA.sh                       |  2 +-
 .../manifest/get-3rd-party-deps-manifests.sh  |  4 +--
 product/manifest/get-3rd-party-deps-rpms.sh   |  2 +-
 product/manifest/get-3rd-party-sources.sh     |  2 +-
 product/rhpkg-container-build.sh              |  8 ++---
 product/updateBaseImages.sh                   |  2 +-
 17 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/.devfile.yaml b/.devfile.yaml
index 202a82b9d7..decab89894 100644
--- a/.devfile.yaml
+++ b/.devfile.yaml
@@ -40,7 +40,7 @@ commands:
           mkdir output;
           BUILDER=podman SKIP_TEST=true SKIP_FORMAT=true SKIP_LINT=true NODE_BUILD_OPTIONS="-max-old-space-size=1024" ./build.sh &&
           export IMAGE=image-registry.openshift-image-registry.svc:5000/$(kubectl get sa default -o json | jq -r '.metadata.namespace')/che-plugin-registry &&
-          podman tag quay.io/devspaces/pluginregistry-rhel8:next ${IMAGE} &&
+          podman tag quay.io/devspaces/pluginregistry-rhel9:next ${IMAGE} &&
           podman login --tls-verify=false -u $(oc whoami | tr -d :) -p $(oc whoami -t) image-registry.openshift-image-registry.svc:5000 &&
           podman push --tls-verify=false "${IMAGE}"
   - id: configure-custom-plugin-registry
diff --git a/dependencies/che-plugin-registry/build.sh b/dependencies/che-plugin-registry/build.sh
index f8de0fb93e..d588602d96 100755
--- a/dependencies/che-plugin-registry/build.sh
+++ b/dependencies/che-plugin-registry/build.sh
@@ -240,7 +240,7 @@ if [ "${SKIP_OCI_IMAGE}" != "true" ]; then
     prepareOpenvsxPackagingAsset
 
     echo "Build with $BUILDER $BUILD_COMMAND"
-    IMAGE="${REGISTRY}/${ORGANIZATION}/pluginregistry-rhel8:${TAG}"
+    IMAGE="${REGISTRY}/${ORGANIZATION}/pluginregistry-rhel9:${TAG}"
     # Copy to root directory to behave as if in Brew or devspaces-images
     cp "${DOCKERFILE}" ./builder.Dockerfile
     ${BUILDER} ${BUILD_COMMAND} --progress=plain -t "${IMAGE}" -f ./builder.Dockerfile .
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 ba9a8f6992..e5d46a227d 100644
--- a/dependencies/che-plugin-registry/deploy/openshift/devspaces-plugin-registry.yaml
+++ b/dependencies/che-plugin-registry/deploy/openshift/devspaces-plugin-registry.yaml
@@ -115,10 +115,10 @@ objects:
       START_OPENVSX: ${START_OPENVSX}
 parameters:
   - name: IMAGE
-    value: registry.redhat.io/devspaces/pluginregistry-rhel8
+    value: registry.redhat.io/devspaces/pluginregistry-rhel9
     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-rhel8
+      to registry.redhat.io/devspaces/pluginregistry-rhel9
   - name: IMAGE_TAG
     value: '3.19'
     displayName: Red Hat OpenShift Dev Spaces plugin registry version
diff --git a/product/buildInBrewCopyToQuay.sh b/product/buildInBrewCopyToQuay.sh
index 809d8ca4a0..c1b32ad65e 100755
--- a/product/buildInBrewCopyToQuay.sh
+++ b/product/buildInBrewCopyToQuay.sh
@@ -5,8 +5,8 @@
 # $➔ for d in $(ls -1 -d operator-*); do cd $d; { ../buildInBrewCopyToQuay.sh $d; }; cd ..; done
 
 # TODO should we invoke this and commit changes first?
-# /path/to/product/getLatestRPM.sh -s "$(pwd)" -r openshift-clients-4 -u https://rhsm-pulp.corp.redhat.com/content/dist/layered/rhel8/basearch/rhocp/4.7 -a "x86_64 s390x ppc64le" 
-# /path/to/product/getLatestRPM.sh -s "$(pwd)" -r helm-3 -u https://rhsm-pulp.corp.redhat.com/content/dist/layered/rhel8/basearch/ocp-tools/4.7 -a "x86_64 s390x ppc64le" 
+# /path/to/product/getLatestRPM.sh -s "$(pwd)" -r openshift-clients-4 -u https://rhsm-pulp.corp.redhat.com/content/dist/layered/rhel9/basearch/rhocp/4.7 -a "x86_64 s390x ppc64le" 
+# /path/to/product/getLatestRPM.sh -s "$(pwd)" -r helm-3 -u https://rhsm-pulp.corp.redhat.com/content/dist/layered/rhel9/basearch/ocp-tools/4.7 -a "x86_64 s390x ppc64le" 
 
 # try to compute branches from currently checked out branch; else fall back to hard coded value
 # where to find redhat-developer/devspaces/${DWNSTM_BRANCH}/product/getLatestImageTags.sh
@@ -77,7 +77,7 @@ if [[ $brewTaskID ]]; then
   google-chrome "https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=${brewTaskID}"
   brew watch-logs ${brewTaskID} | tee /tmp/${brewTaskID}.txt
 
-  container="devspaces-${IMG}-rhel8"
+  container="devspaces-${IMG}-rhel9"
   if [[ $container == *"operator"* ]]; then container="devspaces-${IMG}"; fi # special case for operator & metadata images
 
   grep -E "registry.access.redhat.com/devspaces/.+/images/${DS_VERSION}-[0-9]+" /tmp/${brewTaskID}.txt | \
diff --git a/product/checkImagesInCSV.sh b/product/checkImagesInCSV.sh
index 795e450fdc..7a409ce2ff 100755
--- a/product/checkImagesInCSV.sh
+++ b/product/checkImagesInCSV.sh
@@ -59,8 +59,8 @@ Examples:
 
 To compare latest image in Quay to latest CSV in bundle in latest IIB:
   TAG=$PROD_VER; \\
-  IMG=devspaces/dashboard-rhel8; \\
-  IMG=devspaces/pluginregistry-rhel8; \\
+  IMG=devspaces/dashboard-rhel9; \\
+  IMG=devspaces/pluginregistry-rhel9; \\
   img_quay=\$(${SCRIPTPATH}/getLatestImageTags.sh -b devspaces-\${TAG}-rhel-9 --quay --tag \"\${TAG}-\" -c \${IMG}); echo \$img_quay; \\
   img_iib=\$(${SCRIPTPATH}/checkImagesInCSV.sh --ds -t \${TAG} -o 4.12 -y -qq -i \${IMG}); echo \$img_iib; \\
   if [[ \$img_quay != \$img_iib ]]; then \\
@@ -141,9 +141,9 @@ for imageAndTag in $IMAGES; do
               elif [[ $BREW -eq 1 ]]; then # check brew registry
                 # NOTE: could use registry-proxy.engineering.redhat.com/rh-osbs/ instead but that's internal facing, 
                 # where brew.reg is auth'd and public
-                # convert registry.redhat.io/devworkspace/devworkspace-rhel8-operator
+                # convert registry.redhat.io/devworkspace/devworkspace-rhel9-operator
                 # to      brew.registry.redhat.io/rh-osbs/devworkspace-operator
-                related_image=$(echo $related_image | sed -r -e "s#registry.redhat.io/.+/#brew.registry.redhat.io/rh-osbs/#" -e "s#-rhel8##g")
+                related_image=$(echo $related_image | sed -r -e "s#registry.redhat.io/.+/#brew.registry.redhat.io/rh-osbs/#" -e "s#-rhel9##g")
                 jqdump="$(skopeo inspect docker://${related_image} 2>&1)"
                 if [[ $jqdump == *"Labels"* ]]; then 
                     tag=$(echo $jqdump | jq -r '.Labels.url' | sed -r -e "s#.+/images/##")
diff --git a/product/collectBuildInfo.sh b/product/collectBuildInfo.sh
index 57d54d6231..3aae26f639 100755
--- a/product/collectBuildInfo.sh
+++ b/product/collectBuildInfo.sh
@@ -84,7 +84,7 @@ getContainerFromTaskID () {
 
 getContainerFromBuildID () {
 # brew buildinfo 2203173 | grep Extra | sed -r -e "s@Extra: @@" | yq -r '.image.index.pull[]' | grep -v sha256
-# registry-proxy.engineering.redhat.com/rh-osbs/devspaces-code-rhel8:3.3-6
+# registry-proxy.engineering.redhat.com/rh-osbs/devspaces-code-rhel9:3.3-6
     buildid=$1
     container=$(brew buildinfo $buildid | grep Extra | sed -r -e "s@Extra: @@" | yq -r '.image.index.pull[]' | grep -v sha256 \
         | sed -r -e "s@registry-proxy.engineering.redhat.com/rh-osbs/@@")
diff --git a/product/containerExtract.sh b/product/containerExtract.sh
index a29cd5b7ec..598a3934d4 100755
--- a/product/containerExtract.sh
+++ b/product/containerExtract.sh
@@ -21,7 +21,7 @@ usage ()
 Examples:
   $0 quay.io/devspaces/devspaces-operator-bundle:latest
   $0 quay.io/devworkspace/devworkspace-operator-bundle:next
-  $0 quay.io/devspaces/pluginregistry-rhel8:latest --tar-flags var/www/html/*/external_images.txt --arch ppc64le
+  $0 quay.io/devspaces/pluginregistry-rhel9:latest --tar-flags var/www/html/*/external_images.txt --arch ppc64le
 
 Options:
   --delete-before  remove any local images before attempting to pull and extract a new copy
diff --git a/product/copyImageToQuay.sh b/product/copyImageToQuay.sh
index da782326a8..ed36ea8dbe 100755
--- a/product/copyImageToQuay.sh
+++ b/product/copyImageToQuay.sh
@@ -69,7 +69,7 @@ for image in $images; do
         if [[ ${QUAYDEST} =~ .*(devworkspace-|)(rhel8-|)operator:.+ ]];        then QUAYDEST="devworkspace/devworkspace-rhel8-operator:${TAG}"; fi
     elif [[ $URLfrag == *"devspaces"* ]]; then
         if [[ ${QUAYDEST} == *"/operator-bundle:"* ]]; then QUAYDEST="devspaces/devspaces-operator-bundle:${TAG}"; fi
-        if [[ ${QUAYDEST} == *"/operator:"* ]];        then QUAYDEST="devspaces/devspaces-rhel8-operator:${TAG}"; fi
+        if [[ ${QUAYDEST} == *"/operator:"* ]];        then QUAYDEST="devspaces/devspaces-rhel9-operator:${TAG}"; fi
     else
         # replace /rh-osbs/foo-image with foo/image
         QUAYDEST=$(echo $QUAYDEST | sed -r -e "s#rh-osbs/([^-])-#\1/#g")
diff --git a/product/getCommitSHAForTag.sh b/product/getCommitSHAForTag.sh
index 689b389346..2c2de9a4b8 100755
--- a/product/getCommitSHAForTag.sh
+++ b/product/getCommitSHAForTag.sh
@@ -21,8 +21,8 @@ fi
 usage () {
 	echo "
 Usage: for 1 or more containers in quay or Pulp, compute the NVR, Build URL, and Source commit for that build. eg.,
-  $0  quay.io/devspaces/udi-rhel8:3.y-1 quay.io/devspaces/udi-rhel8:3.y-1 ...
-  $0  registry-proxy.engineering.redhat.com/rh-osbs/devspaces-udi-rhel8 -j 3.y -n 2      | show last 2 tags
+  $0  quay.io/devspaces/udi-rhel9:3.y-1 quay.io/devspaces/udi-rhel9:3.y-1 ...
+  $0  registry-proxy.engineering.redhat.com/rh-osbs/devspaces-udi-rhel9 -j 3.y -n 2      | show last 2 tags
 "
 exit
 }
@@ -65,7 +65,7 @@ fi
 for d in $CONTAINERS; do
 	echo
 	echo "$d"
-	d=${d/devspaces-3-rhel8-/} # special case for operator and metadata images
+	d=${d/devspaces-3-rhel9-/} # special case for operator and metadata images
 
 	#strip off the registry and just find the container name
 	dd=${d#*/}
@@ -77,13 +77,13 @@ for d in $CONTAINERS; do
 		candidateTagUsed="${candidateTag}"
 	fi
 
-	CONTNAME=${dd%%:${TAG}}; CONTNAME=${CONTNAME##*/}; CONTNAME=${CONTNAME%%-rhel8}
+	CONTNAME=${dd%%:${TAG}}; CONTNAME=${CONTNAME##*/}; CONTNAME=${CONTNAME%%-rhel9}
 	# echo "Search for $CONTNAME :: $TAG"
-	# echo "  brew list-tagged ${candidateTag} | grep -E \"${CONTNAME}-container|${CONTNAME}-rhel8-container\" | sed -r -e \"s#${candidateTagUsed}.+##\" | sort -V"
+	# echo "  brew list-tagged ${candidateTag} | grep -E \"${CONTNAME}-container|${CONTNAME}-rhel9-container\" | sed -r -e \"s#${candidateTagUsed}.+##\" | sort -V"
 	if [[ $TAG != ${dd} ]]; then
-		NVRs=$(brew list-tagged ${candidateTagUsed} | grep -E "${CONTNAME}-container|${CONTNAME}-rhel8-container" | sed -e "s#${candidateTagUsed}.\+##" | sort -V | grep ${TAG})
+		NVRs=$(brew list-tagged ${candidateTagUsed} | grep -E "${CONTNAME}-container|${CONTNAME}-rhel9-container" | sed -e "s#${candidateTagUsed}.\+##" | sort -V | grep ${TAG})
 	else
-		NVRs=$(brew list-tagged ${candidateTagUsed} | grep -E "${CONTNAME}-container|${CONTNAME}-rhel8-container" | sed -e "s#${candidateTagUsed}.\+##" | sort -Vr | head -${NUMTAGS})
+		NVRs=$(brew list-tagged ${candidateTagUsed} | grep -E "${CONTNAME}-container|${CONTNAME}-rhel9-container" | sed -e "s#${candidateTagUsed}.\+##" | sort -Vr | head -${NUMTAGS})
 	fi
 	for NVR in $NVRs; do
 		echo "     NVR: $NVR"
diff --git a/product/getLatestImageTags.sh b/product/getLatestImageTags.sh
index a8e1e6a8d9..cbc800899d 100755
--- a/product/getLatestImageTags.sh
+++ b/product/getLatestImageTags.sh
@@ -71,20 +71,20 @@ checkVersion() {
 checkVersion 1.1 "$(skopeo --version | sed -e "s/skopeo version //")" skopeo
 
 DS_CONTAINERS="\
-devspaces/code-rhel8 \
-devspaces/configbump-rhel8 \
-devspaces/devspaces-rhel8-operator \
+devspaces/code-rhel9 \
+devspaces/configbump-rhel9 \
+devspaces/devspaces-rhel9-operator \
 devspaces/devspaces-operator-bundle \
-devspaces/dashboard-rhel8 \
+devspaces/dashboard-rhel9 \
 \
-devspaces/idea-rhel8 \
-devspaces/imagepuller-rhel8 \
-devspaces/machineexec-rhel8 \
-devspaces/pluginregistry-rhel8 \
-devspaces/server-rhel8 \
+devspaces/idea-rhel9 \
+devspaces/imagepuller-rhel9 \
+devspaces/machineexec-rhel9 \
+devspaces/pluginregistry-rhel9 \
+devspaces/server-rhel9 \
 \
-devspaces/traefik-rhel8 \
-devspaces/udi-rhel8 \
+devspaces/traefik-rhel9 \
+devspaces/udi-rhel9 \
 "
 
 # regex pattern of container tags to exclude, eg., latest and -source; also exclude images generated by PR or temporary builds used for publishing assets
@@ -145,9 +145,9 @@ Usage:
   $0 -b ${DWNSTM_BRANCH} --arches                          | use default list of DS images in RHEC Prod; show arches
 
   $0 -c devspaces/iib --quay -o v4.12 --tag ${DS_VERSION}-v4.12          | search for latest Dev Spaces IIBs in quay for a given OCP version
-  $0 -c devspaces/code-rhel8 --quay                            | check latest tag for specific Quay image(s), with branch = ${DWNSTM_BRANCH}
+  $0 -c devspaces/code-rhel9 --quay                            | check latest tag for specific Quay image(s), with branch = ${DWNSTM_BRANCH}
   $0 -c devspaces-operator --osbs                              | check an image from OSBS
-  $0 -c devspaces-devspaces-rhel8-operator --nvr               | check an NVR from OSBS
+  $0 -c devspaces-devspaces-rhel9-operator --nvr               | check an NVR from OSBS
   $0 -c ubi7-minimal -c ubi8-minimal --osbs -n 3 --tag .       | check OSBS registry; show all tags; show 3 tags per container
   $0 -c 'devtools/go-toolset-rhel7 ubi7/go-toolset' --tag 1.1* | check RHEC prod registry; show 1.1* tags (exclude latest and -sources)
   $0 -c pivotaldata/centos --docker --dockerfile               | check docker registry; show Dockerfile contents (requires dfimage)
@@ -242,9 +242,9 @@ if [[ ${REGISTRY} != "" ]]; then
 	REGISTRYPRE="${REGISTRY##*://}/"
 	if [[ ${REGISTRY} == *"registry-proxy.engineering.redhat.com"* ]]; then
 		if [[ ${CONTAINERS} == "" ]] || [[ ${CONTAINERS} == "${DS_CONTAINERS}" ]]; then 
-			CONTAINERS="${DS_CONTAINERS}"; CONTAINERS=${CONTAINERS//devspaces-3-rhel8-/}; CONTAINERS="${CONTAINERS//devspaces\//devspaces-}"
+			CONTAINERS="${DS_CONTAINERS}"; CONTAINERS=${CONTAINERS//devspaces-3-rhel9-/}; CONTAINERS="${CONTAINERS//devspaces\//devspaces-}"
 			CONTAINERS="${CONTAINERS//devspaces-devspaces/devspaces}"
-			CONTAINERS="${CONTAINERS/devspaces-rhel8-operator/devspaces-operator}"
+			CONTAINERS="${CONTAINERS/devspaces-rhel9-operator/devspaces-operator}"
 		fi
 	elif [[ ${REGISTRY} == *"quay.io"* ]]; then
 		searchTag=":${latestNext}"
@@ -294,7 +294,7 @@ if [[ ${SHOWNVR} -eq 1 ]]; then
 	for containername in ${CONTAINERS}; do
 		(( c = c + 1 ))
 		# NEW: devspaces/devspaces-operator-bundle -> devspaces-operator-bundle
-		# NEW: devspaces/devspaces-rhel8-operator  -> devspaces-rhel8-operator
+		# NEW: devspaces/devspaces-rhel9-operator  -> devspaces-rhel9-operator
 		containername="${containername/devspaces-/}"
 		if [[ ${VERBOSE} -eq 1 ]]; then
 			# shellcheck disable=SC2028
@@ -445,7 +445,7 @@ for URLfrag in $CONTAINERS; do
 			QUAYDEST="${REGISTRYPRE}${URLfrag}"; QUAYDEST=${QUAYDEST##*devspaces-} # udi or operator
 			# special case for the operator and bundle images, which don't follow the same pattern in osbs as quay
 			if [[ ${QUAYDEST} == "operator-bundle" ]]; then QUAYDEST="devspaces-operator-bundle"; fi
-			if [[ ${QUAYDEST} == "operator" ]];        then QUAYDEST="devspaces-rhel8-operator"; fi
+			if [[ ${QUAYDEST} == "operator" ]];        then QUAYDEST="devspaces-rhel9-operator"; fi
 			QUAYDEST="quay.io/devspaces/${QUAYDEST}"
 
 			if [[ $(skopeo --insecure-policy inspect docker://${QUAYDEST}:${LATESTTAG} 2>&1) == *"Error"* ]] || [[ ${PUSHTOQUAYFORCE} -eq 1 ]]; then 
diff --git a/product/getTagForImage.sh b/product/getTagForImage.sh
index 9a42dfb5fa..5806d46f87 100755
--- a/product/getTagForImage.sh
+++ b/product/getTagForImage.sh
@@ -7,7 +7,7 @@ usage () {
 Usage: 
   $0 [image1] [image2] [image3] ... [-t show container names, sorted]
 Examples: 
-  $0 quay.io/devspaces/devspaces-rhel8-operator:3.0-1 registry.redhat.io/devspaces/server-rhel8:3.0 devspaces-operator-bundle-container-3.0-2
+  $0 quay.io/devspaces/devspaces-rhel9-operator:3.0-1 registry.redhat.io/devspaces/server-rhel9:3.0 devspaces-operator-bundle-container-3.0-2
   $0 \$(cat LATEST_IMAGES) -s
 "
 	exit
@@ -31,11 +31,11 @@ for d in $images; do
     c="";
     c="${d%:*}" # trim off the tag
     c="${c##*/}" # trim repo and org
-    c="${c##*devspaces-3-rhel8-}" # trim devspaces-3-rhel-9 prefix
-    c="${c/-rhel8/}"  # trim container midfix
+    c="${c##*devspaces-3-rhel9-}" # trim devspaces-3-rhel-9 prefix
+    c="${c/-rhel9/}"  # trim container midfix
     c="${c##*devspaces-}"  # trim container prefix
     c="${c%%-container-*}"  # trim container suffix
-    c="${c%%-rhel8}"  # trim container suffix
+    c="${c%%-rhel9}"  # trim container suffix
   else
     (( c = c + 1 ))
   fi
diff --git a/product/getTagForSHA.sh b/product/getTagForSHA.sh
index e51d5a324c..8e32bd74b8 100755
--- a/product/getTagForSHA.sh
+++ b/product/getTagForSHA.sh
@@ -54,7 +54,7 @@ checkImage () {
     if [[ $URL ]]; then
         container=${URL}
         container=${image}:${container##*/images/}
-        # replace quay.io/devspaces/devspaces-rhel8-operator:3.4:3.4-22 with quay.io/devspaces/devspaces-rhel8-operator:3.4-22
+        # replace quay.io/devspaces/devspaces-rhel9-operator:3.4:3.4-22 with quay.io/devspaces/devspaces-rhel9-operator:3.4-22
         container=$(echo "$container" | sed -r -e "s@:[0-9.]+:@:@")
         if [[ $QUIET -eq 0 ]]; then echo "Got $container"; else echo "$container"; fi
         checkImage_result="true"
diff --git a/product/manifest/get-3rd-party-deps-manifests.sh b/product/manifest/get-3rd-party-deps-manifests.sh
index de33885c8b..6982042e83 100755
--- a/product/manifest/get-3rd-party-deps-manifests.sh
+++ b/product/manifest/get-3rd-party-deps-manifests.sh
@@ -158,9 +158,9 @@ if [[ ${phases} == *"1"* ]]; then
 	devspaces-server \
 	; do
 		if [[ $d == "devspaces" ]]; then
-			containerName=${d##containers/}-server-rhel8-container
+			containerName=${d##containers/}-server-rhel9-container
 		else
-			containerName=${d##containers/}-rhel8-container
+			containerName=${d##containers/}-rhel9-container
 		fi
 		# echo $containerName
 		log ""
diff --git a/product/manifest/get-3rd-party-deps-rpms.sh b/product/manifest/get-3rd-party-deps-rpms.sh
index 3ccc213c8a..f97ecd7b44 100755
--- a/product/manifest/get-3rd-party-deps-rpms.sh
+++ b/product/manifest/get-3rd-party-deps-rpms.sh
@@ -83,7 +83,7 @@ function loadNVRlog() {
 	MANIFEST_FILE2="$2"
 	ARCH="$3"
 	# shellcheck disable=SC2001
-	URL=$(echo $NVR | sed -e "s#\(.\+\(-container\|-rhel8\)\)-\([0-9.]\+\)-\([0-9.]\+\)#https://download.eng.bos.redhat.com/brewroot/packages/\1/\3/\4/data/logs/${ARCH}-build.log#")
+	URL=$(echo $NVR | sed -e "s#\(.\+\(-container\|-rhel9\)\)-\([0-9.]\+\)-\([0-9.]\+\)#https://download.eng.bos.redhat.com/brewroot/packages/\1/\3/\4/data/logs/${ARCH}-build.log#")
 	# log ""
 	log "   ${URL}"
 
diff --git a/product/manifest/get-3rd-party-sources.sh b/product/manifest/get-3rd-party-sources.sh
index 5ed2d7fdaa..4315a2d103 100755
--- a/product/manifest/get-3rd-party-sources.sh
+++ b/product/manifest/get-3rd-party-sources.sh
@@ -145,7 +145,7 @@ if [[ ${phases} == *"1"* ]]; then
         # shellcheck disable=SC2013
         for d in $(sort "${WORKSPACE}"/NVRs.txt); do
             NVR=${d}
-            SOURCES_DIR=${d%-container-*}; SOURCES_DIR=${SOURCES_DIR/-rhel8}; # echo $SOURCES_DIR
+            SOURCES_DIR=${d%-container-*}; SOURCES_DIR=${SOURCES_DIR/-rhel9}; # echo $SOURCES_DIR
             echo "git clone --depth 1 --branch ${MIDSTM_BRANCH} to ${SOURCES_DIR} ..."
             git clone --depth 1 --branch "${MIDSTM_BRANCH}" "ssh://${pduser}@pkgs.devel.redhat.com/containers/${SOURCES_DIR}" "${SOURCES_DIR}" || true
             cd "${SOURCES_DIR}" && git checkout "${MIDSTM_BRANCH}" -q && cd ..
diff --git a/product/rhpkg-container-build.sh b/product/rhpkg-container-build.sh
index 627fee801a..6008b22f5e 100755
--- a/product/rhpkg-container-build.sh
+++ b/product/rhpkg-container-build.sh
@@ -92,8 +92,8 @@ fi
 #      "2.0"
 #  ],
 #  "pull": [
-#      "registry-proxy.engineering.redhat.com/rh-osbs/devspaces-pluginregistry-rhel8@sha256:85c89a1d9e382bebe70f4204f05f06f0fc2b9c76f1c3ca2983c17989b92239fe",
-#      "registry-proxy.engineering.redhat.com/rh-osbs/devspaces-pluginregistry-rhel8:2.0-212"
+#      "registry-proxy.engineering.redhat.com/rh-osbs/devspaces-pluginregistry-rhel9@sha256:85c89a1d9e382bebe70f4204f05f06f0fc2b9c76f1c3ca2983c17989b92239fe",
+#      "registry-proxy.engineering.redhat.com/rh-osbs/devspaces-pluginregistry-rhel9:2.0-212"
 #  ],
 #  "tags": [
 #      "2.0-212"
@@ -123,7 +123,7 @@ if [[ $REPOS ]] && [[ ${VERBOSE} -eq 1 ]]; then echo "[INFO] #2 Console parser s
 # OPTION 2/3
 if [[ ! ${REPOS} ]] || [[ ${REPOS} == " " ]]; then
   # for scratch builds look for this line:
-  # ^ADD Dockerfile-devspaces-server-rhel8-2.0-scratch-89319-20191122035915 /root/buildinfo/Dockerfile-devspaces-server-rhel8-2.0-scratch-89319-20191122035915
+  # ^ADD Dockerfile-devspaces-server-rhel9-2.0-scratch-89319-20191122035915 /root/buildinfo/Dockerfile-devspaces-server-rhel9-2.0-scratch-89319-20191122035915
   echo "REPO_PATH=\"$(grep --text -E "^ADD Dockerfile-devspaces-" "${LOGFILE}" | sed -r -e "s@\[[TZ0123456789.:-]+\]@@" \
     | sed -r -e "s@^ADD Dockerfile-devspaces-(.+) /root/.+@\1@" | sort -u | tr "\n\r" " " )\"" \
     | tee "${WORKSPACE}"/build_desc.txt
@@ -184,7 +184,7 @@ TASK_URL="$(grep --text "Task info: https://brewweb.engineering.redhat.com/brew/
 TASK_ID="${TASK_URL##*=}"
 BUILD_DESC=$(echo $REPO_PATH | sed -r \
     -e 's#registry-proxy.engineering.redhat.com/rh-osbs/devspaces-#quay.io/devspaces/#g' \
-    -e 's#(quay.io/devspaces/.+-rhel8:[0-9.-]+) *#<a href="https://\1">\1</a> #g' \
+    -e 's#(quay.io/devspaces/.+-rhel9:[0-9.-]+) *#<a href="https://\1">\1</a> #g' \
     -e 's#(quay.io/devspaces)/(operator|operator-bundle):([0-9.-]+) *#<a href="https://\1/devspaces-3-rhel-9-\2:\3">\1/devspaces-3-rhel-9-\2:\3</a> #g'
 )
 BUILD_RESULT="SUCCESS"
diff --git a/product/updateBaseImages.sh b/product/updateBaseImages.sh
index 255c020300..6ac2076d8e 100755
--- a/product/updateBaseImages.sh
+++ b/product/updateBaseImages.sh
@@ -202,7 +202,7 @@ for d in $(find "${WORKDIR}/" -maxdepth "${MAXDEPTH}" -name "${DOCKERFILE}" | so
 		echo "# Checking ${d} ..."
 		# pull latest commits
 		if [[ -d ${d%%/${DOCKERFILE}} ]]; then pushd "${d%%/${DOCKERFILE}}" >/dev/null; pushedIn=1; fi
-		if [[ "${d%/${DOCKERFILE}}" == *"-rhel8" ]]; then
+		if [[ "${d%/${DOCKERFILE}}" == *"-rhel9" ]]; then
 			BRANCHUSED=${SOURCES_BRANCH/rhel-7/rhel-8/rhel-9}
 		else
 			BRANCHUSED=${SOURCES_BRANCH}