Make tests use correct image!

ansible/group_vars/all

@@ -1,5 +1,3 @@
 operator_image: ansible/awx-operator
 operator_version: 0.5.0
 pull_policy: Always
-operator_file_path: "../deploy/awx-operator.yaml"
-operator_template: "../deploy/operator.yaml"

ansible/templates/operator.yml.j2

@@ -12,7 +12,6 @@ spec:
     metadata:
       labels:
         name: awx-operator
-        namespace: default
     spec:
       serviceAccountName: awx-operator
       containers:

molecule/test-local/converge.yml

@@ -26,11 +26,9 @@
     deploy_dir: "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') }}/deploy"
     templates_dir: "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') }}/ansible/templates"
     pull_policy: Never
-    operator_image: awx.ansible.com/awx-operator:testing
+    operator_image: awx.ansible.com/awx-operator
+    operator_version: testing
     custom_resource: "{{ lookup('file', '/'.join([deploy_dir, 'crds/awx_v1beta1_molecule.yaml'])) | from_yaml }}"
-  vars_files:
-    - "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') }}/ansible/group_vars/all"
-
   tasks:
 
     - block:

molecule/test-minikube/converge.yml

@@ -34,11 +34,10 @@
     deploy_dir: "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') }}/deploy"
     templates_dir: "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') }}/ansible/templates"
     pull_policy: Never
-    operator_image: awx.ansible.com/awx-operator:testing
+    operator_image: awx.ansible.com/awx-operator
+    operator_version: testing
     # Change this to _awx to test AWX, _tower to test Tower.
     custom_resource: "{{ lookup('file', '/'.join([deploy_dir, 'crds/awx_v1beta1_molecule.yaml'])) | from_yaml }}"
-  vars_files:
-    - "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') }}/ansible/group_vars/all"
 
   tasks:
     - block: