Skip to content

chore: CRW-3663 remove refs to theia and add... #915

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 27, 2023
Merged

chore: CRW-3663 remove refs to theia and add... #915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions product/buildAllInBrewCopyToQuay.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 0 additions & 3 deletions product/getLatestImageTags.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
"
Expand Down
2 changes: 2 additions & 0 deletions product/manifest/get-3rd-party-deps-manifests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 () {
Expand Down
1 change: 1 addition & 0 deletions product/manifest/get-3rd-party-deps-theia.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
1 change: 1 addition & 0 deletions product/manifest/get-3rd-party-sources.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions product/tagRelease.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
7 changes: 2 additions & 5 deletions product/updateBaseImages.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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/}
Expand Down