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

[content-init] Ensure .gitpod path is available #7749

Merged
merged 1 commit into from
Jan 21, 2022
Merged

[content-init] Ensure .gitpod path is available #7749

merged 1 commit into from
Jan 21, 2022

Conversation

csweichel
Copy link
Contributor

Description

When repositories contain a .gitpod file this can cause the content initializer to fail because we use /workspace/.gitpod internally. This change introduces special handling such cases where we try to git mv or mv the .gitpod file to .gitpod.yaml. If .gitpod.yaml already exists, we delete .gitpod.

Related Issue(s)

Fixes #7694

How to test

Open https://cw-fix-7694.staging.gitpod-dev.com/#https://github.com/csweichel/gitpod-hello-ui-demo
If the build starts (might not complete due to other issues), we're good. Compare with prod where the build fails to start due to a content init error.

Release Notes

NONE

@roboquat roboquat added release-note-none team: workspace Issue belongs to the Workspace team size/M labels Jan 21, 2022
@csweichel
Copy link
Contributor Author

csweichel commented Jan 21, 2022

/werft run

👍 started the job as gitpod-build-cw-fix-7694.8

@codecov
Copy link

codecov bot commented Jan 21, 2022

Codecov Report

Merging #7749 (5aafeea) into main (9a7411f) will increase coverage by 18.47%.
The diff coverage is 2.56%.

Impacted file tree graph

@@             Coverage Diff             @@
##             main    #7749       +/-   ##
===========================================
+ Coverage   11.54%   30.02%   +18.47%     
===========================================
  Files          20      106       +86     
  Lines        1169    17435    +16266     
===========================================
+ Hits          135     5234     +5099     
- Misses       1031    11750    +10719     
- Partials        3      451      +448     
Flag Coverage Δ
components-content-service-app 13.92% <2.85%> (?)
components-content-service-lib 13.92% <2.85%> (?)
components-gitpod-cli-app 10.38% <ø> (+0.09%) ⬆️
components-image-builder-mk3-app 35.26% <ø> (?)
components-local-app-app-darwin-amd64 ?
components-local-app-app-darwin-arm64 ?
components-local-app-app-linux-amd64 ?
components-local-app-app-linux-arm64 ?
components-local-app-app-windows-386 ?
components-local-app-app-windows-amd64 ?
components-local-app-app-windows-arm64 ?
components-supervisor-app 35.43% <ø> (?)
components-ws-daemon-app 22.04% <0.00%> (?)
components-ws-daemon-lib 22.04% <0.00%> (?)
components-ws-manager-app 40.77% <ø> (?)
components-ws-proxy-app 68.32% <ø> (?)
installer-raw-app 5.75% <ø> (?)

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
...nts/content-service/pkg/initializer/initializer.go 4.66% <0.00%> (ø)
components/ws-daemon/pkg/content/initializer.go 0.00% <0.00%> (ø)
components/content-service/pkg/git/git.go 36.93% <33.33%> (ø)
components/local-app/pkg/auth/auth.go
components/local-app/pkg/auth/pkce.go
components/ws-manager/pkg/manager/manager_ee.go 0.00% <0.00%> (ø)
components/supervisor/pkg/supervisor/services.go 21.56% <0.00%> (ø)
components/ws-proxy/pkg/proxy/auth.go 100.00% <0.00%> (ø)
components/ws-manager/pkg/manager/imagespec.go 0.00% <0.00%> (ø)
components/ws-manager/pkg/clock/clock.go 68.62% <0.00%> (ø)
... and 84 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 4a907f9...5aafeea. Read the comment docs.

@roboquat
Copy link
Contributor

LGTM label has been added.

Git tree hash: 19fffa7b50f5ea26c32bd20de38c2f71cb6b870f

@roboquat
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Furisto

Associated issue: #7694

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@roboquat roboquat merged commit 0a47ea4 into main Jan 21, 2022
@roboquat roboquat deleted the cw/fix-7694 branch January 21, 2022 10:44
@roboquat roboquat added deployed: workspace Workspace team change is running in production deployed Change is completely running in production labels Jan 21, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved deployed: workspace Workspace team change is running in production deployed Change is completely running in production release-note-none size/M team: workspace Issue belongs to the Workspace team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Error : Connecting to workspace logs
3 participants