Skip to content

[v10] Fixes node selector, removes concurrency limit on windows builds #18337

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.

Sign up for GitHub

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
tcsc merged 4 commits into from
Nov 10, 2022
Merged

[v10] Fixes node selector, removes concurrency limit on windows builds #18337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9627283
Test build
tcsc Nov 10, 2022
8cb4e48
Remove debug trigger
tcsc Nov 10, 2022
452a749
Merge branch 'branch/v10' into tcsc/branch/v10/fix-node-selection
tcsc Nov 10, 2022
f4c157d
Revert submodule changes
tcsc Nov 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions .drone.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -666,12 +666,10 @@ workspace:
platform:
os: windows
arch: amd64
nodes:
node:
buildbox_version: teleport10
clone:
disable: true
concurrency:
limit: 1
steps:
- name: Check out Teleport
commands:
Expand Down Expand Up @@ -921,7 +919,7 @@ workspace:
platform:
os: windows
arch: amd64
nodes:
node:
buildbox_version: teleport10
clone:
disable: true
Expand Down Expand Up @@ -8676,6 +8674,6 @@ steps:
WORKSPACE_DIR: /tmp/build-darwin-amd64-connect
---
kind: signature
hmac: b447e14f67d454ee5e10003af00ce14dadfb59fd8111d00d49556661ac992c0e
hmac: 0bb9ce006f6d7a862adef511ece2a312fccca9609f874d79feaac33185355fc7

...
2 changes: 1 addition & 1 deletion dronegen/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ type pipeline struct {
Trigger trigger `yaml:"trigger"`
Workspace workspace `yaml:"workspace,omitempty"`
Platform platform `yaml:"platform,omitempty"`
Nodes map[string]value `yaml:"nodes,omitempty"`
Node map[string]value `yaml:"node,omitempty"`
Clone clone `yaml:"clone,omitempty"`
DependsOn []string `yaml:"depends_on,omitempty"`
Concurrency concurrency `yaml:"concurrency,omitempty"`
Expand Down
5 changes: 2 additions & 3 deletions dronegen/windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,8 @@ const (
func newWindowsPipeline(name string) pipeline {
p := newExecPipeline(name)
p.Workspace.Path = path.Join("C:/Drone/Workspace", name)
p.Concurrency.Limit = 1
p.Platform = platform{OS: "windows", Arch: "amd64"}
p.Nodes = map[string]value{
p.Node = map[string]value{
"buildbox_version": buildboxVersion,
}

Expand All @@ -43,7 +42,7 @@ func windowsTagPipeline() pipeline {

p.DependsOn = []string{tagCleanupPipelineName}
p.Trigger = triggerTag

p.Concurrency.Limit = 1
Copy link
Copy Markdown
Contributor

@tobiaszheller tobiaszheller Nov 10, 2022

Choose a reason for hiding this comment

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

wasn';t it suppose to remove limit @tcsc ?

Copy link
Copy Markdown
Contributor Author

@tcsc tcsc Nov 10, 2022

Choose a reason for hiding this comment

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

The concurrent limits have been left for tag builds, as there are flow-on concurrency concern due to artifact uploading, etc.

p.Steps = []step{
cloneWindowsRepositoriesStep(p.Workspace.Path),
updateWindowsSubreposStep(p.Workspace.Path),
Expand Down