openstack
/
kuryr-kubernetes
Code Issues Proposed changes

Merge "Move jobs to use Ubuntu Focal"

This commit is contained in:
Zuul 2021-10-11 13:34:29 +00:00 committed by Gerrit Code Review
parent c4de90ed65 bb41c3889d
commit 14f8489d50
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.zuul.d/base.yaml
View File

@ -187,8 +187,8 @@
KURYR_EP_DRIVER_OCTAVIA_PROVIDER: ovn
KURYR_K8S_OCTAVIA_MEMBER_MODE: L2
KURYR_LB_ALGORITHM: SOURCE_IP_PORT
OCTAVIA_AMP_IMAGE_FILE: /tmp/test-only-amphora-x64-haproxy-ubuntu-bionic.qcow2
OCTAVIA_AMP_IMAGE_NAME: test-only-amphora-x64-haproxy-ubuntu-bionic
OCTAVIA_AMP_IMAGE_FILE: /tmp/test-only-amphora-x64-haproxy-ubuntu-focal.qcow2
OCTAVIA_AMP_IMAGE_NAME: test-only-amphora-x64-haproxy-ubuntu-focal
OCTAVIA_AMP_IMAGE_SIZE: 3
devstack_local_conf:
post-config:
@ -229,8 +229,8 @@
- kuryr-tempest-plugin
- octavia-tempest-plugin
devstack_localrc:
OCTAVIA_AMP_IMAGE_FILE: /tmp/test-only-amphora-x64-haproxy-ubuntu-bionic.qcow2
OCTAVIA_AMP_IMAGE_NAME: test-only-amphora-x64-haproxy-ubuntu-bionic
OCTAVIA_AMP_IMAGE_FILE: /tmp/test-only-amphora-x64-haproxy-ubuntu-focal.qcow2
OCTAVIA_AMP_IMAGE_NAME: test-only-amphora-x64-haproxy-ubuntu-focal
OCTAVIA_AMP_IMAGE_SIZE: 3
devstack_local_conf:
post-config:

4
.zuul.d/k8s-np-e2e.yaml
View File

@ -53,8 +53,8 @@
KURYR_SG_DRIVER: policy
KURYR_SUBNET_DRIVER: namespace
ML2_L3_PLUGIN: ovn-router,trunk,qos
OCTAVIA_AMP_IMAGE_FILE: "/tmp/test-only-amphora-x64-haproxy-ubuntu-bionic.qcow2"
OCTAVIA_AMP_IMAGE_NAME: "test-only-amphora-x64-haproxy-ubuntu-bionic"
OCTAVIA_AMP_IMAGE_FILE: "/tmp/test-only-amphora-x64-haproxy-ubuntu-focal.qcow2"
OCTAVIA_AMP_IMAGE_NAME: "test-only-amphora-x64-haproxy-ubuntu-focal"
OCTAVIA_AMP_IMAGE_SIZE: 3
OVN_BRANCH: v20.06.2
OVN_BUILD_FROM_SOURCE: true

8
.zuul.d/project.yaml
View File

@ -41,15 +41,15 @@
- kuryr-kubernetes-tempest-dual-stack
- project-template:
name: kuryr-kubernetes-lower-constraints-bionic-jobs
name: kuryr-kubernetes-lower-constraints-focal-jobs
check:
jobs:
- openstack-tox-lower-constraints:
nodeset: ubuntu-bionic
nodeset: ubuntu-focal
gate:
jobs:
- openstack-tox-lower-constraints:
nodeset: ubuntu-bionic
nodeset: ubuntu-focal
- project:
templates:
@ -57,5 +57,5 @@
- publish-openstack-docs-pti
- release-notes-jobs-python3
- check-requirements
- kuryr-kubernetes-lower-constraints-bionic-jobs
- kuryr-kubernetes-lower-constraints-focal-jobs
- kuryr-kubernetes-tempest-jobs

4
.zuul.d/tempest-jobs.yaml
View File

@ -208,8 +208,8 @@
- octavia-tempest-plugin
devstack_localrc:
KURYR_ENFORCE_SG_RULES: true
OCTAVIA_AMP_IMAGE_FILE: /tmp/test-only-amphora-x64-haproxy-ubuntu-bionic.qcow2
OCTAVIA_AMP_IMAGE_NAME: test-only-amphora-x64-haproxy-ubuntu-bionic
OCTAVIA_AMP_IMAGE_FILE: /tmp/test-only-amphora-x64-haproxy-ubuntu-focal.qcow2
OCTAVIA_AMP_IMAGE_NAME: test-only-amphora-x64-haproxy-ubuntu-focal
OCTAVIA_AMP_IMAGE_SIZE: 3
devstack_local_conf:
post-config:

4
playbooks/get_amphora_tarball.yaml
View File

@ -2,5 +2,5 @@
tasks:
- name: Download amphora tarball
get_url:
url: "https://tarballs.openstack.org/octavia/test-images/test-only-amphora-x64-haproxy-ubuntu-bionic.qcow2"
dest: /tmp/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-focal.qcow2