Rhel 9 Migration for 3.x Branch

.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

.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/**'
 

.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

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.
 

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

dependencies/che-plugin-registry/README.md

@@ -11,17 +11,17 @@ 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.
 The default `OpenVSX` version used is `che-openvsx`, which will be built from https://github.com/che-incubator/che-openvsx.git at a tag defined in the [job-config.json](../job-config.json). To override this version use the `--che-openvsx-url` parameter in `build.sh` to set a URL where alternative `OpenVSX` sources can be downloaded. The URL must point to a file named `che-openvsx.tar.gz`.
 
 ### 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
 

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
@@ -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 .

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"]

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"]

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.
 

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

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
       }

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].
 

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

product/buildInBrewCopyToQuay.sh

@@ -5,17 +5,17 @@
 # $➔ 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
 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
@@ -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 | \

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
 }