From b35b08724bb2bf6d735affef6e00c59cf5bce00b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Dulko?= Date: Wed, 3 Apr 2019 13:17:51 +0200 Subject: [PATCH] Switch to CentOS Amphora Looks like Ubuntu's Amphora is broken, probably due to latest update of ubuntu-minimal cloud image (which includes cloud-init version bump that might be the culprit). This commit switches our gates to CentOS amp to work the problem around until we fix the Ubuntu one. Also the timeout for the jobs is raised to 3 hours because it seems like building containers in the gate take ages. Closes-Bug: 1822862 Change-Id: I3650aac01334e924ca64fcc4e79928141e010e5a --- .zuul.d/base.yaml | 1 + .zuul.d/octavia.yaml | 6 ++++-- playbooks/get_amphora_tarball.yaml | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.zuul.d/base.yaml b/.zuul.d/base.yaml index 87e066e1c..954e9f024 100644 --- a/.zuul.d/base.yaml +++ b/.zuul.d/base.yaml @@ -22,6 +22,7 @@ - openstack/kuryr-kubernetes - openstack/kuryr-tempest-plugin - openstack/tempest + timeout: 10800 post-run: playbooks/copy-k8s-logs.yaml host-vars: controller: diff --git a/.zuul.d/octavia.yaml b/.zuul.d/octavia.yaml index a05185eab..4237b6b0c 100644 --- a/.zuul.d/octavia.yaml +++ b/.zuul.d/octavia.yaml @@ -30,9 +30,11 @@ barbican: https://git.openstack.org/openstack/barbican vars: devstack_localrc: - OCTAVIA_AMP_IMAGE_FILE: "/tmp/test-only-amphora-x64-haproxy-ubuntu-xenial.qcow2" + OCTAVIA_AMP_IMAGE_FILE: "/tmp/test-only-amphora-x64-haproxy-centos-7.qcow2" OCTAVIA_AMP_IMAGE_SIZE: 3 - OCTAVIA_AMP_IMAGE_NAME: "test-only-amphora-x64-haproxy-ubuntu-xenial" + OCTAVIA_AMP_IMAGE_NAME: "test-only-amphora-x64-haproxy-centos-7" + OCTAVIA_AMP_BASE_OS: centos + OCTAVIA_AMP_DISTRIBUTION_RELEASE_ID: 7 devstack_local_conf: post-config: $OCTAVIA_CONF: diff --git a/playbooks/get_amphora_tarball.yaml b/playbooks/get_amphora_tarball.yaml index 30033f7a1..c32b94bf4 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-xenial.qcow2" - dest: /tmp/test-only-amphora-x64-haproxy-ubuntu-xenial.qcow2 + url: "https://tarballs.openstack.org/octavia/test-images/test-only-amphora-x64-haproxy-centos-7.qcow2" + dest: /tmp/test-only-amphora-x64-haproxy-centos-7.qcow2