Skip to content

Commit 52e862b

Browse files
committed
Look at checode logs 5 times before failing
Signed-off-by: Mario Loriedo <[email protected]>
1 parent 9d30a66 commit 52e862b

File tree

2 files changed

+36
-13
lines changed

2 files changed

+36
-13
lines changed

README.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,19 @@ A list of `Dockerfiles`, using different base images, to customize Eclipe Che an
1515
| ubi8 | [Dockerfile](https://github.com/l0rd/cloud-dev-images/blob/main/ubi8/Dockerfile) | [![build](https://github.com/l0rd/cloud-dev-images/actions/workflows/ubi8-build.yaml/badge.svg)](https://github.com/l0rd/cloud-dev-images/actions/workflows/ubi8-build.yaml) | [![build](https://github.com/l0rd/cloud-dev-images/actions/workflows/ubi8-vscode-startup.yaml/badge.svg)](https://github.com/l0rd/cloud-dev-images/actions/workflows/ubi8-vscode-startup.yaml) | [![dogfooding](https://img.shields.io/static/v1?label=dogfooding%20%20%20%20&message=vscode&logo=eclipseche&color=FDB940&labelColor=525C86)](https://che-dogfooding.apps.che-dev.x6e0.p1.openshiftapps.com/#https://github.com/l0rd/cloud-dev-images?image=quay.io/mloriedo/cloud-dev-images:ubi8&che-editor=che-incubator/che-code/insiders) [![devsandbox](https://img.shields.io/static/v1?label=dev%20sandbox&message=vscode&logo=eclipseche&color=FDB940&labelColor=525C86)](https://workspaces.openshift.com/#https://github.com/l0rd/cloud-dev-images?image=quay.io/mloriedo/cloud-dev-images:ubi8&che-editor=che-incubator/che-code/insiders) |
1616
| ubi9 | [Dockerfile](https://github.com/l0rd/cloud-dev-images/blob/main/ubi9/Dockerfile) | [![build](https://github.com/l0rd/cloud-dev-images/actions/workflows/ubi9-build.yaml/badge.svg)](https://github.com/l0rd/cloud-dev-images/actions/workflows/ubi9-build.yaml) | [![build](https://github.com/l0rd/cloud-dev-images/actions/workflows/ubi9-vscode-startup.yaml/badge.svg)](https://github.com/l0rd/cloud-dev-images/actions/workflows/ubi9-vscode-startup.yaml) | [![dogfooding](https://img.shields.io/static/v1?label=dogfooding%20%20%20%20&message=vscode&logo=eclipseche&color=FDB940&labelColor=525C86)](https://che-dogfooding.apps.che-dev.x6e0.p1.openshiftapps.com/#https://github.com/l0rd/cloud-dev-images?image=quay.io/mloriedo/cloud-dev-images:ubi9&che-editor=che-incubator/che-code/insiders) [![devsandbox](https://img.shields.io/static/v1?label=dev%20sandbox&message=vscode&logo=eclipseche&color=FDB940&labelColor=525C86)](https://workspaces.openshift.com/#https://github.com/l0rd/cloud-dev-images?image=quay.io/mloriedo/cloud-dev-images:ubi9&che-editor=che-incubator/che-code/insiders) |
1717
| ubuntu | [Dockerfile](https://github.com/l0rd/cloud-dev-images/blob/main/ubuntu/Dockerfile) | [![build](https://github.com/l0rd/cloud-dev-images/actions/workflows/ubuntu-build.yaml/badge.svg)](https://github.com/l0rd/cloud-dev-images/actions/workflows/ubuntu-build.yaml) | [![build](https://github.com/l0rd/cloud-dev-images/actions/workflows/ubuntu-vscode-startup.yaml/badge.svg)](https://github.com/l0rd/cloud-dev-images/actions/workflows/ubuntu-vscode-startup.yaml) | [![dogfooding](https://img.shields.io/static/v1?label=dogfooding%20%20%20%20&message=vscode&logo=eclipseche&color=FDB940&labelColor=525C86)](https://che-dogfooding.apps.che-dev.x6e0.p1.openshiftapps.com/#https://github.com/l0rd/cloud-dev-images?image=quay.io/mloriedo/cloud-dev-images:ubuntu&che-editor=che-incubator/che-code/insiders) [![devsandbox](https://img.shields.io/static/v1?label=dev%20sandbox&message=vscode&logo=eclipseche&color=FDB940&labelColor=525C86)](https://workspaces.openshift.com/#https://github.com/l0rd/cloud-dev-images?image=quay.io/mloriedo/cloud-dev-images:ubuntu&che-editor=che-incubator/che-code/insiders) |
18+
19+
## How to run the tests
20+
21+
### Requirements
22+
23+
- An OpenShift cluster with the DevWorkspace Operator (developer sandbox)
24+
- Linux or macOS with `oc` and `kubectl`
25+
26+
### Running the tests
27+
28+
```bash
29+
export CLUSTER_URL="https://api.rm1.0a51.p1.openshiftapps.com:6443"
30+
export CLUSTER_TOKEN="<token>"
31+
export EDITOR_IMAGE="quay.io/che-incubator/che-code:insiders"
32+
./run-tests.sh
33+
```

__tests__/test-editor-startup-in-image.sh

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -74,18 +74,25 @@ echo "##############################################"
7474
echo "## ##"
7575
echo "## READ VS CODE ENTRYPOINT LOGS ##"
7676
echo "## LOOK FOR STRING ##"
77-
echo "## \"Web UI available at ...\" ##"
77+
echo "## \"Web UI available at ...\" ##"
7878
echo "## ##"
7979
echo "##############################################"
80-
VS_CODE_LOGS=$(kubectl exec -it "${POD}" -c dev-tooling -- /bin/sh -c "cat /checode/entrypoint-logs.txt")
81-
export VS_CODE_LOGS
82-
if grep "Web UI available at http://localhost:3100" <<< "${VS_CODE_LOGS}"; then
83-
echo "SUCCESS: Found expected string in VS Code entrypoint logs"
84-
else
85-
echo "FAILURE: Did not find expected string in VS Code entrypoint logs"
86-
IMAGE_TAG=${CLOUD_DEV_IMAGE//*:/}
87-
export IMAGE_TAG
88-
echo "${VS_CODE_LOGS}" > "${SCRIPT_DIR}"/logs/"${IMAGE_TAG}"_vscode_entrypoint_logs.txt
89-
echo "Look at VS Code startup logs in ${SCRIPT_DIR}/logs/${IMAGE_TAG}_vscode_entrypoint_logs.txt"
90-
exit 1
91-
fi
80+
counter=1
81+
while [ $counter -le 5 ]; do
82+
VS_CODE_LOGS=$(kubectl exec -it "${POD}" -c dev-tooling -- /bin/sh -c "cat /checode/entrypoint-logs.txt")
83+
export VS_CODE_LOGS
84+
if grep "Web UI available at http://localhost:3100" <<< "${VS_CODE_LOGS}"; then
85+
echo "SUCCESS: Found expected string in VS Code entrypoint logs"
86+
exit 0
87+
else
88+
sleep 1
89+
((counter++))
90+
fi
91+
done
92+
93+
echo "FAILURE: Did not find expected string in VS Code entrypoint logs"
94+
IMAGE_TAG=${CLOUD_DEV_IMAGE//*:/}
95+
export IMAGE_TAG
96+
echo "${VS_CODE_LOGS}" > "${SCRIPT_DIR}"/logs/"${IMAGE_TAG}"_vscode_entrypoint_logs.txt
97+
echo "Look at VS Code startup logs in ${SCRIPT_DIR}/logs/${IMAGE_TAG}_vscode_entrypoint_logs.txt"
98+
exit 1

0 commit comments

Comments
 (0)