Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: switch keycloak out of containers #1070

Merged
merged 1 commit into from
Apr 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions molecule/keycloak/create.yml
1 change: 1 addition & 0 deletions molecule/keycloak/group_vars
1 change: 1 addition & 0 deletions molecule/keycloak/host_vars
2 changes: 1 addition & 1 deletion molecule/keycloak/molecule.yml
7 changes: 5 additions & 2 deletions molecule/keycloak/prepare.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
24 changes: 14 additions & 10 deletions zuul.d/jobs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down
18 changes: 0 additions & 18 deletions zuul.d/playbooks/molecule-keycloak/pre.yml

This file was deleted.

3 changes: 2 additions & 1 deletion zuul.d/project.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,12 @@
check:
jobs:
- atmosphere-buildset-registry
- atmosphere-molecule-aio-keycloak
- atmosphere-molecule-aio-openvswitch
- atmosphere-molecule-aio-ovn
- atmosphere-molecule-csi-local-path-provisioner
- atmosphere-molecule-csi-rbd
- atmosphere-molecule-keycloak
post:
jobs:
- atmosphere-molecule-aio-keycloak
- atmosphere-upload-images