Skip to content

Commit bba8dfa

Browse files
SDawleySDawley
committed
Change container tags from -rhel8 to rhel9
1 parent aa03728 commit bba8dfa

17 files changed

+52
-52
lines changed

‎.devfile.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ commands:
4040
mkdir output;
4141
BUILDER=podman SKIP_TEST=true SKIP_FORMAT=true SKIP_LINT=true NODE_BUILD_OPTIONS="-max-old-space-size=1024" ./build.sh &&
4242
export IMAGE=image-registry.openshift-image-registry.svc:5000/$(kubectl get sa default -o json | jq -r '.metadata.namespace')/che-plugin-registry &&
43-
podman tag quay.io/devspaces/pluginregistry-rhel8:next ${IMAGE} &&
43+
podman tag quay.io/devspaces/pluginregistry-rhel9:next ${IMAGE} &&
4444
podman login --tls-verify=false -u $(oc whoami | tr -d :) -p $(oc whoami -t) image-registry.openshift-image-registry.svc:5000 &&
4545
podman push --tls-verify=false "${IMAGE}"
4646
- id: configure-custom-plugin-registry

‎dependencies/che-plugin-registry/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ if [ "${SKIP_OCI_IMAGE}" != "true" ]; then
240240
prepareOpenvsxPackagingAsset
241241

242242
echo "Build with $BUILDER $BUILD_COMMAND"
243-
IMAGE="${REGISTRY}/${ORGANIZATION}/pluginregistry-rhel8:${TAG}"
243+
IMAGE="${REGISTRY}/${ORGANIZATION}/pluginregistry-rhel9:${TAG}"
244244
# Copy to root directory to behave as if in Brew or devspaces-images
245245
cp "${DOCKERFILE}" ./builder.Dockerfile
246246
${BUILDER} ${BUILD_COMMAND} --progress=plain -t "${IMAGE}" -f ./builder.Dockerfile .

‎dependencies/che-plugin-registry/deploy/openshift/devspaces-plugin-registry.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,10 +115,10 @@ objects:
115115
START_OPENVSX: ${START_OPENVSX}
116116
parameters:
117117
- name: IMAGE
118-
value: registry.redhat.io/devspaces/pluginregistry-rhel8
118+
value: registry.redhat.io/devspaces/pluginregistry-rhel9
119119
displayName: Red Hat OpenShift Dev Spaces plugin registry image
120120
description: Red Hat OpenShift Dev Spaces plugin registry container image. Defaults
121-
to registry.redhat.io/devspaces/pluginregistry-rhel8
121+
to registry.redhat.io/devspaces/pluginregistry-rhel9
122122
- name: IMAGE_TAG
123123
value: '3.19'
124124
displayName: Red Hat OpenShift Dev Spaces plugin registry version

‎product/buildInBrewCopyToQuay.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
# $➔ for d in $(ls -1 -d operator-*); do cd $d; { ../buildInBrewCopyToQuay.sh $d; }; cd ..; done
66

77
# TODO should we invoke this and commit changes first?
8-
# /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"
9-
# /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"
8+
# /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"
9+
# /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"
1010

1111
# try to compute branches from currently checked out branch; else fall back to hard coded value
1212
# where to find redhat-developer/devspaces/${DWNSTM_BRANCH}/product/getLatestImageTags.sh
@@ -77,7 +77,7 @@ if [[ $brewTaskID ]]; then
7777
google-chrome "https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=${brewTaskID}"
7878
brew watch-logs ${brewTaskID} | tee /tmp/${brewTaskID}.txt
7979

80-
container="devspaces-${IMG}-rhel8"
80+
container="devspaces-${IMG}-rhel9"
8181
if [[ $container == *"operator"* ]]; then container="devspaces-${IMG}"; fi # special case for operator & metadata images
8282

8383
grep -E "registry.access.redhat.com/devspaces/.+/images/${DS_VERSION}-[0-9]+" /tmp/${brewTaskID}.txt | \

‎product/checkImagesInCSV.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ Examples:
5959
6060
To compare latest image in Quay to latest CSV in bundle in latest IIB:
6161
TAG=$PROD_VER; \\
62-
IMG=devspaces/dashboard-rhel8; \\
63-
IMG=devspaces/pluginregistry-rhel8; \\
62+
IMG=devspaces/dashboard-rhel9; \\
63+
IMG=devspaces/pluginregistry-rhel9; \\
6464
img_quay=\$(${SCRIPTPATH}/getLatestImageTags.sh -b devspaces-\${TAG}-rhel-9 --quay --tag \"\${TAG}-\" -c \${IMG}); echo \$img_quay; \\
6565
img_iib=\$(${SCRIPTPATH}/checkImagesInCSV.sh --ds -t \${TAG} -o 4.12 -y -qq -i \${IMG}); echo \$img_iib; \\
6666
if [[ \$img_quay != \$img_iib ]]; then \\
@@ -141,9 +141,9 @@ for imageAndTag in $IMAGES; do
141141
elif [[ $BREW -eq 1 ]]; then # check brew registry
142142
# NOTE: could use registry-proxy.engineering.redhat.com/rh-osbs/ instead but that's internal facing,
143143
# where brew.reg is auth'd and public
144-
# convert registry.redhat.io/devworkspace/devworkspace-rhel8-operator
144+
# convert registry.redhat.io/devworkspace/devworkspace-rhel9-operator
145145
# to brew.registry.redhat.io/rh-osbs/devworkspace-operator
146-
related_image=$(echo $related_image | sed -r -e "s#registry.redhat.io/.+/#brew.registry.redhat.io/rh-osbs/#" -e "s#-rhel8##g")
146+
related_image=$(echo $related_image | sed -r -e "s#registry.redhat.io/.+/#brew.registry.redhat.io/rh-osbs/#" -e "s#-rhel9##g")
147147
jqdump="$(skopeo inspect docker://${related_image} 2>&1)"
148148
if [[ $jqdump == *"Labels"* ]]; then
149149
tag=$(echo $jqdump | jq -r '.Labels.url' | sed -r -e "s#.+/images/##")

‎product/collectBuildInfo.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ getContainerFromTaskID () {
8484

8585
getContainerFromBuildID () {
8686
# brew buildinfo 2203173 | grep Extra | sed -r -e "s@Extra: @@" | yq -r '.image.index.pull[]' | grep -v sha256
87-
# registry-proxy.engineering.redhat.com/rh-osbs/devspaces-code-rhel8:3.3-6
87+
# registry-proxy.engineering.redhat.com/rh-osbs/devspaces-code-rhel9:3.3-6
8888
buildid=$1
8989
container=$(brew buildinfo $buildid | grep Extra | sed -r -e "s@Extra: @@" | yq -r '.image.index.pull[]' | grep -v sha256 \
9090
| sed -r -e "[email protected]/rh-osbs/@@")

‎product/containerExtract.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ usage ()
2121
Examples:
2222
$0 quay.io/devspaces/devspaces-operator-bundle:latest
2323
$0 quay.io/devworkspace/devworkspace-operator-bundle:next
24-
$0 quay.io/devspaces/pluginregistry-rhel8:latest --tar-flags var/www/html/*/external_images.txt --arch ppc64le
24+
$0 quay.io/devspaces/pluginregistry-rhel9:latest --tar-flags var/www/html/*/external_images.txt --arch ppc64le
2525
2626
Options:
2727
--delete-before remove any local images before attempting to pull and extract a new copy

‎product/copyImageToQuay.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ for image in $images; do
6969
if [[ ${QUAYDEST} =~ .*(devworkspace-|)(rhel8-|)operator:.+ ]]; then QUAYDEST="devworkspace/devworkspace-rhel8-operator:${TAG}"; fi
7070
elif [[ $URLfrag == *"devspaces"* ]]; then
7171
if [[ ${QUAYDEST} == *"/operator-bundle:"* ]]; then QUAYDEST="devspaces/devspaces-operator-bundle:${TAG}"; fi
72-
if [[ ${QUAYDEST} == *"/operator:"* ]]; then QUAYDEST="devspaces/devspaces-rhel8-operator:${TAG}"; fi
72+
if [[ ${QUAYDEST} == *"/operator:"* ]]; then QUAYDEST="devspaces/devspaces-rhel9-operator:${TAG}"; fi
7373
else
7474
# replace /rh-osbs/foo-image with foo/image
7575
QUAYDEST=$(echo $QUAYDEST | sed -r -e "s#rh-osbs/([^-])-#\1/#g")

‎product/getCommitSHAForTag.sh

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ fi
2121
usage () {
2222
echo "
2323
Usage: for 1 or more containers in quay or Pulp, compute the NVR, Build URL, and Source commit for that build. eg.,
24-
$0 quay.io/devspaces/udi-rhel8:3.y-1 quay.io/devspaces/udi-rhel8:3.y-1 ...
25-
$0 registry-proxy.engineering.redhat.com/rh-osbs/devspaces-udi-rhel8 -j 3.y -n 2 | show last 2 tags
24+
$0 quay.io/devspaces/udi-rhel9:3.y-1 quay.io/devspaces/udi-rhel9:3.y-1 ...
25+
$0 registry-proxy.engineering.redhat.com/rh-osbs/devspaces-udi-rhel9 -j 3.y -n 2 | show last 2 tags
2626
"
2727
exit
2828
}
@@ -65,7 +65,7 @@ fi
6565
for d in $CONTAINERS; do
6666
echo
6767
echo "$d"
68-
d=${d/devspaces-3-rhel8-/} # special case for operator and metadata images
68+
d=${d/devspaces-3-rhel9-/} # special case for operator and metadata images
6969

7070
#strip off the registry and just find the container name
7171
dd=${d#*/}
@@ -77,13 +77,13 @@ for d in $CONTAINERS; do
7777
candidateTagUsed="${candidateTag}"
7878
fi
7979

80-
CONTNAME=${dd%%:${TAG}}; CONTNAME=${CONTNAME##*/}; CONTNAME=${CONTNAME%%-rhel8}
80+
CONTNAME=${dd%%:${TAG}}; CONTNAME=${CONTNAME##*/}; CONTNAME=${CONTNAME%%-rhel9}
8181
# echo "Search for $CONTNAME :: $TAG"
82-
# echo " brew list-tagged ${candidateTag} | grep -E \"${CONTNAME}-container|${CONTNAME}-rhel8-container\" | sed -r -e \"s#${candidateTagUsed}.+##\" | sort -V"
82+
# echo " brew list-tagged ${candidateTag} | grep -E \"${CONTNAME}-container|${CONTNAME}-rhel9-container\" | sed -r -e \"s#${candidateTagUsed}.+##\" | sort -V"
8383
if [[ $TAG != ${dd} ]]; then
84-
NVRs=$(brew list-tagged ${candidateTagUsed} | grep -E "${CONTNAME}-container|${CONTNAME}-rhel8-container" | sed -e "s#${candidateTagUsed}.\+##" | sort -V | grep ${TAG})
84+
NVRs=$(brew list-tagged ${candidateTagUsed} | grep -E "${CONTNAME}-container|${CONTNAME}-rhel9-container" | sed -e "s#${candidateTagUsed}.\+##" | sort -V | grep ${TAG})
8585
else
86-
NVRs=$(brew list-tagged ${candidateTagUsed} | grep -E "${CONTNAME}-container|${CONTNAME}-rhel8-container" | sed -e "s#${candidateTagUsed}.\+##" | sort -Vr | head -${NUMTAGS})
86+
NVRs=$(brew list-tagged ${candidateTagUsed} | grep -E "${CONTNAME}-container|${CONTNAME}-rhel9-container" | sed -e "s#${candidateTagUsed}.\+##" | sort -Vr | head -${NUMTAGS})
8787
fi
8888
for NVR in $NVRs; do
8989
echo " NVR: $NVR"

‎product/getLatestImageTags.sh

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -71,20 +71,20 @@ checkVersion() {
7171
checkVersion 1.1 "$(skopeo --version | sed -e "s/skopeo version //")" skopeo
7272

7373
DS_CONTAINERS="\
74-
devspaces/code-rhel8 \
75-
devspaces/configbump-rhel8 \
76-
devspaces/devspaces-rhel8-operator \
74+
devspaces/code-rhel9 \
75+
devspaces/configbump-rhel9 \
76+
devspaces/devspaces-rhel9-operator \
7777
devspaces/devspaces-operator-bundle \
78-
devspaces/dashboard-rhel8 \
78+
devspaces/dashboard-rhel9 \
7979
\
80-
devspaces/idea-rhel8 \
81-
devspaces/imagepuller-rhel8 \
82-
devspaces/machineexec-rhel8 \
83-
devspaces/pluginregistry-rhel8 \
84-
devspaces/server-rhel8 \
80+
devspaces/idea-rhel9 \
81+
devspaces/imagepuller-rhel9 \
82+
devspaces/machineexec-rhel9 \
83+
devspaces/pluginregistry-rhel9 \
84+
devspaces/server-rhel9 \
8585
\
86-
devspaces/traefik-rhel8 \
87-
devspaces/udi-rhel8 \
86+
devspaces/traefik-rhel9 \
87+
devspaces/udi-rhel9 \
8888
"
8989

9090
# 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:
145145
$0 -b ${DWNSTM_BRANCH} --arches | use default list of DS images in RHEC Prod; show arches
146146
147147
$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
148-
$0 -c devspaces/code-rhel8 --quay | check latest tag for specific Quay image(s), with branch = ${DWNSTM_BRANCH}
148+
$0 -c devspaces/code-rhel9 --quay | check latest tag for specific Quay image(s), with branch = ${DWNSTM_BRANCH}
149149
$0 -c devspaces-operator --osbs | check an image from OSBS
150-
$0 -c devspaces-devspaces-rhel8-operator --nvr | check an NVR from OSBS
150+
$0 -c devspaces-devspaces-rhel9-operator --nvr | check an NVR from OSBS
151151
$0 -c ubi7-minimal -c ubi8-minimal --osbs -n 3 --tag . | check OSBS registry; show all tags; show 3 tags per container
152152
$0 -c 'devtools/go-toolset-rhel7 ubi7/go-toolset' --tag 1.1* | check RHEC prod registry; show 1.1* tags (exclude latest and -sources)
153153
$0 -c pivotaldata/centos --docker --dockerfile | check docker registry; show Dockerfile contents (requires dfimage)
@@ -242,9 +242,9 @@ if [[ ${REGISTRY} != "" ]]; then
242242
REGISTRYPRE="${REGISTRY##*://}/"
243243
if [[ ${REGISTRY} == *"registry-proxy.engineering.redhat.com"* ]]; then
244244
if [[ ${CONTAINERS} == "" ]] || [[ ${CONTAINERS} == "${DS_CONTAINERS}" ]]; then
245-
CONTAINERS="${DS_CONTAINERS}"; CONTAINERS=${CONTAINERS//devspaces-3-rhel8-/}; CONTAINERS="${CONTAINERS//devspaces\//devspaces-}"
245+
CONTAINERS="${DS_CONTAINERS}"; CONTAINERS=${CONTAINERS//devspaces-3-rhel9-/}; CONTAINERS="${CONTAINERS//devspaces\//devspaces-}"
246246
CONTAINERS="${CONTAINERS//devspaces-devspaces/devspaces}"
247-
CONTAINERS="${CONTAINERS/devspaces-rhel8-operator/devspaces-operator}"
247+
CONTAINERS="${CONTAINERS/devspaces-rhel9-operator/devspaces-operator}"
248248
fi
249249
elif [[ ${REGISTRY} == *"quay.io"* ]]; then
250250
searchTag=":${latestNext}"
@@ -294,7 +294,7 @@ if [[ ${SHOWNVR} -eq 1 ]]; then
294294
for containername in ${CONTAINERS}; do
295295
(( c = c + 1 ))
296296
# NEW: devspaces/devspaces-operator-bundle -> devspaces-operator-bundle
297-
# NEW: devspaces/devspaces-rhel8-operator -> devspaces-rhel8-operator
297+
# NEW: devspaces/devspaces-rhel9-operator -> devspaces-rhel9-operator
298298
containername="${containername/devspaces-/}"
299299
if [[ ${VERBOSE} -eq 1 ]]; then
300300
# shellcheck disable=SC2028
@@ -445,7 +445,7 @@ for URLfrag in $CONTAINERS; do
445445
QUAYDEST="${REGISTRYPRE}${URLfrag}"; QUAYDEST=${QUAYDEST##*devspaces-} # udi or operator
446446
# special case for the operator and bundle images, which don't follow the same pattern in osbs as quay
447447
if [[ ${QUAYDEST} == "operator-bundle" ]]; then QUAYDEST="devspaces-operator-bundle"; fi
448-
if [[ ${QUAYDEST} == "operator" ]]; then QUAYDEST="devspaces-rhel8-operator"; fi
448+
if [[ ${QUAYDEST} == "operator" ]]; then QUAYDEST="devspaces-rhel9-operator"; fi
449449
QUAYDEST="quay.io/devspaces/${QUAYDEST}"
450450

451451
if [[ $(skopeo --insecure-policy inspect docker://${QUAYDEST}:${LATESTTAG} 2>&1) == *"Error"* ]] || [[ ${PUSHTOQUAYFORCE} -eq 1 ]]; then

‎product/getTagForImage.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ usage () {
77
Usage:
88
$0 [image1] [image2] [image3] ... [-t show container names, sorted]
99
Examples:
10-
$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
10+
$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
1111
$0 \$(cat LATEST_IMAGES) -s
1212
"
1313
exit
@@ -31,11 +31,11 @@ for d in $images; do
3131
c="";
3232
c="${d%:*}" # trim off the tag
3333
c="${c##*/}" # trim repo and org
34-
c="${c##*devspaces-3-rhel8-}" # trim devspaces-3-rhel-9 prefix
35-
c="${c/-rhel8/}" # trim container midfix
34+
c="${c##*devspaces-3-rhel9-}" # trim devspaces-3-rhel-9 prefix
35+
c="${c/-rhel9/}" # trim container midfix
3636
c="${c##*devspaces-}" # trim container prefix
3737
c="${c%%-container-*}" # trim container suffix
38-
c="${c%%-rhel8}" # trim container suffix
38+
c="${c%%-rhel9}" # trim container suffix
3939
else
4040
(( c = c + 1 ))
4141
fi

‎product/getTagForSHA.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ checkImage () {
5454
if [[ $URL ]]; then
5555
container=${URL}
5656
container=${image}:${container##*/images/}
57-
# replace quay.io/devspaces/devspaces-rhel8-operator:3.4:3.4-22 with quay.io/devspaces/devspaces-rhel8-operator:3.4-22
57+
# replace quay.io/devspaces/devspaces-rhel9-operator:3.4:3.4-22 with quay.io/devspaces/devspaces-rhel9-operator:3.4-22
5858
container=$(echo "$container" | sed -r -e "s@:[0-9.]+:@:@")
5959
if [[ $QUIET -eq 0 ]]; then echo "Got $container"; else echo "$container"; fi
6060
checkImage_result="true"

‎product/manifest/get-3rd-party-deps-manifests.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,9 +158,9 @@ if [[ ${phases} == *"1"* ]]; then
158158
devspaces-server \
159159
; do
160160
if [[ $d == "devspaces" ]]; then
161-
containerName=${d##containers/}-server-rhel8-container
161+
containerName=${d##containers/}-server-rhel9-container
162162
else
163-
containerName=${d##containers/}-rhel8-container
163+
containerName=${d##containers/}-rhel9-container
164164
fi
165165
# echo $containerName
166166
log ""

‎product/manifest/get-3rd-party-deps-rpms.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ function loadNVRlog() {
8383
MANIFEST_FILE2="$2"
8484
ARCH="$3"
8585
# shellcheck disable=SC2001
86-
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#")
86+
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#")
8787
# log ""
8888
log " ${URL}"
8989

‎product/manifest/get-3rd-party-sources.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ if [[ ${phases} == *"1"* ]]; then
145145
# shellcheck disable=SC2013
146146
for d in $(sort "${WORKSPACE}"/NVRs.txt); do
147147
NVR=${d}
148-
SOURCES_DIR=${d%-container-*}; SOURCES_DIR=${SOURCES_DIR/-rhel8}; # echo $SOURCES_DIR
148+
SOURCES_DIR=${d%-container-*}; SOURCES_DIR=${SOURCES_DIR/-rhel9}; # echo $SOURCES_DIR
149149
echo "git clone --depth 1 --branch ${MIDSTM_BRANCH} to ${SOURCES_DIR} ..."
150150
git clone --depth 1 --branch "${MIDSTM_BRANCH}" "ssh://${pduser}@pkgs.devel.redhat.com/containers/${SOURCES_DIR}" "${SOURCES_DIR}" || true
151151
cd "${SOURCES_DIR}" && git checkout "${MIDSTM_BRANCH}" -q && cd ..

‎product/rhpkg-container-build.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@ fi
9292
# "2.0"
9393
# ],
9494
# "pull": [
95-
# "registry-proxy.engineering.redhat.com/rh-osbs/devspaces-pluginregistry-rhel8@sha256:85c89a1d9e382bebe70f4204f05f06f0fc2b9c76f1c3ca2983c17989b92239fe",
96-
# "registry-proxy.engineering.redhat.com/rh-osbs/devspaces-pluginregistry-rhel8:2.0-212"
95+
# "registry-proxy.engineering.redhat.com/rh-osbs/devspaces-pluginregistry-rhel9@sha256:85c89a1d9e382bebe70f4204f05f06f0fc2b9c76f1c3ca2983c17989b92239fe",
96+
# "registry-proxy.engineering.redhat.com/rh-osbs/devspaces-pluginregistry-rhel9:2.0-212"
9797
# ],
9898
# "tags": [
9999
# "2.0-212"
@@ -123,7 +123,7 @@ if [[ $REPOS ]] && [[ ${VERBOSE} -eq 1 ]]; then echo "[INFO] #2 Console parser s
123123
# OPTION 2/3
124124
if [[ ! ${REPOS} ]] || [[ ${REPOS} == " " ]]; then
125125
# for scratch builds look for this line:
126-
# ^ADD Dockerfile-devspaces-server-rhel8-2.0-scratch-89319-20191122035915 /root/buildinfo/Dockerfile-devspaces-server-rhel8-2.0-scratch-89319-20191122035915
126+
# ^ADD Dockerfile-devspaces-server-rhel9-2.0-scratch-89319-20191122035915 /root/buildinfo/Dockerfile-devspaces-server-rhel9-2.0-scratch-89319-20191122035915
127127
echo "REPO_PATH=\"$(grep --text -E "^ADD Dockerfile-devspaces-" "${LOGFILE}" | sed -r -e "s@\[[TZ0123456789.:-]+\]@@" \
128128
| sed -r -e "s@^ADD Dockerfile-devspaces-(.+) /root/.+@\1@" | sort -u | tr "\n\r" " " )\"" \
129129
| tee "${WORKSPACE}"/build_desc.txt
@@ -184,7 +184,7 @@ TASK_URL="$(grep --text "Task info: https://brewweb.engineering.redhat.com/brew/
184184
TASK_ID="${TASK_URL##*=}"
185185
BUILD_DESC=$(echo $REPO_PATH | sed -r \
186186
-e 's#registry-proxy.engineering.redhat.com/rh-osbs/devspaces-#quay.io/devspaces/#g' \
187-
-e 's#(quay.io/devspaces/.+-rhel8:[0-9.-]+) *#<a href="https://\1">\1</a> #g' \
187+
-e 's#(quay.io/devspaces/.+-rhel9:[0-9.-]+) *#<a href="https://\1">\1</a> #g' \
188188
-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'
189189
)
190190
BUILD_RESULT="SUCCESS"

‎product/updateBaseImages.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ for d in $(find "${WORKDIR}/" -maxdepth "${MAXDEPTH}" -name "${DOCKERFILE}" | so
202202
echo "# Checking ${d} ..."
203203
# pull latest commits
204204
if [[ -d ${d%%/${DOCKERFILE}} ]]; then pushd "${d%%/${DOCKERFILE}}" >/dev/null; pushedIn=1; fi
205-
if [[ "${d%/${DOCKERFILE}}" == *"-rhel8" ]]; then
205+
if [[ "${d%/${DOCKERFILE}}" == *"-rhel9" ]]; then
206206
BRANCHUSED=${SOURCES_BRANCH/rhel-7/rhel-8/rhel-9}
207207
else
208208
BRANCHUSED=${SOURCES_BRANCH}

0 commit comments

Comments
 (0)