diff --git a/.drone.yml b/.drone.yml index 2390c3112c33a..60e0e0d26cb00 100644 --- a/.drone.yml +++ b/.drone.yml @@ -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: @@ -921,7 +919,7 @@ workspace: platform: os: windows arch: amd64 -nodes: +node: buildbox_version: teleport10 clone: disable: true @@ -8676,6 +8674,6 @@ steps: WORKSPACE_DIR: /tmp/build-darwin-amd64-connect --- kind: signature -hmac: b447e14f67d454ee5e10003af00ce14dadfb59fd8111d00d49556661ac992c0e +hmac: 0bb9ce006f6d7a862adef511ece2a312fccca9609f874d79feaac33185355fc7 ... diff --git a/dronegen/types.go b/dronegen/types.go index 9462c5f00db6d..58d1496c0de89 100644 --- a/dronegen/types.go +++ b/dronegen/types.go @@ -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"` diff --git a/dronegen/windows.go b/dronegen/windows.go index 8606c913bcee3..16857fdba86c5 100644 --- a/dronegen/windows.go +++ b/dronegen/windows.go @@ -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, } @@ -43,7 +42,7 @@ func windowsTagPipeline() pipeline { p.DependsOn = []string{tagCleanupPipelineName} p.Trigger = triggerTag - + p.Concurrency.Limit = 1 p.Steps = []step{ cloneWindowsRepositoriesStep(p.Workspace.Path), updateWindowsSubreposStep(p.Workspace.Path),