[content-service] Revert #11895 #13549

aledbf · 2022-10-03T20:53:41Z

Description

When we open a workspace from a branch and the repository contains a .gitpod.yml file with additionalRepositories, we should not assume the branch exists in those repositories. Also, when we specify a branch in one of the additionalRepositories, we should be able to use that branch.

Related Issue(s)

Fixes #13527
Fixes #13512
Reverts #11895

How to test

Open a workspace using
- https://github.com/gitpod-io/gitpod-test-repo/tree/aledbf/test-additional-repositories
- https://github.com/gitpod-io/gitpod-test-repo/tree/aledbf/test-additional-repositories-with-branches

Release Notes

NONE

Werft options:

/werft with-local-preview
If enabled this will build install/preview
/werft with-preview
/werft with-integration-tests=workspace
Valid options are all, workspace, webapp, ide

werft-gitpod-dev-com · 2022-10-03T20:53:52Z

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

aledbf · 2022-10-03T21:35:27Z

/werft run with-clean-slate-deployment

👍 started the job as gitpod-build-aledbf-defgit.4
(with .werft/ from main)

aledbf · 2022-10-03T21:36:49Z

/werft run with-clean-slate-deployment

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

aledbf · 2022-10-03T22:09:11Z

/werft run with-integration-tests=workspace

👍 started the job as gitpod-build-aledbf-defgit.6
(with .werft/ from main)

aledbf · 2022-10-03T22:58:48Z

/werft run with-integration-tests=workspace

👍 started the job as gitpod-build-aledbf-defgit.8
(with .werft/ from main)

aledbf · 2022-10-04T00:17:02Z

/werft run with-integration-tests=workspace

👍 started the job as gitpod-build-aledbf-defgit.10
(with .werft/ from main)

aledbf · 2022-10-04T00:34:48Z

/werft run with-clean-slate-deployment

👍 started the job as gitpod-build-aledbf-defgit.12
(with .werft/ from main)

test/tests/components/ws-manager/additional_repositories_test.go

aledbf · 2022-10-04T01:03:12Z

/werft run with-integration-tests=workspace

👍 started the job as gitpod-build-aledbf-defgit.14
(with .werft/ from main)

aledbf · 2022-10-04T01:51:27Z

/werft run

👍 started the job as gitpod-build-aledbf-defgit.18
(with .werft/ from main)

aledbf · 2022-10-04T02:15:42Z

/werft run with-integration-tests=workspace

👍 started the job as gitpod-build-aledbf-defgit.19
(with .werft/ from main)

test/tests/components/ws-manager/additional_repositories_test.go

jenting

Code LGTM. But it would be good if we could enhance the integration test to check the workspace pod branch name is as expected.

/hold

svenefftinge

Thanks! Cloning multi-repos on branches now works again as advertised.

aledbf · 2022-10-04T12:20:46Z

/werft run

👍 started the job as gitpod-build-aledbf-defgit.20
(with .werft/ from main)

Check the branch is the expected

aledbf · 2022-10-04T13:56:00Z

/werft run with-integration-tests=workspace with-large-vm with-clean-slate-deployment

👍 started the job as gitpod-build-aledbf-defgit.22
(with .werft/ from main)

andrew-farries · 2022-10-04T14:11:47Z

/hold as it's blocking the merge queue

aledbf · 2022-10-04T14:23:41Z

/werft run with-integration-tests=workspace with-large-vm with-clean-slate-deployment

👍 started the job as gitpod-build-aledbf-defgit.23
(with .werft/ from main)

werft-gitpod-dev-com · 2022-10-04T15:30:47Z

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

werft-gitpod-dev-com · 2022-10-04T15:30:52Z

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

roboquat added do-not-merge/work-in-progress do-not-merge/release-note-label-needed size/L labels Oct 3, 2022

roboquat added release-note-none and removed do-not-merge/release-note-label-needed labels Oct 3, 2022

aledbf force-pushed the aledbf/defgit branch from 31f99ee to 3dced95 Compare October 3, 2022 21:27

aledbf force-pushed the aledbf/defgit branch from 3dced95 to f0827ac Compare October 3, 2022 22:47

aledbf force-pushed the aledbf/defgit branch from f0827ac to 108ad9a Compare October 4, 2022 00:07

aledbf force-pushed the aledbf/defgit branch from e6c924c to d0cb8c4 Compare October 4, 2022 00:55

utam0k reviewed Oct 4, 2022

View reviewed changes

test/tests/components/ws-manager/additional_repositories_test.go Outdated Show resolved Hide resolved

aledbf force-pushed the aledbf/defgit branch 2 times, most recently from 63f631d to 0d0e281 Compare October 4, 2022 01:17

aledbf added 2 commits October 3, 2022 22:20

[content-service] Revert #11895

fc38e9b

Add integration tests for additionalRepositories

e4c5cf4

aledbf force-pushed the aledbf/defgit branch from 0d0e281 to e4c5cf4 Compare October 4, 2022 01:22

aledbf assigned svenefftinge Oct 4, 2022

aledbf requested a review from svenefftinge October 4, 2022 03:34

aledbf marked this pull request as ready for review October 4, 2022 03:35

aledbf requested a review from a team October 4, 2022 03:36

roboquat removed the do-not-merge/work-in-progress label Oct 4, 2022

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

jenting reviewed Oct 4, 2022

View reviewed changes

test/tests/components/ws-manager/additional_repositories_test.go Show resolved Hide resolved

test/tests/components/ws-manager/additional_repositories_test.go Show resolved Hide resolved

jenting approved these changes Oct 4, 2022

View reviewed changes

roboquat added the do-not-merge/hold label Oct 4, 2022

svenefftinge approved these changes Oct 4, 2022

View reviewed changes

179f90e

Check the branch is the expected

aledbf removed the do-not-merge/hold label Oct 4, 2022

roboquat added the do-not-merge/hold label Oct 4, 2022

aledbf removed the do-not-merge/hold label Oct 4, 2022

roboquat merged commit aafb0d3 into main Oct 4, 2022

roboquat deleted the aledbf/defgit branch October 4, 2022 15:37

roboquat added deployed: workspace Workspace team change is running in production deployed Change is completely running in production labels Oct 5, 2022

kylos101 assigned aledbf and unassigned svenefftinge Oct 5, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[content-service] Revert #11895 #13549

[content-service] Revert #11895 #13549

aledbf commented Oct 3, 2022 •

edited

Loading

werft-gitpod-dev-com bot commented Oct 3, 2022

aledbf commented Oct 3, 2022 •

edited by werft-gitpod-dev-com bot

Loading

aledbf commented Oct 3, 2022 •

edited by werft-gitpod-dev-com bot

Loading

aledbf commented Oct 3, 2022 •

edited by werft-gitpod-dev-com bot

Loading

aledbf commented Oct 3, 2022 •

edited by werft-gitpod-dev-com bot

Loading

aledbf commented Oct 4, 2022 •

edited by werft-gitpod-dev-com bot

Loading

aledbf commented Oct 4, 2022 •

edited by werft-gitpod-dev-com bot

Loading

aledbf commented Oct 4, 2022 •

edited by werft-gitpod-dev-com bot

Loading

aledbf commented Oct 4, 2022 •

edited by werft-gitpod-dev-com bot

Loading

aledbf commented Oct 4, 2022 •

edited by werft-gitpod-dev-com bot

Loading

jenting left a comment

svenefftinge left a comment

aledbf commented Oct 4, 2022 •

edited by werft-gitpod-dev-com bot

Loading

aledbf commented Oct 4, 2022 •

edited by werft-gitpod-dev-com bot

Loading

andrew-farries commented Oct 4, 2022

aledbf commented Oct 4, 2022 •

edited by werft-gitpod-dev-com bot

Loading

werft-gitpod-dev-com bot commented Oct 4, 2022

werft-gitpod-dev-com bot commented Oct 4, 2022

[content-service] Revert #11895 #13549

[content-service] Revert #11895 #13549

Conversation

aledbf commented Oct 3, 2022 • edited Loading

Description

Related Issue(s)

How to test

Release Notes

Werft options:

werft-gitpod-dev-com bot commented Oct 3, 2022

aledbf commented Oct 3, 2022 • edited by werft-gitpod-dev-com bot Loading

aledbf commented Oct 3, 2022 • edited by werft-gitpod-dev-com bot Loading

aledbf commented Oct 3, 2022 • edited by werft-gitpod-dev-com bot Loading

aledbf commented Oct 3, 2022 • edited by werft-gitpod-dev-com bot Loading

aledbf commented Oct 4, 2022 • edited by werft-gitpod-dev-com bot Loading

aledbf commented Oct 4, 2022 • edited by werft-gitpod-dev-com bot Loading

aledbf commented Oct 4, 2022 • edited by werft-gitpod-dev-com bot Loading

aledbf commented Oct 4, 2022 • edited by werft-gitpod-dev-com bot Loading

aledbf commented Oct 4, 2022 • edited by werft-gitpod-dev-com bot Loading

jenting left a comment

Choose a reason for hiding this comment

svenefftinge left a comment

Choose a reason for hiding this comment

aledbf commented Oct 4, 2022 • edited by werft-gitpod-dev-com bot Loading

aledbf commented Oct 4, 2022 • edited by werft-gitpod-dev-com bot Loading

andrew-farries commented Oct 4, 2022

aledbf commented Oct 4, 2022 • edited by werft-gitpod-dev-com bot Loading

werft-gitpod-dev-com bot commented Oct 4, 2022

werft-gitpod-dev-com bot commented Oct 4, 2022

aledbf commented Oct 3, 2022 •

edited

Loading

aledbf commented Oct 3, 2022 •

edited by werft-gitpod-dev-com bot

Loading

aledbf commented Oct 3, 2022 •

edited by werft-gitpod-dev-com bot

Loading

aledbf commented Oct 3, 2022 •

edited by werft-gitpod-dev-com bot

Loading

aledbf commented Oct 3, 2022 •

edited by werft-gitpod-dev-com bot

Loading

aledbf commented Oct 4, 2022 •

edited by werft-gitpod-dev-com bot

Loading

aledbf commented Oct 4, 2022 •

edited by werft-gitpod-dev-com bot

Loading

aledbf commented Oct 4, 2022 •

edited by werft-gitpod-dev-com bot

Loading

aledbf commented Oct 4, 2022 •

edited by werft-gitpod-dev-com bot

Loading

aledbf commented Oct 4, 2022 •

edited by werft-gitpod-dev-com bot

Loading

aledbf commented Oct 4, 2022 •

edited by werft-gitpod-dev-com bot

Loading

aledbf commented Oct 4, 2022 •

edited by werft-gitpod-dev-com bot

Loading

aledbf commented Oct 4, 2022 •

edited by werft-gitpod-dev-com bot

Loading