From cb5b6d54b904fff893d36b1d5bae875564e78bcd Mon Sep 17 00:00:00 2001
From: Nick Boldt <nboldt@redhat.com>
Date: Tue, 14 Mar 2023 17:13:44 -0300
Subject: [PATCH] chore: CRW-3663 remove refs to theia and add placeholders for
 more removals when 3.5 is done (and no chance of 3.5.1)

Change-Id: Iee12d52fa5804b47e4ce23146e9430c02d33085e
Signed-off-by: Nick Boldt <nboldt@redhat.com>
---
 product/buildAllInBrewCopyToQuay.sh              | 5 +----
 product/getLatestImageTags.sh                    | 3 ---
 product/manifest/get-3rd-party-deps-manifests.sh | 2 ++
 product/manifest/get-3rd-party-deps-theia.sh     | 1 +
 product/manifest/get-3rd-party-sources.sh        | 1 +
 product/tagRelease.sh                            | 1 +
 product/updateBaseImages.sh                      | 7 ++-----
 7 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/product/buildAllInBrewCopyToQuay.sh b/product/buildAllInBrewCopyToQuay.sh
index ad0109d918..d1a7124e6d 100755
--- a/product/buildAllInBrewCopyToQuay.sh
+++ b/product/buildAllInBrewCopyToQuay.sh
@@ -89,15 +89,12 @@ if [[ $PHASES == *"1"* ]]; then
         devspaces-operator \
         devspaces-pluginregistry \
         devspaces-server \
-        devspaces-theia-dev \
         devspaces-traefik \
         devspaces-udi"
 fi
 
-# theia images depend on theia-dev; operator-bundle is built last after everything else is done
+# operator-bundle is built last after everything else is done
 if [[ $PHASES == *"2"* ]]; then 
-    doBuild "devspaces-theia"
-    doBuild "devspaces-theia-endpoint"
     doBuild "devspaces-operator-bundle"
 fi
 
diff --git a/product/getLatestImageTags.sh b/product/getLatestImageTags.sh
index 1801c44f85..ff4736129a 100755
--- a/product/getLatestImageTags.sh
+++ b/product/getLatestImageTags.sh
@@ -84,9 +84,6 @@ devspaces/machineexec-rhel8 \
 devspaces/pluginregistry-rhel8 \
 devspaces/server-rhel8 \
 \
-devspaces/theia-dev-rhel8 \
-devspaces/theia-endpoint-rhel8 \
-devspaces/theia-rhel8 \
 devspaces/traefik-rhel8 \
 devspaces/udi-rhel8 \
 "
diff --git a/product/manifest/get-3rd-party-deps-manifests.sh b/product/manifest/get-3rd-party-deps-manifests.sh
index 53b4d9efea..3d55afd641 100755
--- a/product/manifest/get-3rd-party-deps-manifests.sh
+++ b/product/manifest/get-3rd-party-deps-manifests.sh
@@ -78,6 +78,8 @@ mkdir -p "${WORKSPACE}/${CSV_VERSION}"
 MANIFEST_FILE="${WORKSPACE}/${CSV_VERSION}/manifest.txt"
 LOG_FILE="${WORKSPACE}/${CSV_VERSION}/manifest_log.txt"
 rm -f ${LOG_FILE} ${MANIFEST_FILE} ${MANIFEST_FILE/.txt/-all.txt}
+
+# TODO CRW_3663 remove theia once 3.5 is live 
 for d in mvn rpms theia; do rm -f ${WORKSPACE}/${CSV_VERSION}/${d}/manifest-${d}.txt; done
 
 function log () {
diff --git a/product/manifest/get-3rd-party-deps-theia.sh b/product/manifest/get-3rd-party-deps-theia.sh
index c982daeb91..0acb5faf75 100755
--- a/product/manifest/get-3rd-party-deps-theia.sh
+++ b/product/manifest/get-3rd-party-deps-theia.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 # script to generate a manifest of all the 3rd party deps not built in OSBS, but built in Jenkins or imported from upstream community.
+# TODO CRW_3663 remove this file and refs to it, once 3.5 is live
 
 JENKINS=https://main-jenkins-csb-crwqe.apps.ocp-c1.prod.psi.redhat.com/job/DS_CI/job
 
diff --git a/product/manifest/get-3rd-party-sources.sh b/product/manifest/get-3rd-party-sources.sh
index 152e97f097..a4d042577c 100755
--- a/product/manifest/get-3rd-party-sources.sh
+++ b/product/manifest/get-3rd-party-sources.sh
@@ -156,6 +156,7 @@ if [[ ${phases} == *"2"* ]]; then
         URLsAll=""
         URLs=""
         for d in $(find . -name \*.yaml | sort); do 
+            # TODO CRW_3663 remove theia once 3.5 is live 
             URLsAll="${URLsAll} $(grep -E "\.vsix|\.theia" "$d" | grep github | grep releases | sed -r -e "s@- @@" -e "s@extension: @@" | tr -d "'\"")"
         done
         if [[ $URLsAll ]]; then
diff --git a/product/tagRelease.sh b/product/tagRelease.sh
index 10cfe0f217..e5d0365f5c 100755
--- a/product/tagRelease.sh
+++ b/product/tagRelease.sh
@@ -230,6 +230,7 @@ updatePNCBuildConfigs() {
 }
 
 # tag pkgs.devel repos only (branches are created by SPMM ticket, eg., https://projects.engineering.redhat.com/browse/SPMM-2517)
+# TODO CRW_3663 remove theia once 3.5 is live 
 if [[ "${pkgs_devel_branch}" ]] && [[ "${CSV_VERSION}" ]]; then
 	for repo in \
 	devspaces-code \
diff --git a/product/updateBaseImages.sh b/product/updateBaseImages.sh
index 555ed55b7a..72550354bf 100755
--- a/product/updateBaseImages.sh
+++ b/product/updateBaseImages.sh
@@ -72,10 +72,7 @@ usage () {
 	echo "Downstream Example: $0 -b ${SOURCES_BRANCH} -w \$(pwd) -f rhel.Dockerfile -maxdepth 2"
 	echo "Upstream Examples:
 
-$0 -b 7.yy.x -w dockerfiles/ -f \*from.dockerfile -maxdepth 5 -o # che-theia
-$0 -b master -w \$(pwd) -f rhel.Dockerfile -maxdepth 4 -o # che-plugin-broker
-$0 -b 7.yy.x -w \$(pwd) -f Dockerfile      -maxdepth 1 --tag '1\.13|8\.[0-9]-' --no-commit # che-operator
-
+$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
@@ -216,7 +213,7 @@ for d in $(find "${WORKDIR}/" -maxdepth "${MAXDEPTH}" -name "${DOCKERFILE}" | so
 		FROMPREFIX=""
 		LATESTTAG=""
 		# shellcheck disable=SC2002
-		URLs=$(grep "FROM" -B1 "$d" || true) # don't fail if no FROM found, eg., if parsing theia dockerfile fragments/template files
+		URLs=$(grep "FROM" -B1 "$d" || true) # don't fail if no FROM found
 		for URL in $URLs; do
 			URL=${URL#registry.access.redhat.com/}
 			URL=${URL#registry.redhat.io/}