Skip to content

Commit 2365c00

Browse files
committed
bump zuul image release - use of updated zuul-client
This change adds the capability to simply run privileged zuul-client command from any zuul pods without providing an auth token. Change-Id: I030530929c17cf2a71d9e4316f3ba13ce32ce455
1 parent 8ef89fd commit 2365c00

File tree

4 files changed

+39
-16
lines changed

4 files changed

+39
-16
lines changed

controllers/libs/base/static/images.yaml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,52 +4,52 @@
44
images:
55
- name: zuul-scheduler
66
container: quay.io/software-factory/zuul-scheduler
7-
version: 10.1.0-2
8-
source: https://softwarefactory-project.io/cgit/containers/tree/images-sf/master/containers/rendered/zuul-scheduler.container?id=0183950d3e176bb0d7e43731e6de0022f1283e99
7+
version: 10.1.0-3
8+
source: https://softwarefactory-project.io/cgit/containers/tree/images-sf/master/containers/rendered/zuul-scheduler.container?id=4ba66ab24871080d983bc9b24fe4b74a2244d50f
99
- name: zuul-executor
1010
container: quay.io/software-factory/zuul-executor
11-
version: 10.1.0-2
12-
source: https://softwarefactory-project.io/cgit/containers/tree/images-sf/master/containers/rendered/zuul-executor.container?id=0183950d3e176bb0d7e43731e6de0022f1283e99
11+
version: 10.1.0-3
12+
source: https://softwarefactory-project.io/cgit/containers/tree/images-sf/master/containers/rendered/zuul-executor.container?id=4ba66ab24871080d983bc9b24fe4b74a2244d50f
1313
- name: zuul-merger
1414
container: quay.io/software-factory/zuul-merger
15-
version: 10.1.0-2
16-
source: https://softwarefactory-project.io/cgit/containers/tree/images-sf/master/containers/rendered/zuul-merger.container?id=0183950d3e176bb0d7e43731e6de0022f1283e99
15+
version: 10.1.0-3
16+
source: https://softwarefactory-project.io/cgit/containers/tree/images-sf/master/containers/rendered/zuul-merger.container?id=4ba66ab24871080d983bc9b24fe4b74a2244d50f
1717
- name: zuul-web
1818
container: quay.io/software-factory/zuul-web
19-
version: 10.1.0-2
20-
source: https://softwarefactory-project.io/cgit/containers/tree/images-sf/master/containers/rendered/zuul-web.container?id=0183950d3e176bb0d7e43731e6de0022f1283e99
19+
version: 10.1.0-3
20+
source: https://softwarefactory-project.io/cgit/containers/tree/images-sf/master/containers/rendered/zuul-web.container?id=4ba66ab24871080d983bc9b24fe4b74a2244d50f
2121
- name: nodepool-launcher
2222
container: quay.io/software-factory/nodepool-launcher
2323
version: 10.0.0-3
24-
source: https://softwarefactory-project.io/cgit/containers/tree/images-sf/master/containers/rendered/nodepool-launcher.container?id=0183950d3e176bb0d7e43731e6de0022f1283e99
24+
source: https://softwarefactory-project.io/cgit/containers/tree/images-sf/master/containers/rendered/nodepool-launcher.container?id=4ba66ab24871080d983bc9b24fe4b74a2244d50f
2525
- name: nodepool-builder
2626
container: quay.io/software-factory/nodepool-builder
2727
version: 10.0.0-3
28-
source: https://softwarefactory-project.io/cgit/containers/tree/images-sf/master/containers/rendered/nodepool-builder.container?id=0183950d3e176bb0d7e43731e6de0022f1283e99
28+
source: https://softwarefactory-project.io/cgit/containers/tree/images-sf/master/containers/rendered/nodepool-builder.container?id=4ba66ab24871080d983bc9b24fe4b74a2244d50f
2929
- name: zookeeper
3030
container: quay.io/software-factory/zookeeper
3131
version: 3.8.4-2
32-
source: https://softwarefactory-project.io/cgit/containers/tree/images-sf/master/containers/rendered/zookeeper.container?id=0183950d3e176bb0d7e43731e6de0022f1283e99
32+
source: https://softwarefactory-project.io/cgit/containers/tree/images-sf/master/containers/rendered/zookeeper.container?id=4ba66ab24871080d983bc9b24fe4b74a2244d50f
3333
- name: git-server
3434
container: quay.io/software-factory/git-deamon
3535
version: 2.39.3-1
36-
source: https://softwarefactory-project.io/cgit/containers/tree/images-sf/master/containers/rendered/git-daemon.container?id=0183950d3e176bb0d7e43731e6de0022f1283e99
36+
source: https://softwarefactory-project.io/cgit/containers/tree/images-sf/master/containers/rendered/git-daemon.container?id=4ba66ab24871080d983bc9b24fe4b74a2244d50f
3737
- name: sshd
3838
container: quay.io/software-factory/sshd
3939
version: 0.1-4
40-
source: https://softwarefactory-project.io/cgit/containers/tree/images-sf/master/containers/rendered/sshd.container?id=0183950d3e176bb0d7e43731e6de0022f1283e99
40+
source: https://softwarefactory-project.io/cgit/containers/tree/images-sf/master/containers/rendered/sshd.container?id=4ba66ab24871080d983bc9b24fe4b74a2244d50f
4141
- name: purgelogs
4242
container: quay.io/software-factory/purgelogs
4343
version: 0.2.3-5
44-
source: https://softwarefactory-project.io/cgit/containers/tree/images-sf/master/containers/rendered/purgelogs.container?id=0183950d3e176bb0d7e43731e6de0022f1283e99
44+
source: https://softwarefactory-project.io/cgit/containers/tree/images-sf/master/containers/rendered/purgelogs.container?id=4ba66ab24871080d983bc9b24fe4b74a2244d50f
4545
- name: mariadb
4646
container: quay.io/software-factory/mariadb
4747
version: 11.4-ubi9-1
48-
source: https://softwarefactory-project.io/cgit/containers/tree/images-sf/master/containers/rendered/mariadb.container?id=0183950d3e176bb0d7e43731e6de0022f1283e99
48+
source: https://softwarefactory-project.io/cgit/containers/tree/images-sf/master/containers/rendered/mariadb.container?id=4ba66ab24871080d983bc9b24fe4b74a2244d50f
4949
- name: busybox
5050
container: quay.io/software-factory/sf-op-busybox
5151
version: 1.5-3
52-
source: https://softwarefactory-project.io/cgit/containers/tree/images-sf/master/containers/rendered/sf-op-busybox.container?id=0183950d3e176bb0d7e43731e6de0022f1283e99
52+
source: https://softwarefactory-project.io/cgit/containers/tree/images-sf/master/containers/rendered/sf-op-busybox.container?id=4ba66ab24871080d983bc9b24fe4b74a2244d50f
5353
- name: httpd
5454
container: registry.access.redhat.com/ubi8/httpd-24
5555
version: 1-284.1696531168

doc/reference/CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ All notable changes to this project will be documented in this file.
55
## [in development]
66

77
### Added
8+
9+
- Capability to simply run privileged zuul-client command from any zuul pods without providing an auth token
10+
811
### Changed
912
### Deprecated
1013
### Removed
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Note that thanks to https://review.opendev.org/c/zuul/zuul-client/+/837908 we can
2+
# run zuul-client from the zuul-scheduler (works from any zuul pods) w/o providing any auth token.
3+
# We are ensuring this facility is working through that test case
4+
5+
- name: Create a autohold request with zuul-client and the generated config
6+
ansible.builtin.command: |
7+
kubectl exec -it zuul-scheduler-0 -c zuul-scheduler -- zuul-client autohold --tenant internal --project config --job config-update --reason CI_TEST
8+
9+
- name: Ensure autohold was set properly
10+
ansible.builtin.command: |
11+
kubectl exec -it zuul-scheduler-0 -c zuul-scheduler -- zuul-client autohold-list --tenant internal
12+
register: _ah_list
13+
failed_when: '"CI_TEST" not in _ah_list.stdout'
14+
15+
- name: Remove autohold
16+
ansible.builtin.shell: >
17+
echo "{{ _ah_list.stdout }}" |
18+
grep -oE "0000[0-9]+" |
19+
xargs kubectl exec -it zuul-scheduler-0 -c zuul-scheduler -- zuul-client autohold-delete --tenant internal

roles/run-tests/tasks/main.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
- name: validate-purgelogs
3939
when: "{{ mode == 'olm' }}"
4040
- name: zuul-client-api
41+
- name: zuul-client-from-zuul-pod
4142
- name: zuul-components
4243
- name: test-external-ze
4344
- name: test-log-forwarding

0 commit comments

Comments
 (0)