Merge "Move ubuntu jobs to focal"

This commit is contained in:
Zuul 2021-05-20 20:58:49 +00:00 committed by Gerrit Code Review
commit 12f54a6d32
1 changed files with 26 additions and 17 deletions

View File

@ -8,6 +8,16 @@
nodes: nodes:
- controller - controller
- nodeset:
name: octavia-single-node-ubuntu-focal
nodes:
- name: controller
label: nested-virt-ubuntu-focal
groups:
- name: tempest
nodes:
- controller
- nodeset: - nodeset:
name: octavia-single-node-centos-7 name: octavia-single-node-centos-7
nodes: nodes:
@ -32,9 +42,9 @@
name: octavia-two-node name: octavia-two-node
nodes: nodes:
- name: controller - name: controller
label: nested-virt-ubuntu-bionic label: nested-virt-ubuntu-focal
- name: controller2 - name: controller2
label: nested-virt-ubuntu-bionic label: nested-virt-ubuntu-focal
groups: groups:
- name: controller - name: controller
nodes: nodes:
@ -179,7 +189,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-bionic nodeset: octavia-single-node-ubuntu-focal
timeout: 9000 timeout: 9000
required-projects: required-projects:
- openstack/diskimage-builder - openstack/diskimage-builder
@ -215,7 +225,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-bionic nodeset: octavia-single-node-ubuntu-focal
timeout: 9000 timeout: 9000
required-projects: required-projects:
- openstack/diskimage-builder - openstack/diskimage-builder
@ -487,11 +497,13 @@
- job: - job:
name: octavia-v2-dsvm-noop-api-stable-ussuri name: octavia-v2-dsvm-noop-api-stable-ussuri
parent: octavia-v2-dsvm-noop-api parent: octavia-v2-dsvm-noop-api
nodeset: octavia-single-node-ubuntu-bionic
override-checkout: stable/ussuri override-checkout: stable/ussuri
- job: - job:
name: octavia-v2-dsvm-noop-api-stable-train name: octavia-v2-dsvm-noop-api-stable-train
parent: octavia-v2-dsvm-noop-api parent: octavia-v2-dsvm-noop-api
nodeset: octavia-single-node-ubuntu-bionic
override-checkout: stable/train override-checkout: stable/train
- job: - job:
@ -556,11 +568,13 @@
- job: - job:
name: octavia-v2-dsvm-scenario-stable-ussuri name: octavia-v2-dsvm-scenario-stable-ussuri
parent: octavia-v2-dsvm-scenario parent: octavia-v2-dsvm-scenario
nodeset: octavia-single-node-ubuntu-bionic
override-checkout: stable/ussuri override-checkout: stable/ussuri
- job: - job:
name: octavia-v2-dsvm-scenario-stable-train name: octavia-v2-dsvm-scenario-stable-train
parent: octavia-v2-dsvm-scenario parent: octavia-v2-dsvm-scenario
nodeset: octavia-single-node-ubuntu-bionic
override-checkout: stable/train override-checkout: stable/train
# Legacy jobs for the transition to the act-stdby two node jobs # Legacy jobs for the transition to the act-stdby two node jobs
@ -635,23 +649,12 @@
OCTAVIA_AMP_IMAGE_SIZE: 3 OCTAVIA_AMP_IMAGE_SIZE: 3
- job: - job:
name: octavia-v2-dsvm-scenario-ubuntu-bionic name: octavia-v2-dsvm-scenario-ubuntu-focal
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: bionic OCTAVIA_AMP_DISTRIBUTION_RELEASE_ID: focal
- job:
name: octavia-v2-dsvm-scenario-ubuntu-xenial
parent: octavia-v2-dsvm-scenario
nodeset: openstack-single-node-xenial
vars:
devstack_localrc:
OCTAVIA_AMP_BASE_OS: ubuntu
OCTAVIA_AMP_DISTRIBUTION_RELEASE_ID: xenial
USE_PYTHON3: false
TEMPEST_BRANCH: 23.0.0
- job: - job:
name: octavia-v2-dsvm-tls-barbican name: octavia-v2-dsvm-tls-barbican
@ -686,11 +689,13 @@
- job: - job:
name: octavia-v2-dsvm-tls-barbican-stable-ussuri name: octavia-v2-dsvm-tls-barbican-stable-ussuri
parent: octavia-v2-dsvm-tls-barbican parent: octavia-v2-dsvm-tls-barbican
nodeset: octavia-single-node-ubuntu-bionic
override-checkout: stable/ussuri override-checkout: stable/ussuri
- job: - job:
name: octavia-v2-dsvm-tls-barbican-stable-train name: octavia-v2-dsvm-tls-barbican-stable-train
parent: octavia-v2-dsvm-tls-barbican parent: octavia-v2-dsvm-tls-barbican
nodeset: octavia-single-node-ubuntu-bionic
override-checkout: stable/train override-checkout: stable/train
- job: - job:
@ -738,11 +743,13 @@
- job: - job:
name: octavia-v2-dsvm-spare-pool-stable-ussuri name: octavia-v2-dsvm-spare-pool-stable-ussuri
parent: octavia-v2-dsvm-spare-pool parent: octavia-v2-dsvm-spare-pool
nodeset: octavia-single-node-ubuntu-bionic
override-checkout: stable/ussuri override-checkout: stable/ussuri
- job: - job:
name: octavia-v2-dsvm-spare-pool-stable-train name: octavia-v2-dsvm-spare-pool-stable-train
parent: octavia-v2-dsvm-spare-pool parent: octavia-v2-dsvm-spare-pool
nodeset: octavia-single-node-ubuntu-bionic
override-checkout: stable/train override-checkout: stable/train
- job: - job:
@ -882,11 +889,13 @@
- job: - job:
name: octavia-v2-act-stdby-dsvm-scenario-stable-ussuri name: octavia-v2-act-stdby-dsvm-scenario-stable-ussuri
parent: octavia-v2-act-stdby-dsvm-scenario parent: octavia-v2-act-stdby-dsvm-scenario
nodeset: octavia-single-node-ubuntu-bionic
override-checkout: stable/ussuri override-checkout: stable/ussuri
- job: - job:
name: octavia-v2-act-stdby-dsvm-scenario-stable-train name: octavia-v2-act-stdby-dsvm-scenario-stable-train
parent: octavia-v2-act-stdby-dsvm-scenario parent: octavia-v2-act-stdby-dsvm-scenario
nodeset: octavia-single-node-ubuntu-bionic
override-checkout: stable/train override-checkout: stable/train
######### Third party jobs ########## ######### Third party jobs ##########