From d3551631f1f58c00c8f124a9bb5e4429dfe52e11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Andr=C3=A9?= Date: Tue, 11 Mar 2025 08:26:17 +0100 Subject: [PATCH 1/2] CI: skip TestLayer3RouterRevision on bobcat Due to https://bugs.launchpad.net/neutron/+bug/2101871, which causes neutron to return a 500 error. --- .../openstack/networking/v2/extensions/layer3/routers_test.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/internal/acceptance/openstack/networking/v2/extensions/layer3/routers_test.go b/internal/acceptance/openstack/networking/v2/extensions/layer3/routers_test.go index 1df4375164..5930be2a1e 100644 --- a/internal/acceptance/openstack/networking/v2/extensions/layer3/routers_test.go +++ b/internal/acceptance/openstack/networking/v2/extensions/layer3/routers_test.go @@ -216,6 +216,8 @@ func TestLayer3RouterAgents(t *testing.T) { } func TestLayer3RouterRevision(t *testing.T) { + // https://bugs.launchpad.net/neutron/+bug/2101871 + clients.SkipRelease(t, "stable/2023.2") client, err := clients.NewNetworkV2Client() th.AssertNoErr(t, err) From 844b059a0a154c84535ceeda5640ccd92eb0aa82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Andr=C3=A9?= Date: Tue, 11 Mar 2025 09:52:44 +0100 Subject: [PATCH 2/2] CI: Fix SkipRelease for stable branches Since 5819dc0c7b6c72a3d6cddb1584e8f28ad42a2cc8, `getReleaseFromEnv()` trims the `stable/` prefix, which caused the condition in `SkipRelease()` to fail if we looked for a release name including the prefix. Fix `SkipRelease()` to account for release names with a `stable/` prefix. --- internal/acceptance/clients/conditions.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/acceptance/clients/conditions.go b/internal/acceptance/clients/conditions.go index 619d31a94e..c48ac208a9 100644 --- a/internal/acceptance/clients/conditions.go +++ b/internal/acceptance/clients/conditions.go @@ -119,7 +119,7 @@ func getReleaseFromEnv(t *testing.T) string { // release. Releases are named such as 'stable/mitaka', master, etc. func SkipRelease(t *testing.T, release string) { current := getReleaseFromEnv(t) - if current == release { + if current == strings.TrimPrefix(release, "stable/") { t.Skipf("this is not supported in %s", release) } }