From 6d5b7724ff86b1018452e5788aabc6ea683a51bf Mon Sep 17 00:00:00 2001 From: Shane McDonald Date: Sat, 3 Oct 2020 14:18:21 -0400 Subject: [PATCH] Fix tests --- molecule/default/prepare.yml | 11 +++++++---- molecule/test-local/converge.yml | 11 +++++++---- molecule/test-minikube/converge.yml | 11 +++++++---- 3 files changed, 21 insertions(+), 12 deletions(-) diff --git a/molecule/default/prepare.yml b/molecule/default/prepare.yml index 63c841d6..a5edb8fb 100644 --- a/molecule/default/prepare.yml +++ b/molecule/default/prepare.yml @@ -6,6 +6,9 @@ vars: ansible_python_interpreter: '{{ ansible_playbook_python }}' deploy_dir: "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') }}/deploy" + templates_dir: "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') }}/ansible/templates" + vars_files: + - "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') }}/ansible/group_vars/all" tasks: - name: Create Custom Resource Definition @@ -20,9 +23,9 @@ - name: Create RBAC resources k8s: - definition: "{{ lookup('template', '/'.join([deploy_dir, item])) }}" + definition: "{{ lookup('template', '/'.join([templates_dir, item])) }}" namespace: '{{ operator_namespace }}' with_items: - - role.yaml - - role_binding.yaml - - service_account.yaml + - role.yml.j2 + - role_binding.yml.j2 + - service_account.yml.j2 diff --git a/molecule/test-local/converge.yml b/molecule/test-local/converge.yml index 58f94183..b098524f 100644 --- a/molecule/test-local/converge.yml +++ b/molecule/test-local/converge.yml @@ -24,9 +24,12 @@ vars: ansible_python_interpreter: '{{ ansible_playbook_python }}' 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 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: @@ -36,7 +39,7 @@ k8s: state: absent namespace: '{{ operator_namespace }}' - definition: "{{ lookup('template', '/'.join([deploy_dir, 'operator.yaml'])) }}" + definition: "{{ lookup('template', '/'.join([templates_dir, 'operator.yml.j2'])) }}" register: delete_deployment when: hostvars[groups.k8s.0].build_cmd.changed @@ -47,7 +50,7 @@ namespace: '{{ operator_namespace }}' name: '{{ definition.metadata.name }}' vars: - definition: "{{ lookup('template', '/'.join([deploy_dir, 'operator.yaml'])) | from_yaml }}" + definition: "{{ lookup('template', '/'.join([templates_dir, 'operator.yml.j2'])) | from_yaml }}" register: deployment until: not deployment.resources delay: 3 @@ -57,7 +60,7 @@ - name: Create the Operator Deployment k8s: namespace: '{{ operator_namespace }}' - definition: "{{ lookup('template', '/'.join([deploy_dir, 'operator.yaml'])) }}" + definition: "{{ lookup('template', '/'.join([templates_dir, 'operator.yml.j2'])) }}" - name: Ensure the AWX custom_resource namespace exists k8s: @@ -119,7 +122,7 @@ environment: KUBECONFIG: '{{ lookup("env", "KUBECONFIG") }}' vars: - definition: "{{ lookup('template', '/'.join([deploy_dir, 'operator.yaml'])) | from_yaml }}" + definition: "{{ lookup('template', '/'.join([templates_dir, 'operator.yml.j2'])) | from_yaml }}" register: log - name: print debug output diff --git a/molecule/test-minikube/converge.yml b/molecule/test-minikube/converge.yml index c0c56596..8a8c98e5 100644 --- a/molecule/test-minikube/converge.yml +++ b/molecule/test-minikube/converge.yml @@ -32,10 +32,13 @@ vars: ansible_python_interpreter: '{{ ansible_playbook_python }}' 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 # 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: @@ -43,7 +46,7 @@ k8s: state: absent namespace: '{{ operator_namespace }}' - definition: "{{ lookup('template', '/'.join([deploy_dir, 'operator.yaml'])) }}" + definition: "{{ lookup('template', '/'.join([templates_dir, 'operator.yml.j2'])) }}" register: delete_deployment when: build_cmd.changed @@ -54,7 +57,7 @@ namespace: '{{ operator_namespace }}' name: '{{ definition.metadata.name }}' vars: - definition: "{{ lookup('template', '/'.join([deploy_dir, 'operator.yaml'])) | from_yaml }}" + definition: "{{ lookup('template', '/'.join([templates_dir, 'operator.yml.j2'])) | from_yaml }}" register: deployment until: not deployment.resources delay: 3 @@ -64,7 +67,7 @@ - name: Create the Operator Deployment k8s: namespace: '{{ operator_namespace }}' - definition: "{{ lookup('template', '/'.join([deploy_dir, 'operator.yaml'])) }}" + definition: "{{ lookup('template', '/'.join([templates_dir, 'operator.yml.j2'])) }}" - name: Ensure the AWX custom_resource namespace exists k8s: @@ -126,7 +129,7 @@ environment: KUBECONFIG: '{{ lookup("env", "KUBECONFIG") }}' vars: - definition: "{{ lookup('template', '/'.join([deploy_dir, 'operator.yaml'])) | from_yaml }}" + definition: "{{ lookup('template', '/'.join([templates_dir, 'operator.yml.j2'])) | from_yaml }}" register: log - name: print debug output