ci: add debugging

vexxhost · Sep 18, 2023 · 2901afa · 2901afa
1 parent c185727
commit 2901afa
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/.github/workflows/ceph.yml b/.github/workflows/ceph.yml
@@ -23,14 +23,14 @@ on:
     inputs:
       debug_enabled:
         type: boolean
-        description: 'Run the build with tmate debugging enabled (https://github.com/marketplace/actions/debugging-with-tmate)'
+        description: "Run the build with tmate debugging enabled (https://github.com/marketplace/actions/debugging-with-tmate)"
         required: false
         default: false
       network_backend:
         type: choice
-        description: 'Network backend type'
+        description: "Network backend type"
         required: true
-        default: 'ovn'
+        default: "ovn"
         options:
           - openvswitch
           - ovn
@@ -50,17 +50,15 @@ jobs:
         uses: ./.github/actions/molecule
         with:
           scenario: ceph
-          network_backend: ${{ matrix.network_backend }}
+          storage_backend: ceph
+          network_backend: ${{ inputs.network_backend }}
 
       # Enable tmate debugging of manually-triggered workflows if the input option was provided
       - name: Setup tmate session
         if: ${{ failure() }}
         uses: mxschmitt/action-tmate@v3
         timeout-minutes: 60
 
-      - name: Run Molecule Destroy
-        run: poetry run molecule destroy -s ceph
-
   test:
     runs-on: ubuntu-latest-16-cores
     if: github.event_name != 'workflow_dispatch' || !inputs.debug_enabled
@@ -81,5 +79,5 @@ jobs:
         uses: ./.github/actions/molecule
         with:
           scenario: ceph
-          network_backend: ${{ matrix.network_backend }}
           storage_backend: ceph
+          network_backend: ${{ matrix.network_backend }}
diff --git a/molecule/ceph/converge.yml b/molecule/ceph/converge.yml
@@ -18,7 +18,7 @@
 - name: Install Kubernetes
   ansible.builtin.import_playbook: ../shared/converge/kubernetes.yml
 
-- name: Install OpenStack
+- name: Install Infrastructure
   hosts: controllers
   become: true
   roles:
@@ -28,9 +28,14 @@
     - vexxhost.atmosphere.rabbitmq_cluster_operator
     - vexxhost.atmosphere.percona_xtradb_cluster_operator
     - vexxhost.atmosphere.percona_xtradb_cluster
+    - vexxhost.atmosphere.memcached
+
+- name: Install OpenStack
+  hosts: controllers
+  become: true
+  roles:
     - vexxhost.atmosphere.keycloak
     - vexxhost.atmosphere.keepalived
-    - vexxhost.atmosphere.memcached
     - vexxhost.atmosphere.keystone
     - vexxhost.atmosphere.ceph_provisioners
     - vexxhost.atmosphere.glance