diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index e8d3c845..33bf8a2c 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 @@ -46,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 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