From 3c5ccb915e785e4fa928519b3e4f21686266fbb6 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Fri, 25 Sep 2020 09:28:00 +0100
Subject: [PATCH] CI: octavia: remove octavia from magnum scenario
Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/755589
Co-Authored-By: wu.chunyang <wuchunyang@yovole.com>
Change-Id: I489c1ca23d8abc350d3204ecc167d5d93bbbd1d9
---
tests/run.yml | 7 -------
tests/setup_gate.sh | 4 ++--
tests/templates/globals-default.j2 | 1 -
tests/test-magnum.sh | 13 ++++---------
zuul.d/base.yaml | 2 +-
5 files changed, 7 insertions(+), 20 deletions(-)
diff --git a/tests/run.yml b/tests/run.yml
index 380bf8fb75..bdeab457c0 100644
--- a/tests/run.yml
+++ b/tests/run.yml
@@ -274,13 +274,6 @@
docker_image_tag: "{{ build_image_tag if need_build_image else (zuul.branch | basename) ~ docker_image_tag_suffix }}"
docker_image_prefix: "{{ 'primary:4000/lokolla/' if need_build_image else 'kolla/' }}"
- # NOTE(yoctozepto): k-a octavia-certificates should run before k-a bootstrap-servers
- # because the latter hijacks /etc/kolla permissions (due to same directory on the
- # same host being used by both)
- - name: create TLS certificates for octavia
- command: kolla-ansible octavia-certificates
- when: scenario == 'magnum'
-
# NOTE(mgoddard): We are using the script module here and later to ensure
# we use the local copy of these scripts, rather than the one on the remote
# host, which could be checked out to a previous release (in an upgrade
diff --git a/tests/setup_gate.sh b/tests/setup_gate.sh
index 5d9ce2ddeb..aeff6c1687 100755
--- a/tests/setup_gate.sh
+++ b/tests/setup_gate.sh
@@ -18,7 +18,7 @@ function setup_openstack_clients {
packages+=(python-ironicclient python-ironic-inspector-client)
fi
if [[ $SCENARIO == magnum ]]; then
- packages+=(python-designateclient python-magnumclient python-octaviaclient python-troveclient)
+ packages+=(python-designateclient python-magnumclient python-troveclient)
fi
if [[ $SCENARIO == masakari ]]; then
packages+=(python-masakariclient)
@@ -66,7 +66,7 @@ function prepare_images {
GATE_IMAGES+=",^dnsmasq,^ironic,^iscsid"
fi
if [[ $SCENARIO == "magnum" ]]; then
- GATE_IMAGES+=",^designate,^magnum,^octavia,^trove"
+ GATE_IMAGES+=",^designate,^magnum,^trove"
fi
if [[ $SCENARIO == "masakari" ]]; then
GATE_IMAGES+=",^masakari"
diff --git a/tests/templates/globals-default.j2 b/tests/templates/globals-default.j2
index f741a07970..02930493aa 100644
--- a/tests/templates/globals-default.j2
+++ b/tests/templates/globals-default.j2
@@ -157,7 +157,6 @@ enable_prometheus_openstack_exporter: "no"
enable_designate: "yes"
enable_magnum: "yes"
enable_trove: "yes"
-enable_octavia: "yes"
{% endif %}
{% if scenario == "monasca" %}
diff --git a/tests/test-magnum.sh b/tests/test-magnum.sh
index 6919f675da..7917b1e5de 100755
--- a/tests/test-magnum.sh
+++ b/tests/test-magnum.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-# Test deployment of magnum, octavia and designate.
+# Test deployment of magnum, trove and designate.
set -o xtrace
set -o errexit
@@ -14,10 +14,6 @@ function test_magnum_clusters {
openstack coe cluster template list
}
-function test_octavia {
- openstack loadbalancer list
-}
-
function test_trove {
# smoke test
openstack database instance list
@@ -66,19 +62,18 @@ function test_magnum_logged {
. /etc/kolla/admin-openrc.sh
. ~/openstackclient-venv/bin/activate
test_magnum_clusters
- test_octavia
test_designate
test_trove
}
function test_magnum {
- echo "Testing Magnum, Octavia, Trove and Designate"
+ echo "Testing Magnum, Trove and Designate"
test_magnum_logged > /tmp/logs/ansible/test-magnum 2>&1
result=$?
if [[ $result != 0 ]]; then
- echo "Testing Magnum, Octavia, Trove and Designate failed. See ansible/test-magnum for details"
+ echo "Testing Magnum, Trove and Designate failed. See ansible/test-magnum for details"
else
- echo "Successfully tested Magnum, Octavia, Trove and Designate . See ansible/test-magnum for details"
+ echo "Successfully tested Magnum, Trove and Designate . See ansible/test-magnum for details"
fi
return $result
}
diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml
index f702d3476d..79105e2082 100644
--- a/zuul.d/base.yaml
+++ b/zuul.d/base.yaml
@@ -131,7 +131,7 @@
parent: kolla-ansible-base
voting: false
files:
- - ^ansible/roles/(designate|magnum|octavia|octavia-certificates|trove)/
+ - ^ansible/roles/(designate|magnum|trove)/
- ^tests/test-dashboard.sh
- ^tests/test-magnum.sh
vars: