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

aledbf · 2022-09-16T23:53:03Z

Description

The flag --no-single-branch was introduced in #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: #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

NONE

Werft options:

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

/hold

werft-gitpod-dev-com · 2022-09-17T00:19:21Z

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

jenting · 2022-09-18T23:41:27Z

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 · 2022-09-19T00:25:41Z

Works with multi-repo too 👍

aledbf · 2022-09-19T14:05:18Z

/werft run

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

aledbf · 2022-09-19T16:47:20Z

@jenting please check again

sagor999 · 2022-09-19T18:25:46Z

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

werft-gitpod-dev-com · 2022-09-19T18:49:05Z

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 · 2022-09-19T19:23:43Z

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 · 2022-09-19T19:24:02Z

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

kylos101 · 2022-09-19T20:52:21Z

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

I am guessing you need c524a00

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 · 2022-09-19T20:57:22Z

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

done

jenting

Work like a charm

werft-gitpod-dev-com · 2022-09-20T19:53:22Z

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

kylos101 · 2022-09-20T20:17:04Z

components/content-service/pkg/initializer/git.go

@@ -186,7 +194,7 @@ func (ws *GitInitializer) realizeCloneTarget(ctx context.Context) (err error) {
 		}

 		// checkout specific commit
-		if err := ws.Git(ctx, "checkout", ws.CloneTarget); err != nil {
+		if err := ws.Git(ctx, "switch", "-C", ws.CloneTarget); err != nil {


Hey @aledbf 👋 ,

question (non-blocking): how come some case statements ☝️ are logging errors and others do not? I ask because I'm not sure why there is variance.

It seems like we may want to log the errors in each case (especially because we're changing from checkout to switch), but I could also be being naive. I haven't opened this to see if the calling function logs the related error.

https://github.com/gitpod-io/gitpod/pull/13053/files#diff-c9626ddd8d63f48f858c8e81807c14008f5c4199bd41ba80a2981401111356f0R186

https://github.com/gitpod-io/gitpod/pull/13053/files#diff-c9626ddd8d63f48f858c8e81807c14008f5c4199bd41ba80a2981401111356f0R193

https://github.com/gitpod-io/gitpod/pull/13053/files#diff-c9626ddd8d63f48f858c8e81807c14008f5c4199bd41ba80a2981401111356f0R198

kylos101 · 2022-09-20T20:30:41Z

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. 🤔

sagor999 · 2022-09-20T20:47:07Z

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

kylos101 · 2022-09-21T01:26:09Z

@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 · 2022-09-21T01:31:40Z

@kylos101 Sure.

utam0k · 2022-09-21T02:08:53Z

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.

gitpod/test/tests/workspace/contexts_test.go

Lines 51 to 54 in f61eacf

    
           Name:           "open tag", 
        
           ContextURL:     "github.com/gitpod-io/gitpod-test-repo/tree/integration-test-context-tag", 
        
           WorkspaceRoot:  "/workspace/gitpod-test-repo", 
        
           ExpectedBranch: "HEAD",

utam0k · 2022-09-21T02:10:03Z

@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 · 2022-09-21T12:31:16Z

Thanks for the heads up @utam0k !

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

aledbf · 2022-09-21T21:46:38Z

@aledbf can you update the #13053 (comment) @utam0k shared is failing?

done

kylos101 · 2022-09-21T23:53:15Z

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 · 2022-09-22T00:05:32Z

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

Works as advertised, I tested prebuilds by making a team, project, and pushing commits, rather than use #prebuild, which is going away in the not too distant future.

kylos101 · 2022-09-22T00:15:18Z

/unhold

🚂 choo, choo!

werft-gitpod-dev-com · 2022-09-22T00:27:16Z

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 · 2022-09-22T00:27:29Z

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

atduarte · 2022-09-29T14:38:19Z

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

roboquat added do-not-merge/work-in-progress do-not-merge/hold release-note size/XS labels Sep 16, 2022

roboquat added size/S and removed size/XS labels Sep 18, 2022

aledbf force-pushed the aledbf/git-nsb branch from ebd17b7 to d2ba552 Compare September 18, 2022 14:48

aledbf marked this pull request as ready for review September 18, 2022 15:42

aledbf requested a review from a team September 18, 2022 15:42

roboquat removed the do-not-merge/work-in-progress label Sep 18, 2022

github-actions bot added the team: workspace Issue belongs to the Workspace team label Sep 18, 2022

aledbf removed the do-not-merge/hold label Sep 18, 2022

kylos101 mentioned this pull request Sep 19, 2022

Performance of opening a monorepo is very slow vs GitHub Codespaces #12682

Closed

kylos101 assigned aledbf Sep 19, 2022

aledbf force-pushed the aledbf/git-nsb branch from dd21a39 to 1cdd874 Compare September 19, 2022 13:57

aledbf force-pushed the aledbf/git-nsb branch 2 times, most recently from 0ea6af4 to a8ebb28 Compare September 19, 2022 16:14

roboquat added the do-not-merge/hold label Sep 19, 2022

aledbf added 2 commits September 19, 2022 17:56

Remove git no-single-branch flag

5aaaff5

Ensure git fetch process all content

94d724a

aledbf force-pushed the aledbf/git-nsb branch from a8ebb28 to 3671d94 Compare September 19, 2022 20:56

jenting approved these changes Sep 20, 2022

View reviewed changes

kylos101 reviewed Sep 20, 2022

View reviewed changes

Update integration test

da4a8f1

kylos101 approved these changes Sep 22, 2022

View reviewed changes

roboquat removed the do-not-merge/hold label Sep 22, 2022

roboquat merged commit 6475a78 into main Sep 22, 2022

roboquat deleted the aledbf/git-nsb branch September 22, 2022 00:35

This was referenced Sep 22, 2022

Track git branches during initial checkout #13210

Merged

[content-service] Fix git checkout #13241

Merged

roboquat added deployed: workspace Workspace team change is running in production deployed Change is completely running in production release-note-none and removed release-note labels Sep 28, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

aledbf commented Sep 16, 2022 •

edited by atduarte

Loading

werft-gitpod-dev-com bot commented Sep 17, 2022

jenting commented Sep 18, 2022

kylos101 commented Sep 19, 2022

aledbf commented Sep 19, 2022 •

edited by werft-gitpod-dev-com bot

Loading

aledbf commented Sep 19, 2022

sagor999 commented Sep 19, 2022

werft-gitpod-dev-com bot commented Sep 19, 2022

werft-gitpod-dev-com bot commented Sep 19, 2022

werft-gitpod-dev-com bot commented Sep 19, 2022

kylos101 commented Sep 19, 2022

aledbf commented Sep 19, 2022

jenting left a comment

werft-gitpod-dev-com bot commented Sep 20, 2022

kylos101 Sep 20, 2022

kylos101 commented Sep 20, 2022

sagor999 commented Sep 20, 2022

kylos101 commented Sep 21, 2022

utam0k commented Sep 21, 2022

utam0k commented Sep 21, 2022

utam0k commented Sep 21, 2022

kylos101 commented Sep 21, 2022

aledbf commented Sep 21, 2022

kylos101 commented Sep 21, 2022 •

edited

Loading

jenting commented Sep 22, 2022 •

edited

Loading

kylos101 left a comment

kylos101 commented Sep 22, 2022

werft-gitpod-dev-com bot commented Sep 22, 2022

werft-gitpod-dev-com bot commented Sep 22, 2022

atduarte commented Sep 29, 2022

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

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

Conversation

aledbf commented Sep 16, 2022 • edited by atduarte Loading

Description

How to test

Release Notes

Werft options:

werft-gitpod-dev-com bot commented Sep 17, 2022

jenting commented Sep 18, 2022

kylos101 commented Sep 19, 2022

aledbf commented Sep 19, 2022 • edited by werft-gitpod-dev-com bot Loading

aledbf commented Sep 19, 2022

sagor999 commented Sep 19, 2022

werft-gitpod-dev-com bot commented Sep 19, 2022

werft-gitpod-dev-com bot commented Sep 19, 2022

werft-gitpod-dev-com bot commented Sep 19, 2022

kylos101 commented Sep 19, 2022

aledbf commented Sep 19, 2022

jenting left a comment

Choose a reason for hiding this comment

werft-gitpod-dev-com bot commented Sep 20, 2022

kylos101 Sep 20, 2022

Choose a reason for hiding this comment

kylos101 commented Sep 20, 2022

sagor999 commented Sep 20, 2022

kylos101 commented Sep 21, 2022

utam0k commented Sep 21, 2022

utam0k commented Sep 21, 2022

utam0k commented Sep 21, 2022

kylos101 commented Sep 21, 2022

aledbf commented Sep 21, 2022

kylos101 commented Sep 21, 2022 • edited Loading

jenting commented Sep 22, 2022 • edited Loading

kylos101 left a comment

Choose a reason for hiding this comment

kylos101 commented Sep 22, 2022

werft-gitpod-dev-com bot commented Sep 22, 2022

werft-gitpod-dev-com bot commented Sep 22, 2022

atduarte commented Sep 29, 2022

aledbf commented Sep 16, 2022 •

edited by atduarte

Loading

aledbf commented Sep 19, 2022 •

edited by werft-gitpod-dev-com bot

Loading

kylos101 commented Sep 21, 2022 •

edited

Loading

jenting commented Sep 22, 2022 •

edited

Loading