Skip to content

Commit 24447af

Browse files
committed
update zuul to 12.0.0
Depends-On: https://softwarefactory-project.io/r/c/containers/+/33627 Change-Id: I4d2b203fa8f02a6b7d54a9c02de0e2ef493f98ba
1 parent 7371ab2 commit 24447af

File tree

4 files changed

+20
-10
lines changed

4 files changed

+20
-10
lines changed

controllers/libs/base/static/images.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@
44
images:
55
- name: zuul-scheduler
66
container: quay.io/software-factory/zuul-scheduler
7-
version: 11.3.0-20250414-2
8-
source: https://softwarefactory-project.io/cgit/containers/tree/images-sf/master/containers/rendered/zuul-scheduler.container?id=87bfb90e7820983729ee78be8c29a4053fed36d2
7+
version: 12.0.0-20250414-1
8+
source: https://softwarefactory-project.io/cgit/containers/tree/images-sf/master/containers/rendered/zuul-scheduler.container?id=bde97cee534f41601cb301ea3781f7c3ec1fae9d
99
- name: zuul-executor
1010
container: quay.io/software-factory/zuul-executor
11-
version: 11.3.0-20250414-2
12-
source: https://softwarefactory-project.io/cgit/containers/tree/images-sf/master/containers/rendered/zuul-executor.container?id=87bfb90e7820983729ee78be8c29a4053fed36d2
11+
version: 12.0.0-20250414-1
12+
source: https://softwarefactory-project.io/cgit/containers/tree/images-sf/master/containers/rendered/zuul-executor.container?id=bde97cee534f41601cb301ea3781f7c3ec1fae9d
1313
- name: zuul-merger
1414
container: quay.io/software-factory/zuul-merger
15-
version: 11.3.0-20250414-2
16-
source: https://softwarefactory-project.io/cgit/containers/tree/images-sf/master/containers/rendered/zuul-merger.container?id=87bfb90e7820983729ee78be8c29a4053fed36d2
15+
version: 12.0.0-20250414-1
16+
source: https://softwarefactory-project.io/cgit/containers/tree/images-sf/master/containers/rendered/zuul-merger.container?id=bde97cee534f41601cb301ea3781f7c3ec1fae9d
1717
- name: zuul-web
1818
container: quay.io/software-factory/zuul-web
19-
version: 11.3.0-20250414-2
20-
source: https://softwarefactory-project.io/cgit/containers/tree/images-sf/master/containers/rendered/zuul-web.container?id=87bfb90e7820983729ee78be8c29a4053fed36d2
19+
version: 12.0.0-20250414-1
20+
source: https://softwarefactory-project.io/cgit/containers/tree/images-sf/master/containers/rendered/zuul-web.container?id=bde97cee534f41601cb301ea3781f7c3ec1fae9d
2121
- name: nodepool-launcher
2222
container: quay.io/software-factory/nodepool-launcher
2323
version: 11.0.0-20250414-2

controllers/static/zuul/statsd_mapping.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -489,6 +489,16 @@ mappings:
489489
executor: "$1"
490490
match: zuul.executor.*.pct_used_ram_cgroup
491491
name: zuul_executor_pct_used_ram_cgroup
492+
- help: Description at https://zuul-ci.org/docs/zuul/latest/monitoring.html#stat-zuul.executor.<executor>.max_process
493+
labels:
494+
executor: "$1"
495+
match: zuul.executor.*.max_process
496+
name: zuul_executor_max_process
497+
- help: Description at https://zuul-ci.org/docs/zuul/latest/monitoring.html#stat-zuul.executor.<executor>.cur_process
498+
labels:
499+
executor: "$1"
500+
match: zuul.executor.*.cur_process
501+
name: zuul_executor_cur_process
492502
- help: Description at https://zuul-ci.org/docs/zuul/latest/monitoring.html#stat-zuul.nodepool.requests
493503
match: zuul.nodepool.requests
494504
name: zuul_nodepool_requests

controllers/zuul.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1073,7 +1073,7 @@ func (r *SFController) EnsureZuulConfigSecret(skipDBSettings bool, skipAuthSetti
10731073
return nil
10741074
}
10751075
cfgINI.Section("database").NewKey("dburi", fmt.Sprintf(
1076-
"mysql+pymysql://%s:%s@%s/%s", dbSettings.Data["username"], dbSettings.Data["password"], dbSettings.Data["host"], dbSettings.Data["database"]))
1076+
"mariadb+pymysql://%s:%s@%s/%s", dbSettings.Data["username"], dbSettings.Data["password"], dbSettings.Data["host"], dbSettings.Data["database"]))
10771077
}
10781078

10791079
// Set Zookeeper hosts

doc/reference/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ All notable changes to this project will be documented in this file.
1414

1515
- The default CPU limits have been reduced from 2000m to 500m to enable rollout on smaller cluster.
1616
- go version in go.mod is bumped to 1.24. Backward compatibility with earlier version is not guaranted.
17-
- zuul-* : bumped to 11.3.0-20250414-1 (using ubi9 latest images)
17+
- zuul-* : bumped to 12.0.0-20250414-1 (using ubi9 latest images)
1818

1919
### Deprecated
2020

0 commit comments

Comments
 (0)