[content-service] Remove git no-single-branch flag

[aledbf]

Description

The flag --no-single-branch was introduced in https://github.com/gitpod-io/gitpod/pull/6464 in an attempt to use --filter=blob:none (which didn't make it). By checking all the existing branches, even if we use --depth=1

xref: https://github.com/gitpod-io/gitpod/issues/12682

How to test

• Open a workspace
• Trigger a prebuild and open the workspace
• No git errors should be present}
• Trigger a prebuild and check there are no issues

Release Notes

Do not check all existing git branches during the initial checkout

Werft options:

• [x] /werft with-preview
• [x] /werft with-integration-tests=workspace Valid options are all, workspace, webapp, ide

/hold

[werft-gitpod-dev-com[bot]]

started the job as gitpod-build-aledbf-git-nsb.0 because the annotations in the pull request description changed (with .werft/ from main)

[jenting]

If it's not the default branch, manually trigger prebuild failed.

Prebuild failed for system reasons. Please contact support. cannot initialize workspace: cannot initialize workspace: git initializer clone: git checkout -B prebuild-without-pvc origin/prebuild-without-pvc failed (exit status 128): fatal: 'origin/prebuild-without-pvc' is not a commit and a branch 'prebuild-wit ...

[kylos101]

Works with multi-repo too :+1:

[aledbf]

/werft run

:+1: started the job as gitpod-build-aledbf-git-nsb.5 (with .werft/ from main)

[aledbf]

@jenting please check again

[sagor999]

/hold lets merge this after the new cluster has been deployed :pray:

[werft-gitpod-dev-com[bot]]

started the job as gitpod-build-aledbf-git-nsb.12 because the annotations in the pull request description changed (with .werft/ from main)

[werft-gitpod-dev-com[bot]]

started the job as gitpod-build-aledbf-git-nsb.13 because the annotations in the pull request description changed (with .werft/ from main)

[werft-gitpod-dev-com[bot]]

started the job as gitpod-build-aledbf-git-nsb.14 because the annotations in the pull request description changed (with .werft/ from main)

[kylos101]

FYI, for integration tests to run, you may need to rebase with main.

I am guessing you need https://github.com/gitpod-io/gitpod/commit/c524a001d4da47613b6b013a9e2bef9e8abb3881

The error is:

[Run integration tests] [test-ws-manager|FAIL] 1
[Run integration tests] [test-workspace] running integration for workspace - log file at /tmp/tmp.q8ghJqttKy/workspace.log
[Run integration tests] [test-workspace] go: conflicting replacements for github.com/seccomp/libseccomp-golang:
[Run integration tests] [test-workspace] 	github.com/gitpod-io/[email protected]
[Run integration tests] [test-workspace] 	github.com/gitpod-io/[email protected]
[Run integration tests] [test-workspace] use "go work edit -replace github.com/seccomp/libseccomp-golang=[override]" to resolve

[aledbf]

FYI, for integration tests to run, you may need to rebase with main.

done

[werft-gitpod-dev-com[bot]]

started the job as gitpod-build-aledbf-git-nsb.16 because the annotations in the pull request description changed (with .werft/ from main)

[kylos101]

test-workspace integration test was failing, but, that was in a prior run when we ran all tests.

I changed the description for this PR, so that we just run workspace tests, being run in: https://werft.gitpod-dev.com/job/gitpod-build-aledbf-git-nsb.16

@utam0k are the test-workspace tests still flakey? I ask because a prior run for this branch appeared to timeout. :thinking:

[sagor999]

also once all conversations are resolved, feel free to remove the hold. (not removing it myself as it will auto merge)

[kylos101]

@utam0k can you help analyze this failure?

It failed with this message, but I'm not sure where to look (expand does not have more info):

[Run integration tests] [test-workspace] FAIL
[Run integration tests] [test-workspace] FAIL	github.com/gitpod-io/gitpod/test/tests/workspace	2191.554s
[Run integration tests] [test-workspace] FAIL
[Run integration tests] /workspace
[Run integration tests] [test-workspace|FAIL] 1
[Run integration tests] 
[Run integration tests] Failed. Expand to see why
[Run integration tests|FAIL]

[utam0k]

@kylos101 Sure.

[utam0k]

I think this PR brought the broken integration tests.

@utam0k are the test-workspace tests still flakey? I ask because a prior run for this branch appeared to timeout. thinking

The test to launch gitpod from the git tag pointed to HEAD until now. This seems to have changed and now points to a hash value.

contexts_test.go:200: expected branch 'HEAD', got 'a89cab1135a2d05901ca3021d1608f24a0400932'!

I honestly don't think this change will cause any problems for users, so I think we should just fix the test. However, you should write to Changelog. https://github.com/gitpod-io/gitpod/blob/f61eacf1e8e5e0a0efb7353fe29ad57f25a93820/test/tests/workspace/contexts_test.go#L51-L54

[utam0k]

@utam0k can you help analyze this failure?

It failed with this message, but I'm not sure where to look (expand does not have more info):

[Run integration tests] [test-workspace] FAIL
[Run integration tests] [test-workspace] FAIL	github.com/gitpod-io/gitpod/test/tests/workspace	2191.554s
[Run integration tests] [test-workspace] FAIL
[Run integration tests] /workspace
[Run integration tests] [test-workspace|FAIL] 1
[Run integration tests] 
[Run integration tests] Failed. Expand to see why
[Run integration tests|FAIL]

TIPS: Please search FAIL: via your browser and you can see specific failed tests.

[kylos101]

Thanks for the heads up @utam0k !

@aledbf can you update the test @utam0k shared is failing?

[aledbf]

@aledbf can you update the https://github.com/gitpod-io/gitpod/pull/13053#issuecomment-1253118277 @utam0k shared is failing?

done

[kylos101]

Hmm, I am seeing a different test failures, but, am skeptical it is related to this PR.

@jenting are you aware of the below test being flakey?

[Run integration tests] [test-ws-manager] --- FAIL: TestOpenWorkspaceFromPrebuild (546.19s)
[Run integration tests] [test-ws-manager]     --- FAIL: TestOpenWorkspaceFromPrebuild/prebuild (546.19s)
[Run integration tests] [test-ws-manager]         --- FAIL: TestOpenWorkspaceFromPrebuild/prebuild/it_should_open_workspace_from_prebuild_successfully (546.19s)
[Run integration tests] [test-ws-manager]             --- FAIL: TestOpenWorkspaceFromPrebuild/prebuild/it_should_open_workspace_from_prebuild_successfully/classic (216.68s)
[Run integration tests] [test-ws-manager]             --- PASS: TestOpenWorkspaceFromPrebuild/prebuild/it_should_open_workspace_from_prebuild_successfully/pvc (329.51s)

[jenting]

Hmm, I am seeing a different test failures, but, am skeptical it is related to this PR.

@jenting are you aware of the below test being flakey?

[Run integration tests] [test-ws-manager] --- FAIL: TestOpenWorkspaceFromPrebuild (546.19s)

[Run integration tests] [test-ws-manager]     --- FAIL: TestOpenWorkspaceFromPrebuild/prebuild (546.19s)

[Run integration tests] [test-ws-manager]         --- FAIL: TestOpenWorkspaceFromPrebuild/prebuild/it_should_open_workspace_from_prebuild_successfully (546.19s)

[Run integration tests] [test-ws-manager]             --- FAIL: TestOpenWorkspaceFromPrebuild/prebuild/it_should_open_workspace_from_prebuild_successfully/classic (216.68s)

[Run integration tests] [test-ws-manager]             --- PASS: TestOpenWorkspaceFromPrebuild/prebuild/it_should_open_workspace_from_prebuild_successfully/pvc (329.51s)

Ya, I am working on fixing this flaky test in this PR #13170

[kylos101]

/unhold

:steam_locomotive: choo, choo!

[werft-gitpod-dev-com[bot]]

started the job as gitpod-build-aledbf-git-nsb.18 because the annotations in the pull request description changed (with .werft/ from main)

[werft-gitpod-dev-com[bot]]

started the job as gitpod-build-aledbf-git-nsb.19 because the annotations in the pull request description changed (with .werft/ from main)

[atduarte]

@aledbf FYI replace the one-line release notes with a key highlight here