From a5d5028dae50ff49a931b27fdb5dc94b8d4d027a Mon Sep 17 00:00:00 2001 From: Hao Liu <44379968+TheRealHaoLiu@users.noreply.github.com> Date: Wed, 10 Apr 2024 13:43:08 -0400 Subject: [PATCH] Add AWX_EE_TEST_IMAGE option to molecule test (#1819) --- molecule/default/molecule.yml | 1 + molecule/default/templates/awx_cr_molecule.yml.j2 | 6 ++++++ molecule/kind/molecule.yml | 1 + 3 files changed, 8 insertions(+) diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index 58f50eed..f1f4120e 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -21,6 +21,7 @@ provisioner: namespace: ${TEST_OPERATOR_NAMESPACE:-osdk-test} host_vars: localhost: + awx_ee_image: ${AWX_EE_TEST_IMAGE:-""} awx_image: ${AWX_TEST_IMAGE:-""} awx_version: ${AWX_TEST_VERSION:-""} default_awx_version: "{{ lookup('url', 'https://api.github.com/repos/ansible/awx/releases/latest') | from_json | json_query('tag_name') }}" diff --git a/molecule/default/templates/awx_cr_molecule.yml.j2 b/molecule/default/templates/awx_cr_molecule.yml.j2 index f581ecbe..16b68373 100644 --- a/molecule/default/templates/awx_cr_molecule.yml.j2 +++ b/molecule/default/templates/awx_cr_molecule.yml.j2 @@ -13,6 +13,12 @@ spec: {% endif %} {% if awx_version %} image_version: {{ awx_version }} +{% endif %} +{% if awx_ee_image %} + control_plane_ee_image: {{ awx_ee_image }} + ee_images: + - image: {{ awx_ee_image }} + name: AWX EE {% endif %} ingress_type: ingress ingress_path: /awx diff --git a/molecule/kind/molecule.yml b/molecule/kind/molecule.yml index aa7f2774..54658123 100644 --- a/molecule/kind/molecule.yml +++ b/molecule/kind/molecule.yml @@ -23,6 +23,7 @@ provisioner: namespace: ${TEST_OPERATOR_NAMESPACE:-osdk-test} host_vars: localhost: + awx_ee_image: ${AWX_EE_TEST_IMAGE:-""} awx_image: ${AWX_TEST_IMAGE:-""} awx_version: ${AWX_TEST_VERSION:-""} ansible_python_interpreter: '{{ ansible_playbook_python }}'