From 2426956a0a52a576fba82b4c24a44dd0b5e80611 Mon Sep 17 00:00:00 2001
From: Shane McDonald <me@shanemcd.com>
Date: Wed, 6 Oct 2021 19:57:16 -0400
Subject: [PATCH] Allow for overridding awx image in tests

---
 config/samples/awx_v1beta1_awx.yaml           |  6 -----
 molecule/default/molecule.yml                 |  2 ++
 molecule/default/tasks/awx_test.yml           |  4 +--
 .../default/templates/awx_cr_molecule.yml.j2  | 27 +++++++++++++++++++
 molecule/kind/molecule.yml                    |  2 ++
 5 files changed, 32 insertions(+), 9 deletions(-)
 create mode 100644 molecule/default/templates/awx_cr_molecule.yml.j2

diff --git a/config/samples/awx_v1beta1_awx.yaml b/config/samples/awx_v1beta1_awx.yaml
index 81210b37..c6b07a16 100644
--- a/config/samples/awx_v1beta1_awx.yaml
+++ b/config/samples/awx_v1beta1_awx.yaml
@@ -4,12 +4,6 @@ kind: AWX
 metadata:
   name: example-awx
 spec:
-  service_account_annotations: |
-    foo: bar
-  deployment_type: awx
-  ingress_type: ingress
-  ingress_annotations: |
-    kubernetes.io/ingress.class: nginx
   web_resource_requirements:
     requests:
       cpu: 250m
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index 09621b73..ef23e519 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -21,6 +21,8 @@ provisioner:
         namespace: ${TEST_OPERATOR_NAMESPACE:-osdk-test}
     host_vars:
       localhost:
+        awx_image: ${AWX_TEST_IMAGE:-""}
+        awx_version: ${AWX_TEST_VERSION:-""}
         ansible_python_interpreter: '{{ ansible_playbook_python }}'
         config_dir: ${MOLECULE_PROJECT_DIRECTORY}/config
         samples_dir: ${MOLECULE_PROJECT_DIRECTORY}/config/samples
diff --git a/molecule/default/tasks/awx_test.yml b/molecule/default/tasks/awx_test.yml
index f0f2c7f0..0afc6c2b 100644
--- a/molecule/default/tasks/awx_test.yml
+++ b/molecule/default/tasks/awx_test.yml
@@ -3,15 +3,13 @@
   k8s:
     state: present
     namespace: '{{ namespace }}'
-    definition: "{{ lookup('template', '/'.join([samples_dir, cr_file])) | from_yaml }}"
+    definition: "{{ lookup('template', 'awx_cr_molecule.yml.j2') | from_yaml }}"
     wait: yes
     wait_timeout: 900
     wait_condition:
       type: Running
       reason: Successful
       status: "True"
-  vars:
-    cr_file: 'awx_v1beta1_awx.yaml'
 
 - name: Obtain generated admin password
   k8s_info:
diff --git a/molecule/default/templates/awx_cr_molecule.yml.j2 b/molecule/default/templates/awx_cr_molecule.yml.j2
new file mode 100644
index 00000000..e7c411d7
--- /dev/null
+++ b/molecule/default/templates/awx_cr_molecule.yml.j2
@@ -0,0 +1,27 @@
+---
+apiVersion: awx.ansible.com/v1beta1
+kind: AWX
+metadata:
+  name: example-awx
+spec:
+{% if awx_image %}
+  image: {{ awx_image }}
+{% endif %}
+{% if awx_version %}
+  image_version: {{ awx_version }}
+{% endif %}
+  ingress_type: ingress
+  ingress_annotations: |
+    kubernetes.io/ingress.class: nginx
+  web_resource_requirements:
+    requests:
+      cpu: 250m
+      memory: 128M
+  task_resource_requirements:
+    requests:
+      cpu: 250m
+      memory: 128M
+  ee_resource_requirements:
+    requests:
+      cpu: 200m
+      memory: 64M
diff --git a/molecule/kind/molecule.yml b/molecule/kind/molecule.yml
index 430cd8e6..1b9aae48 100644
--- a/molecule/kind/molecule.yml
+++ b/molecule/kind/molecule.yml
@@ -23,6 +23,8 @@ provisioner:
         namespace: ${TEST_OPERATOR_NAMESPACE:-osdk-test}
     host_vars:
       localhost:
+        awx_image: ${AWX_TEST_IMAGE:-""}
+        awx_version: ${AWX_TEST_VERSION:-""}
         ansible_python_interpreter: '{{ ansible_playbook_python }}'
         config_dir: ${MOLECULE_PROJECT_DIRECTORY}/config
         samples_dir: ${MOLECULE_PROJECT_DIRECTORY}/config/samples