From 1d3d5007fdc6eaeba335ac76c1867187ba572577 Mon Sep 17 00:00:00 2001 From: Robert de Bock Date: Fri, 30 Aug 2024 14:35:56 +0200 Subject: [PATCH] Pass all variables. --- templates/molecule-action.yml.j2 | 1 + templates/tox.ini.j2 | 2 +- vars/main.yml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/templates/molecule-action.yml.j2 b/templates/molecule-action.yml.j2 index 43d416b..5df8ab7 100644 --- a/templates/molecule-action.yml.j2 +++ b/templates/molecule-action.yml.j2 @@ -68,6 +68,7 @@ jobs: tag: {% raw %}${{ matrix.config.tag }}{% endraw %} {% if github_variables_mapping is defined %} + {% for item in github_variables_mapping %} {{ item.variable }}: {% raw %}${{ {%endraw %}{{ item.name }} {% raw %}}}{% endraw %} {% endfor %} diff --git a/templates/tox.ini.j2 b/templates/tox.ini.j2 index ed6d0aa..744a483 100644 --- a/templates/tox.ini.j2 +++ b/templates/tox.ini.j2 @@ -11,7 +11,7 @@ setenv = ANSIBLE_FORCE_COLOR=1 ANSIBLE_ROLES_PATH=../ -passenv = namespace, image, tag, DOCKER_HOST +passenv = * # Test supported releases of ansible-core. See: # https://docs.ansible.com/ansible/latest/reference_appendices/release_and_maintenance.html#ansible-core-support-matrix diff --git a/vars/main.yml b/vars/main.yml index fe7c25b..a494de0 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -75,7 +75,7 @@ distribution_version_mapping: all: - latest # 24 - jammy # 22 - - focal # 22 + - focal # 20 noble: - latest jammy: