Merge pull request #920 from eclipse-che/dwo_engine_tests

fix: Start workspace with devfilev2 when devworkspace is enabled in our e2e tests

.ci/cico_updates_openshift.sh

@@ -21,7 +21,6 @@ source "${OPERATOR_REPO}"/.github/bin/oauth-provision.sh
 trap "catchFinish" EXIT SIGINT
 
 overrideDefaults() {
-  export DEV_WORKSPACE_ENABLE="true"
   export CHE_EXPOSURE_STRATEGY="single-host"
 }
 
@@ -33,7 +32,9 @@ runTests() {
   waitWorkspaceStart
 
   # Dev Workspace controller tests
+  enableDevWorkspaceEngine
   waitDevWorkspaceControllerStarted
+  waitEclipseCheDeployed ${LAST_PACKAGE_VERSION}
 
   sleep 10s
   createWorkspaceDevWorkspaceController

.ci/oci-multi-host.sh

@@ -31,10 +31,12 @@ overrideDefaults() {
   # CI_CHE_OPERATOR_IMAGE it is che operator image builded in openshift CI job workflow. More info about how works image dependencies in ci:https://github.com/openshift/ci-tools/blob/master/TEMPLATES.md#parameters-available-to-templates
   export OPERATOR_IMAGE=${CI_CHE_OPERATOR_IMAGE}
   export CHE_EXPOSURE_STRATEGY="multi-host"
-  export DEV_WORKSPACE_ENABLE="true"
 }
 
 runTests() {
+    # create namespace
+    oc create namespace eclipse-che || true
+
     # Deploy Eclipse Che applying CR
     applyOlmCR
     waitEclipseCheDeployed "next"
@@ -43,7 +45,9 @@ runTests() {
     waitWorkspaceStart
 
     # Dev Workspace controller tests
+    enableDevWorkspaceEngine
     waitDevWorkspaceControllerStarted
+    waitEclipseCheDeployed "next"
 
     sleep 10s
     createWorkspaceDevWorkspaceController

.ci/oci-single-host.sh

@@ -31,10 +31,12 @@ overrideDefaults() {
   # CI_CHE_OPERATOR_IMAGE it is che operator image builded in openshift CI job workflow. More info about how works image dependencies in ci:https://github.com/openshift/ci-tools/blob/master/TEMPLATES.md#parameters-available-to-templates
   export OPERATOR_IMAGE=${CI_CHE_OPERATOR_IMAGE}
   export CHE_EXPOSURE_STRATEGY="single-host"
-  export DEV_WORKSPACE_ENABLE="true"
 }
 
 runTests() {
+    # create namespace
+    oc create namespace eclipse-che || true
+
     # Deploy Eclipse Che applying CR
     applyOlmCR
     waitEclipseCheDeployed "next"
@@ -43,7 +45,9 @@ runTests() {
     waitWorkspaceStart
 
     # Dev Workspace controller tests
+    enableDevWorkspaceEngine
     waitDevWorkspaceControllerStarted
+    waitEclipseCheDeployed "next"
 
     sleep 10s
     createWorkspaceDevWorkspaceController

.github/bin/common.sh

@@ -477,3 +477,7 @@ waitWorkspaceStartedDevWorkspaceController() {
 createWorkspaceDevWorkspaceCheOperator() {
   oc apply -f https://raw.githubusercontent.com/che-incubator/devworkspace-che-operator/main/samples/flattened_theia-nodejs.yaml -n ${NAMESPACE}
 }
+
+enableDevWorkspaceEngine() {
+  kubectl patch checluster/eclipse-che -n ${NAMESPACE} --type=merge -p '{"spec":{"devWorkspace":{"enable": true}}}'
+}