Move jobs to use Ubuntu Focal
According to the docs[0] Ubuntu Focal is the version supported for Xena. This commit updates the jobs and the Amphora image. [0] https://governance.openstack.org/tc/reference/runtimes/xena.html Depends-On: https://review.opendev.org/c/openstack/kuryr-kubernetes/+/812154 Change-Id: I869040d9b05ef3d1cded5f91e1634214b83fd348
This commit is contained in:
parent
deb055190f
commit
bb41c3889d
@ -187,8 +187,8 @@
|
|||||||
KURYR_EP_DRIVER_OCTAVIA_PROVIDER: ovn
|
KURYR_EP_DRIVER_OCTAVIA_PROVIDER: ovn
|
||||||
KURYR_K8S_OCTAVIA_MEMBER_MODE: L2
|
KURYR_K8S_OCTAVIA_MEMBER_MODE: L2
|
||||||
KURYR_LB_ALGORITHM: SOURCE_IP_PORT
|
KURYR_LB_ALGORITHM: SOURCE_IP_PORT
|
||||||
OCTAVIA_AMP_IMAGE_FILE: /tmp/test-only-amphora-x64-haproxy-ubuntu-bionic.qcow2
|
OCTAVIA_AMP_IMAGE_FILE: /tmp/test-only-amphora-x64-haproxy-ubuntu-focal.qcow2
|
||||||
OCTAVIA_AMP_IMAGE_NAME: test-only-amphora-x64-haproxy-ubuntu-bionic
|
OCTAVIA_AMP_IMAGE_NAME: test-only-amphora-x64-haproxy-ubuntu-focal
|
||||||
OCTAVIA_AMP_IMAGE_SIZE: 3
|
OCTAVIA_AMP_IMAGE_SIZE: 3
|
||||||
devstack_local_conf:
|
devstack_local_conf:
|
||||||
post-config:
|
post-config:
|
||||||
@ -229,8 +229,8 @@
|
|||||||
- kuryr-tempest-plugin
|
- kuryr-tempest-plugin
|
||||||
- octavia-tempest-plugin
|
- octavia-tempest-plugin
|
||||||
devstack_localrc:
|
devstack_localrc:
|
||||||
OCTAVIA_AMP_IMAGE_FILE: /tmp/test-only-amphora-x64-haproxy-ubuntu-bionic.qcow2
|
OCTAVIA_AMP_IMAGE_FILE: /tmp/test-only-amphora-x64-haproxy-ubuntu-focal.qcow2
|
||||||
OCTAVIA_AMP_IMAGE_NAME: test-only-amphora-x64-haproxy-ubuntu-bionic
|
OCTAVIA_AMP_IMAGE_NAME: test-only-amphora-x64-haproxy-ubuntu-focal
|
||||||
OCTAVIA_AMP_IMAGE_SIZE: 3
|
OCTAVIA_AMP_IMAGE_SIZE: 3
|
||||||
devstack_local_conf:
|
devstack_local_conf:
|
||||||
post-config:
|
post-config:
|
||||||
|
@ -53,8 +53,8 @@
|
|||||||
KURYR_SG_DRIVER: policy
|
KURYR_SG_DRIVER: policy
|
||||||
KURYR_SUBNET_DRIVER: namespace
|
KURYR_SUBNET_DRIVER: namespace
|
||||||
ML2_L3_PLUGIN: ovn-router,trunk,qos
|
ML2_L3_PLUGIN: ovn-router,trunk,qos
|
||||||
OCTAVIA_AMP_IMAGE_FILE: "/tmp/test-only-amphora-x64-haproxy-ubuntu-bionic.qcow2"
|
OCTAVIA_AMP_IMAGE_FILE: "/tmp/test-only-amphora-x64-haproxy-ubuntu-focal.qcow2"
|
||||||
OCTAVIA_AMP_IMAGE_NAME: "test-only-amphora-x64-haproxy-ubuntu-bionic"
|
OCTAVIA_AMP_IMAGE_NAME: "test-only-amphora-x64-haproxy-ubuntu-focal"
|
||||||
OCTAVIA_AMP_IMAGE_SIZE: 3
|
OCTAVIA_AMP_IMAGE_SIZE: 3
|
||||||
OVN_BRANCH: v20.06.2
|
OVN_BRANCH: v20.06.2
|
||||||
OVN_BUILD_FROM_SOURCE: true
|
OVN_BUILD_FROM_SOURCE: true
|
||||||
|
@ -41,15 +41,15 @@
|
|||||||
- kuryr-kubernetes-tempest-dual-stack
|
- kuryr-kubernetes-tempest-dual-stack
|
||||||
|
|
||||||
- project-template:
|
- project-template:
|
||||||
name: kuryr-kubernetes-lower-constraints-bionic-jobs
|
name: kuryr-kubernetes-lower-constraints-focal-jobs
|
||||||
check:
|
check:
|
||||||
jobs:
|
jobs:
|
||||||
- openstack-tox-lower-constraints:
|
- openstack-tox-lower-constraints:
|
||||||
nodeset: ubuntu-bionic
|
nodeset: ubuntu-focal
|
||||||
gate:
|
gate:
|
||||||
jobs:
|
jobs:
|
||||||
- openstack-tox-lower-constraints:
|
- openstack-tox-lower-constraints:
|
||||||
nodeset: ubuntu-bionic
|
nodeset: ubuntu-focal
|
||||||
|
|
||||||
- project:
|
- project:
|
||||||
templates:
|
templates:
|
||||||
@ -57,5 +57,5 @@
|
|||||||
- publish-openstack-docs-pti
|
- publish-openstack-docs-pti
|
||||||
- release-notes-jobs-python3
|
- release-notes-jobs-python3
|
||||||
- check-requirements
|
- check-requirements
|
||||||
- kuryr-kubernetes-lower-constraints-bionic-jobs
|
- kuryr-kubernetes-lower-constraints-focal-jobs
|
||||||
- kuryr-kubernetes-tempest-jobs
|
- kuryr-kubernetes-tempest-jobs
|
||||||
|
@ -208,8 +208,8 @@
|
|||||||
- octavia-tempest-plugin
|
- octavia-tempest-plugin
|
||||||
devstack_localrc:
|
devstack_localrc:
|
||||||
KURYR_ENFORCE_SG_RULES: true
|
KURYR_ENFORCE_SG_RULES: true
|
||||||
OCTAVIA_AMP_IMAGE_FILE: /tmp/test-only-amphora-x64-haproxy-ubuntu-bionic.qcow2
|
OCTAVIA_AMP_IMAGE_FILE: /tmp/test-only-amphora-x64-haproxy-ubuntu-focal.qcow2
|
||||||
OCTAVIA_AMP_IMAGE_NAME: test-only-amphora-x64-haproxy-ubuntu-bionic
|
OCTAVIA_AMP_IMAGE_NAME: test-only-amphora-x64-haproxy-ubuntu-focal
|
||||||
OCTAVIA_AMP_IMAGE_SIZE: 3
|
OCTAVIA_AMP_IMAGE_SIZE: 3
|
||||||
devstack_local_conf:
|
devstack_local_conf:
|
||||||
post-config:
|
post-config:
|
||||||
|
@ -2,5 +2,5 @@
|
|||||||
tasks:
|
tasks:
|
||||||
- name: Download amphora tarball
|
- name: Download amphora tarball
|
||||||
get_url:
|
get_url:
|
||||||
url: "https://tarballs.openstack.org/octavia/test-images/test-only-amphora-x64-haproxy-ubuntu-bionic.qcow2"
|
url: "https://tarballs.openstack.org/octavia/test-images/test-only-amphora-x64-haproxy-ubuntu-focal.qcow2"
|
||||||
dest: /tmp/test-only-amphora-x64-haproxy-ubuntu-bionic.qcow2
|
dest: /tmp/test-only-amphora-x64-haproxy-ubuntu-focal.qcow2
|
||||||
|
Loading…
Reference in New Issue
Block a user