Skip to content

Commit 1486439

Browse files
authored
Merge pull request #448 from stackhpc/upstream/2025.1-2025-07-08
Synchronise 2025.1 with upstream
2 parents a1114c4 + 3b4fa3d commit 1486439

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

ansible/kayobe-target-venv.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
gather_subset: "{{ kayobe_ansible_setup_gather_subset }}"
2828
when:
2929
- ansible_facts is undefined or not ansible_facts
30-
- kayobe_virtualenv is defined
30+
- virtualenv is defined
3131
register: gather_facts
3232
# Before any facts are gathered, ansible doesn't know about
3333
# python virtualenv.

zuul.d/project.yaml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,14 @@
3333
- kayobe-seed-upgrade-rocky9
3434
- kayobe-seed-upgrade-ubuntu-noble
3535
- kayobe-seed-upgrade-slurp-rocky9
36-
- kayobe-seed-vm-rocky9
37-
- kayobe-seed-vm-rocky9-efi
36+
- kayobe-seed-vm-rocky9:
37+
voting: false
38+
- kayobe-seed-vm-rocky9-efi:
39+
voting: false
3840
- kayobe-seed-vm-ubuntu-noble
3941
- kayobe-seed-vm-ubuntu-noble-efi
40-
- kayobe-infra-vm-rocky9
42+
- kayobe-infra-vm-rocky9:
43+
voting: false
4144
- kayobe-infra-vm-ubuntu-noble
4245
gate:
4346
jobs:
@@ -65,9 +68,7 @@
6568
- kayobe-seed-upgrade-rocky9
6669
- kayobe-seed-upgrade-ubuntu-noble
6770
- kayobe-seed-upgrade-slurp-rocky9
68-
- kayobe-seed-vm-rocky9
6971
- kayobe-seed-vm-ubuntu-noble
70-
- kayobe-infra-vm-rocky9
7172
- kayobe-infra-vm-ubuntu-noble
7273

7374
experimental:

0 commit comments

Comments
 (0)