From bb41c3889d1c58dca020470320aae9a63ec160c2 Mon Sep 17 00:00:00 2001 From: Maysa Macedo Date: Tue, 5 Oct 2021 15:43:59 +0000 Subject: [PATCH] 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 --- .zuul.d/base.yaml | 8 ++++---- .zuul.d/k8s-np-e2e.yaml | 4 ++-- .zuul.d/project.yaml | 8 ++++---- .zuul.d/tempest-jobs.yaml | 4 ++-- playbooks/get_amphora_tarball.yaml | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.zuul.d/base.yaml b/.zuul.d/base.yaml index 82acf4611..a7d5a6983 100644 --- a/.zuul.d/base.yaml +++ b/.zuul.d/base.yaml @@ -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: diff --git a/.zuul.d/k8s-np-e2e.yaml b/.zuul.d/k8s-np-e2e.yaml index 2b6148d4c..32dbe8120 100644 --- a/.zuul.d/k8s-np-e2e.yaml +++ b/.zuul.d/k8s-np-e2e.yaml @@ -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 diff --git a/.zuul.d/project.yaml b/.zuul.d/project.yaml index e608a0db8..0e03cc014 100644 --- a/.zuul.d/project.yaml +++ b/.zuul.d/project.yaml @@ -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 diff --git a/.zuul.d/tempest-jobs.yaml b/.zuul.d/tempest-jobs.yaml index 72107b6e3..51f5ef5e8 100644 --- a/.zuul.d/tempest-jobs.yaml +++ b/.zuul.d/tempest-jobs.yaml @@ -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: diff --git a/playbooks/get_amphora_tarball.yaml b/playbooks/get_amphora_tarball.yaml index 97c639be9..e400adf9d 100644 --- a/playbooks/get_amphora_tarball.yaml +++ b/playbooks/get_amphora_tarball.yaml @@ -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