From 9c24064fb606d34451ec2b16e8b934528e123cdd Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Sat, 15 Mar 2025 08:14:49 +0200 Subject: [PATCH] Make Element Call fail during validation if on an unsupported architecture (like arm32) --- roles/custom/matrix-element-call/defaults/main.yml | 4 ++++ roles/custom/matrix-element-call/tasks/validate_config.yml | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/roles/custom/matrix-element-call/defaults/main.yml b/roles/custom/matrix-element-call/defaults/main.yml index 2d8853345..c69c0a682 100644 --- a/roles/custom/matrix-element-call/defaults/main.yml +++ b/roles/custom/matrix-element-call/defaults/main.yml @@ -20,6 +20,10 @@ matrix_element_call_path_prefix: / matrix_element_call_base_path: "{{ matrix_base_data_path }}/element-call" +# The architecture for Element Call container images. +# Recognized values by us are 'amd64', 'arm32' and 'arm64'. +matrix_element_call_architecture: "{{ matrix_architecture }}" + matrix_element_call_container_image: "{{ matrix_element_call_container_image_registry_prefix }}element-hq/element-call:{{ matrix_element_call_container_image_tag }}" matrix_element_call_container_image_registry_prefix: "{{ matrix_element_call_container_image_registry_prefix_upstream }}" matrix_element_call_container_image_registry_prefix_upstream: "{{ matrix_element_call_container_image_registry_prefix_upstream_default }}" diff --git a/roles/custom/matrix-element-call/tasks/validate_config.yml b/roles/custom/matrix-element-call/tasks/validate_config.yml index 19934fc0f..738b2de3c 100644 --- a/roles/custom/matrix-element-call/tasks/validate_config.yml +++ b/roles/custom/matrix-element-call/tasks/validate_config.yml @@ -6,6 +6,13 @@ --- +- name: Fail if Element Call architecture is not supported + ansible.builtin.fail: + msg: > + Element Call is only supported on amd64 and arm64 architectures. + Your architecture is configured as '{{ matrix_element_call_architecture }}'. + when: "matrix_element_call_architecture not in ['amd64', 'arm64']" + - name: Fail if required Element Call settings are not defined ansible.builtin.fail: msg: >