Skip to content

Commit f899818

Browse files
Restore drone pipelines
1 parent 205039d commit f899818

File tree

1 file changed

+15
-25
lines changed

1 file changed

+15
-25
lines changed

.drone.jsonnet

Lines changed: 15 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,8 @@ local servers = {
66
};
77

88
local platforms = {
9-
'develop': ['rockylinux:8', 'rockylinux:9',
10-
// TODO restore me
11-
// 'debian:11', 'debian:12', 'ubuntu:20.04', 'ubuntu:22.04', 'ubuntu:24.04',]0
12-
],
13-
'stable-23.10': ['rockylinux:8', 'rockylinux:9',
14-
// TODO restore me
15-
// 'debian:11', 'debian:12', 'ubuntu:20.04', 'ubuntu:22.04','ubuntu:24.04'
16-
],
9+
develop: ['rockylinux:8', 'rockylinux:9', 'debian:11', 'debian:12', 'ubuntu:20.04', 'ubuntu:22.04', 'ubuntu:24.04'],
10+
'stable-23.10': ['rockylinux:8', 'rockylinux:9', 'debian:11', 'debian:12', 'ubuntu:20.04', 'ubuntu:22.04','ubuntu:24.04'],
1711
};
1812

1913
local platforms_arm = {
@@ -924,9 +918,8 @@ local FinalPipeline(branch, event) = {
924918
'failure',
925919
],
926920
} + (if event == 'cron' then { cron: ['nightly-' + std.strReplace(branch, '.', '-')] } else {}),
927-
depends_on: std.map(function(p) std.join(' ', [branch, p, event, 'amd64', '10.6-enterprise']), platforms.develop)
928-
// TODO restore me
929-
// + std.map(function(p) std.join(' ', [branch, p, event, 'arm64', '10.6-enterprise']), platforms_arm.develop),
921+
depends_on: std.map(function(p) std.join(' ', [branch, p, event, 'amd64', '10.6-enterprise']), platforms.develop) +
922+
std.map(function(p) std.join(' ', [branch, p, event, 'arm64', '10.6-enterprise']), platforms_arm.develop),
930923
};
931924

932925
[
@@ -936,14 +929,13 @@ local FinalPipeline(branch, event) = {
936929
for s in servers[b]
937930
for e in events
938931
] +
939-
// TODO restore me
940-
// [
941-
// Pipeline(b, p, e, 'arm64', s)
942-
// for b in std.objectFields(platforms_arm)
943-
// for p in platforms_arm[b]
944-
// for s in servers[b]
945-
// for e in events
946-
// ] +
932+
[
933+
Pipeline(b, p, e, 'arm64', s)
934+
for b in std.objectFields(platforms_arm)
935+
for p in platforms_arm[b]
936+
for s in servers[b]
937+
for e in events
938+
] +
947939

948940
[
949941
FinalPipeline(b, 'cron')
@@ -953,10 +945,8 @@ local FinalPipeline(branch, event) = {
953945
[
954946
Pipeline(any_branch, p, 'custom', 'amd64', '10.6-enterprise')
955947
for p in platforms_custom
948+
] +
949+
[
950+
Pipeline(any_branch, p, 'custom', 'arm64', '10.6-enterprise')
951+
for p in platforms_arm_custom
956952
]
957-
// TODO restore me
958-
// +
959-
// [
960-
// Pipeline(any_branch, p, 'custom', 'arm64', '10.6-enterprise')
961-
// for p in platforms_arm_custom
962-
// ]

0 commit comments

Comments
 (0)