From 76d3cd588a2c7ed111c402a7d27e4bc3db793c3b Mon Sep 17 00:00:00 2001 From: David Kwon Date: Tue, 29 Jul 2025 14:33:21 -0400 Subject: [PATCH 1/7] Remove unused chectl flag Signed-off-by: David Kwon --- .ci/oci-devworkspace-happy-path.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.ci/oci-devworkspace-happy-path.sh b/.ci/oci-devworkspace-happy-path.sh index 75ff93673..8c8dfaab3 100755 --- a/.ci/oci-devworkspace-happy-path.sh +++ b/.ci/oci-devworkspace-happy-path.sh @@ -42,8 +42,7 @@ deployChe() { -p openshift \ --batch \ --telemetry=off \ - --installer=operator \ - --workspace-engine=dev-workspace + --installer=operator } deployDWO From 5f1880b344ab5f789c14119ec36454a161fc001d Mon Sep 17 00:00:00 2001 From: David Kwon Date: Tue, 29 Jul 2025 17:32:58 -0400 Subject: [PATCH 2/7] Increase podreadytimeout Signed-off-by: David Kwon --- .ci/oci-devworkspace-happy-path.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.ci/oci-devworkspace-happy-path.sh b/.ci/oci-devworkspace-happy-path.sh index 8c8dfaab3..355a62078 100755 --- a/.ci/oci-devworkspace-happy-path.sh +++ b/.ci/oci-devworkspace-happy-path.sh @@ -42,6 +42,7 @@ deployChe() { -p openshift \ --batch \ --telemetry=off \ + --k8spodreadytimeout=180000 \ --installer=operator } From f38176c246996da10cc6ec3164f53f240de7afed Mon Sep 17 00:00:00 2001 From: David Kwon Date: Tue, 29 Jul 2025 22:14:50 -0400 Subject: [PATCH 3/7] Increase podreadytimeout Signed-off-by: David Kwon --- .ci/oci-devworkspace-happy-path.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/oci-devworkspace-happy-path.sh b/.ci/oci-devworkspace-happy-path.sh index 355a62078..fa044f6ea 100755 --- a/.ci/oci-devworkspace-happy-path.sh +++ b/.ci/oci-devworkspace-happy-path.sh @@ -42,7 +42,7 @@ deployChe() { -p openshift \ --batch \ --telemetry=off \ - --k8spodreadytimeout=180000 \ + --k8spodreadytimeout=240000 \ --installer=operator } From a2b5c4ea1373169fb752db78b182465f95a6f135 Mon Sep 17 00:00:00 2001 From: David Kwon Date: Wed, 30 Jul 2025 15:08:38 -0400 Subject: [PATCH 4/7] Set podwaittimeout and podreadytimeout Signed-off-by: David Kwon --- .ci/oci-devworkspace-happy-path.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.ci/oci-devworkspace-happy-path.sh b/.ci/oci-devworkspace-happy-path.sh index fa044f6ea..fc650dc04 100755 --- a/.ci/oci-devworkspace-happy-path.sh +++ b/.ci/oci-devworkspace-happy-path.sh @@ -42,7 +42,8 @@ deployChe() { -p openshift \ --batch \ --telemetry=off \ - --k8spodreadytimeout=240000 \ + --k8spodwaittimeout=6000000 \ + --k8spodreadytimeout=6000000 \ --installer=operator } From b6c668e3a7571dbe9a453bcf036323c37845439d Mon Sep 17 00:00:00 2001 From: David Kwon Date: Thu, 31 Jul 2025 18:24:41 -0400 Subject: [PATCH 5/7] Add --skip-devworkspace-operator since DWO is already installed Signed-off-by: David Kwon --- .ci/oci-devworkspace-happy-path.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.ci/oci-devworkspace-happy-path.sh b/.ci/oci-devworkspace-happy-path.sh index fc650dc04..720fc3f1f 100755 --- a/.ci/oci-devworkspace-happy-path.sh +++ b/.ci/oci-devworkspace-happy-path.sh @@ -42,6 +42,7 @@ deployChe() { -p openshift \ --batch \ --telemetry=off \ + --skip-devworkspace-operator \ --k8spodwaittimeout=6000000 \ --k8spodreadytimeout=6000000 \ --installer=operator From 0196cd98fd1f86db3dd5caa64cd62994fbf581fd Mon Sep 17 00:00:00 2001 From: David Kwon Date: Thu, 31 Jul 2025 18:31:04 -0400 Subject: [PATCH 6/7] Remove unused flag Signed-off-by: David Kwon --- .ci/oci-devworkspace-happy-path.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.ci/oci-devworkspace-happy-path.sh b/.ci/oci-devworkspace-happy-path.sh index 720fc3f1f..7b2167534 100755 --- a/.ci/oci-devworkspace-happy-path.sh +++ b/.ci/oci-devworkspace-happy-path.sh @@ -44,8 +44,7 @@ deployChe() { --telemetry=off \ --skip-devworkspace-operator \ --k8spodwaittimeout=6000000 \ - --k8spodreadytimeout=6000000 \ - --installer=operator + --k8spodreadytimeout=6000000 } deployDWO From 1bfa77ce7e51975946b4f9b41fcf4115bb92f052 Mon Sep 17 00:00:00 2001 From: David Kwon Date: Fri, 1 Aug 2025 15:40:38 -0400 Subject: [PATCH 7/7] Add jq in the e2e tests image Signed-off-by: David Kwon --- .ci/oci.Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci/oci.Dockerfile b/.ci/oci.Dockerfile index bc06ff84c..18f1715cf 100644 --- a/.ci/oci.Dockerfile +++ b/.ci/oci.Dockerfile @@ -23,8 +23,8 @@ RUN sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/*.repo && sed RUN yum install --assumeyes -d1 python3-pip nodejs gettext && \ pip3 install --upgrade pip && \ pip3 install --ignore-installed --upgrade setuptools && \ - # Install yq - pip3 install yq && \ + # Install yq and jq + pip3 install yq jq && \ # Install kubectl curl -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl && \ chmod +x ./kubectl && \