Merge "Updating Octavia tempest jobs on Ubuntu jammy (22.04)"

This commit is contained in:
Zuul 2023-05-06 01:30:17 +00:00 committed by Gerrit Code Review
commit e82bb6741f
1 changed files with 30 additions and 6 deletions

View File

@ -18,6 +18,16 @@
nodes: nodes:
- controller - controller
- nodeset:
name: octavia-single-node-ubuntu-jammy
nodes:
- name: controller
label: nested-virt-ubuntu-jammy
groups:
- name: tempest
nodes:
- controller
- nodeset: - nodeset:
name: octavia-single-node-centos-7 name: octavia-single-node-centos-7
nodes: nodes:
@ -62,9 +72,9 @@
name: octavia-two-node name: octavia-two-node
nodes: nodes:
- name: controller - name: controller
label: nested-virt-ubuntu-focal label: nested-virt-ubuntu-jammy
- name: controller2 - name: controller2
label: nested-virt-ubuntu-focal label: nested-virt-ubuntu-jammy
groups: groups:
- name: controller - name: controller
nodes: nodes:
@ -209,7 +219,7 @@
- job: - job:
name: octavia-dsvm-live-base name: octavia-dsvm-live-base
parent: octavia-dsvm-base parent: octavia-dsvm-base
nodeset: octavia-single-node-ubuntu-focal nodeset: octavia-single-node-ubuntu-jammy
timeout: 9000 timeout: 9000
required-projects: required-projects:
- openstack/diskimage-builder - openstack/diskimage-builder
@ -245,7 +255,7 @@
- job: - job:
name: octavia-dsvm-live-base-ipv6-only name: octavia-dsvm-live-base-ipv6-only
parent: octavia-dsvm-base-ipv6-only parent: octavia-dsvm-base-ipv6-only
nodeset: octavia-single-node-ubuntu-focal nodeset: octavia-single-node-ubuntu-jammy
timeout: 9000 timeout: 9000
required-projects: required-projects:
- openstack/diskimage-builder - openstack/diskimage-builder
@ -534,16 +544,19 @@
- job: - job:
name: octavia-v2-dsvm-noop-api-stable-yoga name: octavia-v2-dsvm-noop-api-stable-yoga
parent: octavia-v2-dsvm-noop-api parent: octavia-v2-dsvm-noop-api
nodeset: octavia-single-node-ubuntu-focal
override-checkout: stable/yoga override-checkout: stable/yoga
- job: - job:
name: octavia-v2-dsvm-noop-api-stable-xena name: octavia-v2-dsvm-noop-api-stable-xena
parent: octavia-v2-dsvm-noop-api parent: octavia-v2-dsvm-noop-api
nodeset: octavia-single-node-ubuntu-focal
override-checkout: stable/xena override-checkout: stable/xena
- job: - job:
name: octavia-v2-dsvm-noop-api-stable-wallaby name: octavia-v2-dsvm-noop-api-stable-wallaby
parent: octavia-v2-dsvm-noop-api parent: octavia-v2-dsvm-noop-api
nodeset: octavia-single-node-ubuntu-focal
override-checkout: stable/wallaby override-checkout: stable/wallaby
- job: - job:
@ -603,16 +616,19 @@
- job: - job:
name: octavia-v2-dsvm-scenario-stable-yoga name: octavia-v2-dsvm-scenario-stable-yoga
parent: octavia-v2-dsvm-scenario parent: octavia-v2-dsvm-scenario
nodeset: octavia-single-node-ubuntu-focal
override-checkout: stable/yoga override-checkout: stable/yoga
- job: - job:
name: octavia-v2-dsvm-scenario-stable-xena name: octavia-v2-dsvm-scenario-stable-xena
parent: octavia-v2-dsvm-scenario parent: octavia-v2-dsvm-scenario
nodeset: octavia-single-node-ubuntu-focal
override-checkout: stable/xena override-checkout: stable/xena
- job: - job:
name: octavia-v2-dsvm-scenario-stable-wallaby name: octavia-v2-dsvm-scenario-stable-wallaby
parent: octavia-v2-dsvm-scenario parent: octavia-v2-dsvm-scenario
nodeset: octavia-single-node-ubuntu-focal
override-checkout: stable/wallaby override-checkout: stable/wallaby
# Legacy jobs for the transition to the act-stdby two node jobs # Legacy jobs for the transition to the act-stdby two node jobs
@ -737,12 +753,12 @@
tempest_test_regex: ^octavia_tempest_plugin.tests.scenario.v2.(?!.*traffic_ops) tempest_test_regex: ^octavia_tempest_plugin.tests.scenario.v2.(?!.*traffic_ops)
- job: - job:
name: octavia-v2-dsvm-scenario-ubuntu-focal name: octavia-v2-dsvm-scenario-ubuntu-jammy
parent: octavia-v2-dsvm-scenario parent: octavia-v2-dsvm-scenario
vars: vars:
devstack_localrc: devstack_localrc:
OCTAVIA_AMP_BASE_OS: ubuntu OCTAVIA_AMP_BASE_OS: ubuntu
OCTAVIA_AMP_DISTRIBUTION_RELEASE_ID: focal OCTAVIA_AMP_DISTRIBUTION_RELEASE_ID: jammy
- job: - job:
name: octavia-v2-dsvm-tls-barbican name: octavia-v2-dsvm-tls-barbican
@ -785,21 +801,25 @@
- job: - job:
name: octavia-v2-dsvm-tls-barbican-stable-yoga name: octavia-v2-dsvm-tls-barbican-stable-yoga
parent: octavia-v2-dsvm-tls-barbican parent: octavia-v2-dsvm-tls-barbican
nodeset: octavia-single-node-ubuntu-focal
override-checkout: stable/yoga override-checkout: stable/yoga
- job: - job:
name: octavia-v2-dsvm-tls-barbican-stable-xena name: octavia-v2-dsvm-tls-barbican-stable-xena
parent: octavia-v2-dsvm-tls-barbican parent: octavia-v2-dsvm-tls-barbican
nodeset: octavia-single-node-ubuntu-focal
override-checkout: stable/xena override-checkout: stable/xena
- job: - job:
name: octavia-v2-dsvm-tls-barbican-stable-wallaby name: octavia-v2-dsvm-tls-barbican-stable-wallaby
parent: octavia-v2-dsvm-tls-barbican parent: octavia-v2-dsvm-tls-barbican
nodeset: octavia-single-node-ubuntu-focal
override-checkout: stable/wallaby override-checkout: stable/wallaby
- job: - job:
name: octavia-v2-dsvm-tls-barbican-stable-victoria name: octavia-v2-dsvm-tls-barbican-stable-victoria
parent: octavia-v2-dsvm-tls-barbican parent: octavia-v2-dsvm-tls-barbican
nodeset: octavia-single-node-ubuntu-focal
override-checkout: stable/victoria override-checkout: stable/victoria
- job: - job:
@ -842,6 +862,7 @@
- job: - job:
name: octavia-v2-dsvm-spare-pool-stable-wallaby name: octavia-v2-dsvm-spare-pool-stable-wallaby
parent: octavia-v2-dsvm-spare-pool parent: octavia-v2-dsvm-spare-pool
nodeset: octavia-single-node-ubuntu-focal
override-checkout: stable/wallaby override-checkout: stable/wallaby
- job: - job:
@ -976,16 +997,19 @@
- job: - job:
name: octavia-v2-act-stdby-dsvm-scenario-stable-yoga name: octavia-v2-act-stdby-dsvm-scenario-stable-yoga
parent: octavia-v2-act-stdby-dsvm-scenario parent: octavia-v2-act-stdby-dsvm-scenario
nodeset: octavia-single-node-ubuntu-focal
override-checkout: stable/yoga override-checkout: stable/yoga
- job: - job:
name: octavia-v2-act-stdby-dsvm-scenario-stable-xena name: octavia-v2-act-stdby-dsvm-scenario-stable-xena
parent: octavia-v2-act-stdby-dsvm-scenario parent: octavia-v2-act-stdby-dsvm-scenario
nodeset: octavia-single-node-ubuntu-focal
override-checkout: stable/xena override-checkout: stable/xena
- job: - job:
name: octavia-v2-act-stdby-dsvm-scenario-stable-wallaby name: octavia-v2-act-stdby-dsvm-scenario-stable-wallaby
parent: octavia-v2-act-stdby-dsvm-scenario parent: octavia-v2-act-stdby-dsvm-scenario
nodeset: octavia-single-node-ubuntu-focal
override-checkout: stable/wallaby override-checkout: stable/wallaby
######### Third party jobs ########## ######### Third party jobs ##########