ci: switch keycloak out of containers

vexxhost · Apr 8, 2024 · 012536d · 012536d
1 parent ee1ff23
commit 012536d
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 31 deletions.
diff --git a/molecule/keycloak/create.yml b/molecule/keycloak/create.yml
@@ -0,0 +1 @@
+../aio/create.yml
diff --git a/molecule/keycloak/group_vars b/molecule/keycloak/group_vars
@@ -0,0 +1 @@
+../aio/group_vars
diff --git a/molecule/keycloak/host_vars b/molecule/keycloak/host_vars
@@ -0,0 +1 @@
+../aio/host_vars
diff --git a/molecule/keycloak/molecule.yml b/molecule/keycloak/molecule.yml
@@ -1 +1 @@
-../shared/molecule.yml
+../aio/molecule.yml
diff --git a/molecule/keycloak/prepare.yml b/molecule/keycloak/prepare.yml
@@ -12,8 +12,11 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-- import_playbook: ../shared/prepare/base.yml
-- import_playbook: ../shared/prepare/kubernetes.yml
+- name: Install Kubernetes
+  ansible.builtin.import_playbook: vexxhost.atmosphere.kubernetes
+
+- name: Install CSI
+  ansible.builtin.import_playbook: vexxhost.atmosphere.csi
 
 - hosts: controllers
   become: true

diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
@@ -36,13 +36,6 @@
     dependencies:
       - atmosphere-buildset-registry
 
-- job:
-    name: atmosphere-molecule-keycloak
-    parent: atmosphere-molecule
-    pre-run: zuul.d/playbooks/molecule-keycloak/pre.yml
-    vars:
-      tox_envlist: molecule-keycloak
-
 - job:
     name: atmosphere-molecule-csi
     parent: atmosphere-molecule
@@ -64,25 +57,36 @@
     name: atmosphere-molecule-aio
     parent: atmosphere-molecule
     abstract: true
-    timeout: 7200
     pre-run: zuul.d/playbooks/molecule-aio/pre.yml
     post-run: zuul.d/playbooks/molecule-aio/post.yml
     roles:
       - zuul: openstack/openstack-helm-infra
+
+- job:
+    name: atmosphere-molecule-aio-keycloak
+    parent: atmosphere-molecule-aio
+    vars:
+      tox_envlist: molecule-keycloak
+
+- job:
+    name: atmosphere-molecule-aio-full
+    parent: atmosphere-molecule-aio
+    abstract: true
+    timeout: 7200
     nodeset:
       nodes:
         - name: ubuntu-jammy
           label: jammy-16c-64g
 
 - job:
     name: atmosphere-molecule-aio-openvswitch
-    parent: atmosphere-molecule-aio
+    parent: atmosphere-molecule-aio-full
     vars:
       tox_envlist: molecule-aio-openvswitch
 
 - job:
     name: atmosphere-molecule-aio-ovn
-    parent: atmosphere-molecule-aio
+    parent: atmosphere-molecule-aio-full
     # NOTE(mnaser): https://github.com/vexxhost/atmosphere/issues/662
     voting: false
     vars:

diff --git a/zuul.d/playbooks/molecule-keycloak/pre.yml b/zuul.d/playbooks/molecule-keycloak/pre.yml