Update grenade setting on current master
grenade is branched for stable/2023.1, so updating the current master default setting for: - Update grenade testing from stable/2023.1 to master. - Update grenade-skip-level job not to run for current non SLURP master release octavia-grenade job is broken due to diskimage-builder so to unblock grenade gate, stop running it and we can run it once DIB fix is merged and released - https://review.opendev.org/c/openstack/diskimage-builder/+/878089 Change-Id: I400c7f386e5b900774039223c9199508229494a2
This commit is contained in:
parent
a8cbe6d1a9
commit
1ce132fdaf
15
.zuul.yaml
15
.zuul.yaml
|
@ -6,7 +6,9 @@
|
||||||
- grenade
|
- grenade
|
||||||
- grenade-multinode
|
- grenade-multinode
|
||||||
- grenade-heat-multinode
|
- grenade-heat-multinode
|
||||||
- octavia-grenade
|
# TODO (gmann): Run octavia-grenade job once DIB fix is merged and released
|
||||||
|
# https://review.opendev.org/c/openstack/diskimage-builder/+/878089
|
||||||
|
# - octavia-grenade
|
||||||
- ironic-grenade:
|
- ironic-grenade:
|
||||||
voting: false
|
voting: false
|
||||||
- grenade-skip-level:
|
- grenade-skip-level:
|
||||||
|
@ -16,7 +18,7 @@
|
||||||
- grenade
|
- grenade
|
||||||
- grenade-multinode
|
- grenade-multinode
|
||||||
- grenade-heat-multinode
|
- grenade-heat-multinode
|
||||||
- octavia-grenade
|
# - octavia-grenade
|
||||||
experimental:
|
experimental:
|
||||||
jobs:
|
jobs:
|
||||||
- grenade-postgresql
|
- grenade-postgresql
|
||||||
|
@ -158,7 +160,7 @@
|
||||||
Default grenade job
|
Default grenade job
|
||||||
|
|
||||||
Usually grenade jobs should inherit from this job.
|
Usually grenade jobs should inherit from this job.
|
||||||
nodeset: openstack-single-node-focal
|
nodeset: openstack-single-node-jammy
|
||||||
required-projects:
|
required-projects:
|
||||||
# NOTE(andreaf) The devstack and grenade roles take care of setting up
|
# NOTE(andreaf) The devstack and grenade roles take care of setting up
|
||||||
# repos on the right branch for this job.
|
# repos on the right branch for this job.
|
||||||
|
@ -369,7 +371,7 @@
|
||||||
description: |
|
description: |
|
||||||
Basic multinode grenade job
|
Basic multinode grenade job
|
||||||
parent: grenade
|
parent: grenade
|
||||||
nodeset: openstack-two-node-focal
|
nodeset: openstack-two-node-jammy
|
||||||
pre-run: playbooks/multinode-pre.yaml
|
pre-run: playbooks/multinode-pre.yaml
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
|
@ -399,6 +401,9 @@
|
||||||
# (which is N+2 release from yoga so skipping zed release and testing the upgrade
|
# (which is N+2 release from yoga so skipping zed release and testing the upgrade
|
||||||
# from stable/yoga -> 2023.1). When master is 2023.3, this should become 2023.1,
|
# from stable/yoga -> 2023.1). When master is 2023.3, this should become 2023.1,
|
||||||
# and so forth.
|
# and so forth.
|
||||||
|
# Current master 2023.2 is non SLURP release to this job will be skiped to run
|
||||||
|
# on current master. If you would like to run N-2 -> N upgrade testing on current
|
||||||
|
# non SLURP master then use grenade-skip-level-always job.
|
||||||
vars:
|
vars:
|
||||||
grenade_from_branch: stable/yoga
|
grenade_from_branch: stable/yoga
|
||||||
# NOTE(gmann): This job is started and meant to be run from Yoga release.
|
# NOTE(gmann): This job is started and meant to be run from Yoga release.
|
||||||
|
@ -412,4 +417,4 @@
|
||||||
# Along with grenade gate, this job runs on many other projects gate
|
# Along with grenade gate, this job runs on many other projects gate
|
||||||
# also and in this job definition, we control for everyone to run on SLURP
|
# also and in this job definition, we control for everyone to run on SLURP
|
||||||
# release only.
|
# release only.
|
||||||
branches: ^(?!stable/(pike|queens|rocky|stein|train|ussuri|victoria|wallaby|xena|zed)).*$
|
branches: ^(?!master|stable/(pike|queens|rocky|stein|train|ussuri|victoria|wallaby|xena|zed)).*$
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
---
|
---
|
||||||
grenade_from_branch: stable/zed
|
grenade_from_branch: stable/2023.1
|
||||||
grenade_to_branch: master
|
grenade_to_branch: master
|
||||||
|
|
Loading…
Reference in New Issue