Skip to content

Commit 973e012

Browse files
def-def-
committed
fix
1 parent bd18a79 commit 973e012

File tree

3 files changed

+253
-215
lines changed

3 files changed

+253
-215
lines changed

‎ci/nightly/pipeline.template.yml‎

Lines changed: 12 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -2307,7 +2307,7 @@ steps:
23072307
- id: orchestratord-defaults
23082308
label: "Orchestratord test (defaults for properties)"
23092309
depends_on: build-aarch64
2310-
timeout_in_minutes: 180
2310+
timeout_in_minutes: 120
23112311
plugins:
23122312
- ./ci/plugins/mzcompose:
23132313
composition: orchestratord
@@ -2319,7 +2319,7 @@ steps:
23192319
- id: orchestratord-individual
23202320
label: "Orchestratord test (individual properties)"
23212321
depends_on: build-aarch64
2322-
timeout_in_minutes: 180
2322+
timeout_in_minutes: 120
23232323
plugins:
23242324
- ./ci/plugins/mzcompose:
23252325
composition: orchestratord
@@ -2331,83 +2331,59 @@ steps:
23312331
- id: orchestratord-combine
23322332
label: "Orchestratord test (combine properties)"
23332333
depends_on: build-aarch64
2334-
timeout_in_minutes: 180
2334+
timeout_in_minutes: 120
23352335
plugins:
23362336
- ./ci/plugins/mzcompose:
23372337
composition: orchestratord
2338-
args: [--action=noop, --properties=combine, --runtime=7200, --recreate-cluster]
2338+
args: [--action=noop, --properties=combine, --runtime=3600, --recreate-cluster]
23392339
ci-builder: stable
23402340
agents:
23412341
queue: hetzner-aarch64-16cpu-32gb
23422342

2343-
- id: orchestratord-upgrade-defaults
2344-
label: "Orchestratord test (upgrade, defaults)"
2345-
depends_on: build-aarch64
2346-
timeout_in_minutes: 180
2347-
plugins:
2348-
- ./ci/plugins/mzcompose:
2349-
composition: orchestratord
2350-
args: [--action=upgrade, --properties=defaults, --runtime=7200, --recreate-cluster]
2351-
ci-builder: stable
2352-
agents:
2353-
queue: hetzner-aarch64-8cpu-16gb
2354-
23552343
- id: orchestratord-upgrade-individual
23562344
label: "Orchestratord test (upgrade, individual props)"
23572345
depends_on: build-aarch64
2358-
timeout_in_minutes: 180
2346+
timeout_in_minutes: 120
23592347
plugins:
23602348
- ./ci/plugins/mzcompose:
23612349
composition: orchestratord
2362-
args: [--action=upgrade, --properties=individual, --runtime=7200, --recreate-cluster]
2350+
args: [--action=upgrade, --properties=individual, --runtime=3600, --recreate-cluster]
23632351
ci-builder: stable
23642352
agents:
23652353
queue: hetzner-aarch64-8cpu-16gb
23662354

23672355
- id: orchestratord-upgrade-combine
23682356
label: "Orchestratord test (upgrade, combine props)"
23692357
depends_on: build-aarch64
2370-
timeout_in_minutes: 180
2371-
plugins:
2372-
- ./ci/plugins/mzcompose:
2373-
composition: orchestratord
2374-
args: [--action=upgrade, --properties=combine, --runtime=7200, --recreate-cluster]
2375-
ci-builder: stable
2376-
agents:
2377-
queue: hetzner-aarch64-8cpu-16gb
2378-
2379-
- id: orchestratord-upgrade-chain-defaults
2380-
label: "Orchestratord test (upgrade chain, defaults)"
2381-
depends_on: build-aarch64
2382-
timeout_in_minutes: 180
2358+
timeout_in_minutes: 120
23832359
plugins:
23842360
- ./ci/plugins/mzcompose:
23852361
composition: orchestratord
2386-
args: [--action=upgrade-chain, --properties=defaults, --runtime=7200, --recreate-cluster]
2362+
args: [--action=upgrade, --properties=combine, --runtime=3600, --recreate-cluster]
23872363
ci-builder: stable
23882364
agents:
23892365
queue: hetzner-aarch64-8cpu-16gb
23902366

23912367
- id: orchestratord-upgrade-chain-individual
23922368
label: "Orchestratord test (upgrade chain, individual props)"
23932369
depends_on: build-aarch64
2394-
timeout_in_minutes: 180
2370+
timeout_in_minutes: 120
23952371
plugins:
23962372
- ./ci/plugins/mzcompose:
23972373
composition: orchestratord
2398-
args: [--action=upgrade-chain, --properties=individual, --runtime=7200, --recreate-cluster]
2374+
args: [--action=upgrade-chain, --properties=individual, --runtime=3600, --recreate-cluster]
23992375
ci-builder: stable
24002376
agents:
24012377
queue: hetzner-aarch64-8cpu-16gb
24022378

24032379
- id: orchestratord-upgrade-chain-combine
24042380
label: "Orchestratord test (upgrade chain, combine props)"
24052381
depends_on: build-aarch64
2406-
timeout_in_minutes: 180
2382+
timeout_in_minutes: 120
24072383
plugins:
24082384
- ./ci/plugins/mzcompose:
24092385
composition: orchestratord
2410-
args: [--action=upgrade-chain, --properties=combine, --runtime=7200, --recreate-cluster]
2386+
args: [--action=upgrade-chain, --properties=combine, --runtime=3600, --recreate-cluster]
24112387
ci-builder: stable
24122388
agents:
24132389
queue: hetzner-aarch64-16cpu-32gb

‎ci/plugins/mzcompose/hooks/command‎

Lines changed: 33 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -134,15 +134,13 @@ cleanup() {
134134
ci_unimportant_heading "orchestratord test: Uploading logs..."
135135
K8S_CLUSTER_NAME=kind
136136
K8S_CONTEXT="kind-$K8S_CLUSTER_NAME"
137-
for pod in $(kubectl get pods -o name | grep -v -E 'kubernetes|minio|cockroach|redpanda'); do
138-
kubectl logs --prefix=true "$pod" &>> kubectl-get-logs.log || true
139-
kubectl logs --previous --prefix=true "$pod" &>> kubectl-get-logs-previous.log || true
137+
for pod in $(kubectl get pods -o name -n materialize | grep -v -E 'kubernetes|minio|cockroach|redpanda'); do
138+
kubectl logs --prefix=true "$pod" -n materialize &>> kubectl-get-logs.log || true
139+
kubectl logs --previous --prefix=true "$pod" -n materialize &>> kubectl-get-logs-previous.log || true
140140
done
141-
kubectl get events > kubectl-get-events.log || true
142-
kubectl get all > kubectl-get-all.log || true
143-
kubectl get events > kubectl-get-events.log || true
144-
kubectl get all > kubectl-get-all.log || true
145-
kubectl describe all | awk '
141+
kubectl get events -n materialize > kubectl-get-events.log || true
142+
kubectl get all -n materialize > kubectl-get-all.log || true
143+
kubectl describe all -n materialize | awk '
146144
BEGIN { redact=0 }
147145
/^[[:space:]]*Environment:/ {
148146
indent = match($0, /[^ ]/) - 1
@@ -160,13 +158,35 @@ cleanup() {
160158
}
161159
{ print }
162160
' > kubectl-describe-all.log || true
163-
kubectl get pods -o wide > kubectl-pods-with-nodes.log || true
161+
kubectl get pods -o wide -n materialize > kubectl-pods-with-nodes.log || true
164162

165-
kubectl -n kube-system get events > kubectl-get-events-kube-system.log || true
166-
kubectl -n kube-system get all > kubectl-get-all-kube-system.log || true
167-
kubectl -n kube-system describe all > kubectl-describe-all-kube-system.log || true
163+
for pod in $(kubectl get pods -o name -n materialize-environment | grep -v -E 'kubernetes|minio|cockroach|redpanda'); do
164+
kubectl logs --prefix=true "$pod" -n materialize-environment &>> kubectl-get-logs-environment.log || true
165+
kubectl logs --previous --prefix=true "$pod" -n materialize-environment &>> kubectl-get-logs-previous-environment.log || true
166+
done
167+
kubectl get events -n materialize-environment > kubectl-get-events-environment.log || true
168+
kubectl get all -n materialize-environment > kubectl-get-all-environment.log || true
169+
kubectl describe all -n materialize-environment | awk '
170+
BEGIN { redact=0 }
171+
/^[[:space:]]*Environment:/ {
172+
indent = match($0, /[^ ]/) - 1
173+
print substr($0, 1, indent) "Environment: [REDACTED]"
174+
redact = 1
175+
next
176+
}
177+
redact {
178+
current_indent = match($0, /[^ ]/) - 1
179+
if (current_indent <= indent || NF == 0) {
180+
redact = 0
181+
} else {
182+
next
183+
}
184+
}
185+
{ print }
186+
' > kubectl-describe-all-environment.log || true
187+
kubectl get pods -o wide -n materialize-environment > kubectl-pods-with-nodes-environment.log || true
168188

169-
mapfile -t artifacts < <(printf "kubectl-get-logs.log\nkubectl-get-logs-previous.log\nkubectl-get-events.log\nkubectl-get-all.log\nkubectl-describe-all.log\nkubectl-pods-with-nodes.log\nkubectl-get-events-kube-system.log\nkubectl-get-all-kube-system.log\nkubectl-describe-all-kube-system.log\nkail-output.log\n")
189+
mapfile -t artifacts < <(printf "kubectl-get-logs.log\nkubectl-get-logs-previous.log\nkubectl-get-events.log\nkubectl-get-all.log\nkubectl-describe-all.log\nkubectl-pods-with-nodes.log\nkubectl-get-logs-environment.log\nkubectl-get-logs-previous-environment.log\nkubectl-get-events-environment.log\nkubectl-get-all-environment.log\nkubectl-describe-all-environment.log\nkubectl-pods-with-nodes-environment.log\n")
170190
artifacts_str=$(IFS=";"; echo "${artifacts[*]}")
171191
buildkite-agent artifact upload "$artifacts_str"
172192
unset artifacts

0 commit comments

Comments
 (0)