Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Jul 14, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .ci/cico_updates_openshift.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}

Expand All @@ -33,7 +32,9 @@ runTests() {
waitWorkspaceStart

# Dev Workspace controller tests
enableDevWorkspaceEngine
waitDevWorkspaceControllerStarted
waitEclipseCheDeployed ${LAST_PACKAGE_VERSION}

sleep 10s
createWorkspaceDevWorkspaceController
Expand Down
6 changes: 5 additions & 1 deletion .ci/oci-multi-host.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -43,7 +45,9 @@ runTests() {
waitWorkspaceStart

# Dev Workspace controller tests
enableDevWorkspaceEngine
waitDevWorkspaceControllerStarted
waitEclipseCheDeployed "next"

sleep 10s
createWorkspaceDevWorkspaceController
Expand Down
6 changes: 5 additions & 1 deletion .ci/oci-single-host.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -43,7 +45,9 @@ runTests() {
waitWorkspaceStart

# Dev Workspace controller tests
enableDevWorkspaceEngine
waitDevWorkspaceControllerStarted
waitEclipseCheDeployed "next"

sleep 10s
createWorkspaceDevWorkspaceController
Expand Down
4 changes: 4 additions & 0 deletions .github/bin/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}}}'
}