From 96b492b0fed53974f9dbe291405f140911df8ecd Mon Sep 17 00:00:00 2001 From: Flavius Lacatusu Date: Fri, 14 May 2021 13:43:40 +0200 Subject: [PATCH 1/3] Add devworkspace tests in single-host mode Signed-off-by: Flavius Lacatusu --- .ci/{oci-nightly-olm.sh => oci-multi-host.sh} | 12 ------------ .ci/oci-single-host.sh | 12 ++++++++++++ 2 files changed, 12 insertions(+), 12 deletions(-) rename .ci/{oci-nightly-olm.sh => oci-multi-host.sh} (84%) diff --git a/.ci/oci-nightly-olm.sh b/.ci/oci-multi-host.sh similarity index 84% rename from .ci/oci-nightly-olm.sh rename to .ci/oci-multi-host.sh index 1169055c1..66d477fa2 100755 --- a/.ci/oci-nightly-olm.sh +++ b/.ci/oci-multi-host.sh @@ -39,18 +39,6 @@ runTests() { provisionOAuth startNewWorkspace waitWorkspaceStart - - # Dev Workspace controller tests - deployDevWorkspaceController - waitDevWorkspaceControllerStarted - - sleep 10s - createWorkspaceDevWorkspaceController - waitWorkspaceStartedDevWorkspaceController - - sleep 10s - createWorkspaceDevWorkspaceCheOperator - waitWorkspaceStartedDevWorkspaceController } initDefaults diff --git a/.ci/oci-single-host.sh b/.ci/oci-single-host.sh index b42953996..98b9e2b87 100755 --- a/.ci/oci-single-host.sh +++ b/.ci/oci-single-host.sh @@ -40,6 +40,18 @@ runTests() { provisionOAuth startNewWorkspace waitWorkspaceStart + + # Dev Workspace controller tests + deployDevWorkspaceController + waitDevWorkspaceControllerStarted + + sleep 10s + createWorkspaceDevWorkspaceController + waitWorkspaceStartedDevWorkspaceController + + sleep 10s + createWorkspaceDevWorkspaceCheOperator + waitWorkspaceStartedDevWorkspaceController } initDefaults From b518f32f0f452786de29db0fde12e8ea3c2976b3 Mon Sep 17 00:00:00 2001 From: Flavius Lacatusu Date: Fri, 14 May 2021 16:10:25 +0200 Subject: [PATCH 2/3] Revert script Signed-off-by: Flavius Lacatusu --- .ci/oci-multi-host.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.ci/oci-multi-host.sh b/.ci/oci-multi-host.sh index 66d477fa2..bcf97df8e 100755 --- a/.ci/oci-multi-host.sh +++ b/.ci/oci-multi-host.sh @@ -39,6 +39,19 @@ runTests() { provisionOAuth startNewWorkspace waitWorkspaceStart + + # Dev Workspace controller tests + deployDevWorkspaceController + waitDevWorkspaceControllerStarted + + sleep 10s + createWorkspaceDevWorkspaceController + waitWorkspaceStartedDevWorkspaceController + + sleep 10s + createWorkspaceDevWorkspaceCheOperator + waitWorkspaceStartedDevWorkspaceController + } initDefaults From 7573d69fa83352733d6c8b1374070cbc58428454 Mon Sep 17 00:00:00 2001 From: Flavius Lacatusu Date: Mon, 17 May 2021 15:41:37 +0200 Subject: [PATCH 3/3] Fix workspace startup Signed-off-by: Flavius Lacatusu --- .github/bin/common.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/bin/common.sh b/.github/bin/common.sh index e8eb1585d..3311f39f3 100755 --- a/.github/bin/common.sh +++ b/.github/bin/common.sh @@ -382,7 +382,15 @@ waitDevWorkspaceControllerStarted() { } createWorkspaceDevWorkspaceController () { - oc apply -f https://raw.githubusercontent.com/devfile/devworkspace-operator/main/samples/flattened_theia-next.yaml -n ${NAMESPACE} + echo -e "[INFO] Waiting for webhook-server to be running" + CURRENT_TIME=$(date +%s) + ENDTIME=$(($CURRENT_TIME + 180)) + while [ $(date +%s) -lt $ENDTIME ]; do + if oc apply -f https://raw.githubusercontent.com/che-incubator/devworkspace-che-operator/main/samples/flattened_theia-nodejs.yaml -n ${NAMESPACE}; then + break + fi + sleep 10 + done } waitWorkspaceStartedDevWorkspaceController() {