Skip to content

[e2e] Support and fixes for mk2 e2e tests #16990

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

Merged
merged 5 commits into from
Mar 24, 2023
Merged

[e2e] Support and fixes for mk2 e2e tests #16990

merged 5 commits into from
Mar 24, 2023

Conversation

WVerlaek
Copy link
Member

@WVerlaek WVerlaek commented Mar 23, 2023

Description

  • Support running e2e tests against ws-manager-mk2 by setting the WS_MANAGER_MK2=true env var
  • Fixes for mk2 to pass failing tests
  • Add boolean to Github Actions workflow to run tests against mk2

Related Issue(s)

How to test

  • Run e2e tests with(out) WS_MANAGER_MK2=true
  • Trigger GHA from this branch with the mk2 boolean enabled/disabled

Release Notes

NONE

Documentation

Build Options:

  • /werft with-werft
    Run the build with werft instead of GHA
  • leeway-no-cache
  • /werft no-test
    Run Leeway with --dont-test
Publish Options
  • /werft publish-to-npm
  • /werft publish-to-jb-marketplace
Installer Options
  • with-ee-license
  • with-dedicated-emulation
  • with-ws-manager-mk2
  • workspace-feature-flags
    Add desired feature flags to the end of the line above, space separated

Preview Environment Options:

  • /werft with-local-preview
    If enabled this will build install/preview
  • /werft with-preview
  • /werft with-large-vm
  • /werft with-gce-vm
    If enabled this will create the environment on GCE infra
  • /werft with-integration-tests=all
    Valid options are all, workspace, webapp, ide, jetbrains, vscode, ssh

@@ -1050,7 +1057,7 @@ func watchStopWorkspaceAndFindSnapshot(t *testing.T, ctx context.Context, instan
if lastStatus.Conditions.HeadlessTaskFailed != "" {
return "", nil, errors.New("unexpected HeadlessTaskFailed condition")
}
if lastStatus == nil || lastStatus.Conditions == nil || lastStatus.Conditions.VolumeSnapshot == nil {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

VolumeSnapshot isn't set in mk2

Comment on lines -32 to 35
for var in WITH_WS_MANAGER_MK2 WITH_DEDICATED_EMU WITH_EE_LICENSE ANALYTICS WORKSPACE_FEATURE_FLAGS; do
for var in WSMANAGER_MK2 WITH_DEDICATED_EMU WITH_EE_LICENSE ANALYTICS WORKSPACE_FEATURE_FLAGS; do
input_var="INPUT_${var}"
if [[ -n "${!input_var:-}" ]];then
export GITPOD_${var}=${!input_var}
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

deploy-gitpod.sh is expecting GITPOD_WSMANAGER_MK2

@@ -366,7 +366,8 @@ func (wsm *WorkspaceManagerServer) StopWorkspace(ctx context.Context, req *wsman
ws.Status.SetCondition(workspacev1.NewWorkspaceConditionStoppedByRequest(gracePeriod.String()))
return nil
})
if err != nil {
// Ignore NotFound errors, workspace has already been stopped.
if err != nil && status.Code(err) != codes.NotFound {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

now matches mk1's behaviour

@WVerlaek WVerlaek marked this pull request as ready for review March 23, 2023 16:35
@WVerlaek WVerlaek requested a review from a team March 23, 2023 16:35
@github-actions github-actions bot added the team: workspace Issue belongs to the Workspace team label Mar 23, 2023
@geropl
Copy link
Member

geropl commented Mar 24, 2023

/hold
blocking the Q

@kylos101
Copy link
Contributor

/unhold
choo-choo!

@kylos101
Copy link
Contributor

/hold

still blocking! ugh.

@kylos101 kylos101 force-pushed the wv/mk2-e2e-tests-2 branch from f386dfe to 0bac28a Compare March 24, 2023 22:36
@kylos101
Copy link
Contributor

kylos101 commented Mar 24, 2023

Tide is yielding this error. 🤔 @vulkoingim @mads-hartmann , any ideas?

Restarting tide did not help.

Rebasing with main. 🤷

@roboquat roboquat merged commit ea5c7a6 into main Mar 24, 2023
@roboquat roboquat deleted the wv/mk2-e2e-tests-2 branch March 24, 2023 22:42
@kylos101
Copy link
Contributor

😅

@roboquat roboquat added deployed: workspace Workspace team change is running in production deployed Change is completely running in production labels Mar 28, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
deployed: workspace Workspace team change is running in production deployed Change is completely running in production release-note-none size/L team: workspace Issue belongs to the Workspace team
Projects
No open projects
Status: Done
Development

Successfully merging this pull request may close these issues.

5 participants