From 7f081da5adf766b6ec468e470f38487d33488eb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Andr=C3=A9?= <m.andre@redhat.com>
Date: Wed, 29 Jan 2025 17:41:24 +0100
Subject: [PATCH 1/3] CI: Enable openstack-cli-server

Similar to what was done in https://github.com/gophercloud/gophercloud/commit/f018747518afe2ec0e703bb510112ba363a559a1

This allows to save a couple of minutes standing up devstack.
---
 .github/workflows/e2e.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index e8d3c845..4cf57ef6 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -16,9 +16,11 @@ jobs:
           - name: "dalmatian"
             openstack_version: "stable/2024.2"
             ubuntu_version: "22.04"
+            additional_services: "openstack-cli-server"
           - name: "caracal"
             openstack_version: "stable/2024.1"
             ubuntu_version: "22.04"
+            additional_services: ""
     env:
       image_tag: virtual-registry.k-orc.cloud/ci:commit-${GITHUB_SHA::7}
 
@@ -32,6 +34,7 @@ jobs:
       with:
         enable_workaround_docker_io: 'false'
         branch: ${{ matrix.openstack_version }}
+        enabled_services: "${{ matrix.additional_services }}"
 
     - name: Deploy a Kind Cluster
       uses: helm/kind-action@ae94020eaf628e9b9b9f341a10cc0cdcf5c018fb

From 3af240d7adf5a4b57fcb53749135907d30aa5913 Mon Sep 17 00:00:00 2001
From: Matthew Booth <mbooth@redhat.com>
Date: Fri, 31 Jan 2025 13:01:04 +0000
Subject: [PATCH 2/3] CI: Bump log level to 5 for e2e tests

---
 .github/workflows/e2e.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index 4cf57ef6..33bf8a2c 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -49,7 +49,7 @@ jobs:
     - name: Deploy orc
       run: |
         kubectl config use-context kind-orc
-        make deploy IMG=${{ env.image_tag }}
+        make deploy IMG=${{ env.image_tag }} LOGLEVEL=5
 
     - name: Run e2e tests
       run: make test-e2e

From 69a2bd0b2b73239d8afc2988003654dda427db3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Andr=C3=A9?= <m.andre@redhat.com>
Date: Mon, 3 Feb 2025 08:19:40 +0100
Subject: [PATCH 3/3] WIP: debug

---
 hack/e2e.sh | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/hack/e2e.sh b/hack/e2e.sh
index b9c468e7..5bbeeefd 100755
--- a/hack/e2e.sh
+++ b/hack/e2e.sh
@@ -26,10 +26,21 @@ E2E_KUTTL_TEST=${E2E_KUTTL_TEST:-}
 # Define a custom external network
 export E2E_EXTERNAL_NETWORK_NAME=${E2E_EXTERNAL_NETWORK_NAME:-private}
 
+export OS_CLOUD=devstack
+
+echo OpenStack Networks before running kuttl
+set -x
+openstack network list
+openstack subnet list
+set +x
+
 kubectl kuttl test $E2E_KUTTL_DIR --test "$E2E_KUTTL_TEST"
 
-# Now drop admin privileges
-export OS_CLOUD=devstack
+echo OpenStack Networks after running kuttl
+set -x
+openstack network list
+openstack subnet list
+set +x
 
 cd examples