Issue #24: Update Molecule test suite to 3.0 and fix YAML lint issues.

molecule/default/molecule.yml

@@ -3,28 +3,25 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint:
-  name: yamllint
-  enabled: False
+lint: |
+  yamllint .
+  ansible-lint
 platforms:
-- name: kind-default
-  groups:
-  - k8s
-  image: bsycorp/kind:latest-1.14
-  privileged: True
-  override_command: no
-  exposed_ports:
-    - 8443/tcp
-    - 10080/tcp
-  published_ports:
-    - 0.0.0.0:${TEST_CLUSTER_PORT:-9443}:8443/tcp
-  pre_build_image: yes
+  - name: kind-default
+    groups:
+      - k8s
+    image: bsycorp/kind:latest-1.14
+    privileged: True
+    override_command: no
+    exposed_ports:
+      - 8443/tcp
+      - 10080/tcp
+    published_ports:
+      - 0.0.0.0:${TEST_CLUSTER_PORT:-9443}:8443/tcp
+    pre_build_image: yes
 provisioner:
   name: ansible
   log: True
-  lint:
-    name: ansible-lint
-    enabled: False
   inventory:
     group_vars:
       all:
@@ -34,9 +31,3 @@ provisioner:
     KUBECONFIG: /tmp/molecule/kind-default/kubeconfig
     ANSIBLE_ROLES_PATH: ${MOLECULE_PROJECT_DIRECTORY}/roles
     KIND_PORT: '${TEST_CLUSTER_PORT:-9443}'
-scenario:
-  name: default
-verifier:
-  name: testinfra
-  lint:
-    name: flake8

molecule/default/prepare.yml

@@ -8,21 +8,21 @@
     deploy_dir: "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') }}/deploy"
 
   tasks:
-  - name: Create Custom Resource Definition
-    k8s:
-      definition: "{{ lookup('file', '/'.join([deploy_dir, 'crds/tower_v1alpha1_tower_crd.yaml'])) }}"
+    - name: Create Custom Resource Definition
+      k8s:
+        definition: "{{ lookup('file', '/'.join([deploy_dir, 'crds/tower_v1alpha1_tower_crd.yaml'])) }}"
 
-  - name: Ensure specified namespace is present
-    k8s:
-      api_version: v1
-      kind: Namespace
-      name: '{{ operator_namespace }}'
+    - name: Ensure specified namespace is present
+      k8s:
+        api_version: v1
+        kind: Namespace
+        name: '{{ operator_namespace }}'
 
-  - name: Create RBAC resources
-    k8s:
-      definition: "{{ lookup('template', '/'.join([deploy_dir, item])) }}"
-      namespace: '{{ operator_namespace }}'
-    with_items:
-      - role.yaml
-      - role_binding.yaml
-      - service_account.yaml
+    - name: Create RBAC resources
+      k8s:
+        definition: "{{ lookup('template', '/'.join([deploy_dir, item])) }}"
+        namespace: '{{ operator_namespace }}'
+      with_items:
+        - role.yaml
+        - role_binding.yaml
+        - service_account.yaml

molecule/test-local/converge.yml

@@ -0,0 +1,130 @@
+---
+- name: Build Operator in Kind container
+  hosts: k8s
+
+  vars:
+    image_name: tower.ansible.com/tower-operator:testing
+
+  tasks:
+    # using command so we don't need to install any dependencies
+    - name: Get existing image hash
+      command: docker images -q {{ image_name }}
+      register: prev_hash
+      changed_when: false
+
+    - name: Build Operator Image
+      command: docker build -f /build/build/Dockerfile -t {{ image_name }} /build
+      register: build_cmd
+      changed_when: not prev_hash.stdout or (prev_hash.stdout and prev_hash.stdout not in ''.join(build_cmd.stdout_lines[-2:]))
+
+- name: Converge
+  hosts: localhost
+  connection: local
+
+  vars:
+    ansible_python_interpreter: '{{ ansible_playbook_python }}'
+    deploy_dir: "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') }}/deploy"
+    pull_policy: Never
+    operator_image: tower.ansible.com/tower-operator:testing
+    custom_resource: "{{ lookup('file', '/'.join([deploy_dir, 'crds/tower_v1alpha1_tower_cr_awx.yaml'])) | from_yaml }}"
+
+  tasks:
+
+    - block:
+
+        - name: Delete the Operator Deployment
+          k8s:
+            state: absent
+            namespace: '{{ operator_namespace }}'
+            definition: "{{ lookup('template', '/'.join([deploy_dir, 'operator.yaml'])) }}"
+          register: delete_deployment
+          when: hostvars[groups.k8s.0].build_cmd.changed
+
+        - name: Wait 30s for Operator Deployment to terminate
+          k8s_info:
+            api_version: '{{ definition.apiVersion }}'
+            kind: '{{ definition.kind }}'
+            namespace: '{{ operator_namespace }}'
+            name: '{{ definition.metadata.name }}'
+          vars:
+            definition: "{{ lookup('template', '/'.join([deploy_dir, 'operator.yaml'])) | from_yaml }}"
+          register: deployment
+          until: not deployment.resources
+          delay: 3
+          retries: 10
+          when: delete_deployment.changed
+
+        - name: Create the Operator Deployment
+          k8s:
+            namespace: '{{ operator_namespace }}'
+            definition: "{{ lookup('template', '/'.join([deploy_dir, 'operator.yaml'])) }}"
+
+        - name: Ensure the Tower custom_resource namespace exists
+          k8s:
+            state: present
+            name: '{{ custom_resource.metadata.namespace }}'
+            kind: Namespace
+            api_version: v1
+
+        - name: Create the tower.ansible.com/v1alpha1.Tower
+          k8s:
+            state: present
+            namespace: '{{ custom_resource.metadata.namespace }}'
+            definition: '{{ custom_resource }}'
+
+        - name: Wait 15m for reconciliation to run
+          k8s_info:
+            api_version: '{{ custom_resource.apiVersion }}'
+            kind: '{{ custom_resource.kind }}'
+            namespace: '{{ custom_resource.metadata.namespace }}'
+            name: '{{ custom_resource.metadata.name }}'
+          register: cr
+          until:
+            - "'Successful' in (cr | json_query('resources[].status.conditions[].reason'))"
+          delay: 6
+          retries: 150
+
+      rescue:
+
+        - name: debug cr
+          ignore_errors: yes
+          failed_when: false
+          debug:
+            var: debug_cr
+          vars:
+            debug_cr: '{{ lookup("k8s",
+              kind=custom_resource.kind,
+              api_version=custom_resource.apiVersion,
+              namespace=custom_resource.metadata.namespace,
+              resource_name=custom_resource.metadata.name
+            )}}'
+
+        - name: debug tower deployment
+          ignore_errors: yes
+          failed_when: false
+          debug:
+            var: deploy
+          vars:
+            deploy: '{{ lookup("k8s",
+              kind="Deployment",
+              api_version="apps/v1",
+              namespace=custom_resource.metadata.namespace,
+              label_selector="app=tower"
+            )}}'
+
+        - name: get operator logs
+          ignore_errors: yes
+          failed_when: false
+          command: kubectl logs deployment/{{ definition.metadata.name }} -n {{ operator_namespace }} -c operator
+          environment:
+            KUBECONFIG: '{{ lookup("env", "KUBECONFIG") }}'
+          vars:
+            definition: "{{ lookup('template', '/'.join([deploy_dir, 'operator.yaml'])) | from_yaml }}"
+          register: log
+
+        - debug: var=log.stdout_lines
+
+        - fail:
+            msg: "Failed on action: converge"
+
+- import_playbook: '{{ playbook_dir }}/../default/asserts.yml'

molecule/test-local/molecule.yml

@@ -3,30 +3,27 @@ dependency:
   name: galaxy
 driver:
   name: docker
-lint:
-  name: yamllint
-  enabled: False
+lint: |
+  yamllint .
+  ansible-lint
 platforms:
-- name: kind-test-local
-  groups:
-  - k8s
-  image: bsycorp/kind:latest-1.15
-  privileged: True
-  override_command: no
-  exposed_ports:
-    - 8443/tcp
-    - 10080/tcp
-  published_ports:
-    - 0.0.0.0:${TEST_CLUSTER_PORT:-10443}:8443/tcp
-  pre_build_image: yes
-  volumes:
-    - ${MOLECULE_PROJECT_DIRECTORY}:/build:Z
+  - name: kind-test-local
+    groups:
+      - k8s
+    image: bsycorp/kind:latest-1.15
+    privileged: True
+    override_command: no
+    exposed_ports:
+      - 8443/tcp
+      - 10080/tcp
+    published_ports:
+      - 0.0.0.0:${TEST_CLUSTER_PORT:-10443}:8443/tcp
+    pre_build_image: yes
+    volumes:
+      - ${MOLECULE_PROJECT_DIRECTORY}:/build:Z
 provisioner:
   name: ansible
   log: True
-  lint:
-    name: ansible-lint
-    enabled: False
   inventory:
     group_vars:
       all:
@@ -37,7 +34,6 @@ provisioner:
     ANSIBLE_ROLES_PATH: ${MOLECULE_PROJECT_DIRECTORY}/roles
     KIND_PORT: '${TEST_CLUSTER_PORT:-10443}'
 scenario:
-  name: test-local
   test_sequence:
     - lint
     - destroy
@@ -46,10 +42,4 @@ scenario:
     - create
     - prepare
     - converge
-    - side_effect
-    - verify
     - destroy
-verifier:
-  name: testinfra
-  lint:
-    name: flake8

molecule/test-local/playbook.yml

@@ -1,130 +0,0 @@
----
-- name: Build Operator in Kind container
-  hosts: k8s
-
-  vars:
-    image_name: tower.ansible.com/tower-operator:testing
-
-  tasks:
-  # using command so we don't need to install any dependencies
-  - name: Get existing image hash
-    command: docker images -q {{ image_name }}
-    register: prev_hash
-    changed_when: false
-
-  - name: Build Operator Image
-    command: docker build -f /build/build/Dockerfile -t {{ image_name }} /build
-    register: build_cmd
-    changed_when: not prev_hash.stdout or (prev_hash.stdout and prev_hash.stdout not in ''.join(build_cmd.stdout_lines[-2:]))
-
-- name: Converge
-  hosts: localhost
-  connection: local
-
-  vars:
-    ansible_python_interpreter: '{{ ansible_playbook_python }}'
-    deploy_dir: "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') }}/deploy"
-    pull_policy: Never
-    operator_image: tower.ansible.com/tower-operator:testing
-    custom_resource: "{{ lookup('file', '/'.join([deploy_dir, 'crds/tower_v1alpha1_tower_cr_awx.yaml'])) | from_yaml }}"
-
-  tasks:
-
-  - block:
-
-    - name: Delete the Operator Deployment
-      k8s:
-        state: absent
-        namespace: '{{ operator_namespace }}'
-        definition: "{{ lookup('template', '/'.join([deploy_dir, 'operator.yaml'])) }}"
-      register: delete_deployment
-      when: hostvars[groups.k8s.0].build_cmd.changed
-
-    - name: Wait 30s for Operator Deployment to terminate
-      k8s_info:
-        api_version: '{{ definition.apiVersion }}'
-        kind: '{{ definition.kind }}'
-        namespace: '{{ operator_namespace }}'
-        name: '{{ definition.metadata.name }}'
-      vars:
-        definition: "{{ lookup('template', '/'.join([deploy_dir, 'operator.yaml'])) | from_yaml }}"
-      register: deployment
-      until: not deployment.resources
-      delay: 3
-      retries: 10
-      when: delete_deployment.changed
-
-    - name: Create the Operator Deployment
-      k8s:
-        namespace: '{{ operator_namespace }}'
-        definition: "{{ lookup('template', '/'.join([deploy_dir, 'operator.yaml'])) }}"
-
-    - name: Ensure the Tower custom_resource namespace exists
-      k8s:
-        state: present
-        name: '{{ custom_resource.metadata.namespace }}'
-        kind: Namespace
-        api_version: v1
-
-    - name: Create the tower.ansible.com/v1alpha1.Tower
-      k8s:
-        state: present
-        namespace: '{{ custom_resource.metadata.namespace }}'
-        definition: '{{ custom_resource }}'
-
-    - name: Wait 15m for reconciliation to run
-      k8s_info:
-        api_version: '{{ custom_resource.apiVersion }}'
-        kind: '{{ custom_resource.kind }}'
-        namespace: '{{ custom_resource.metadata.namespace }}'
-        name: '{{ custom_resource.metadata.name }}'
-      register: cr
-      until:
-      - "'Successful' in (cr | json_query('resources[].status.conditions[].reason'))"
-      delay: 6
-      retries: 150
-
-    rescue:
-
-      - name: debug cr
-        ignore_errors: yes
-        failed_when: false
-        debug:
-          var: debug_cr
-        vars:
-          debug_cr: '{{ lookup("k8s",
-            kind=custom_resource.kind,
-            api_version=custom_resource.apiVersion,
-            namespace=custom_resource.metadata.namespace,
-            resource_name=custom_resource.metadata.name
-          )}}'
-
-      - name: debug tower deployment
-        ignore_errors: yes
-        failed_when: false
-        debug:
-          var: deploy
-        vars:
-          deploy: '{{ lookup("k8s",
-            kind="Deployment",
-            api_version="apps/v1",
-            namespace=custom_resource.metadata.namespace,
-            label_selector="app=tower"
-          )}}'
-
-      - name: get operator logs
-        ignore_errors: yes
-        failed_when: false
-        command: kubectl logs deployment/{{ definition.metadata.name }} -n {{ operator_namespace }} -c operator
-        environment:
-          KUBECONFIG: '{{ lookup("env", "KUBECONFIG") }}'
-        vars:
-          definition: "{{ lookup('template', '/'.join([deploy_dir, 'operator.yaml'])) | from_yaml }}"
-        register: log
-
-      - debug: var=log.stdout_lines
-
-      - fail:
-          msg: "Failed on action: converge"
-
-- import_playbook: '{{ playbook_dir }}/../default/asserts.yml'

molecule/test-minikube/converge.yml

@@ -0,0 +1,136 @@
+---
+# TODO: For some reason prepare is not run after a destroy in the Minikube env.
+- import_playbook: ../default/prepare.yml
+
+- name: Build Operator in Minikube
+  hosts: localhost
+  connection: local
+
+  vars:
+    image_name: tower.ansible.com/tower-operator:testing
+
+  tasks:
+    # Use raw Docker commands inside Minikube to avoid extra Python dependencies.
+    - name: Get existing image hash
+      shell: |
+        eval $(minikube docker-env)
+        docker images -q {{ image_name }}
+      register: prev_hash
+      changed_when: false
+
+    - name: Build Operator Image
+      shell: |
+        eval $(minikube docker-env)
+        docker build -f ../../build/Dockerfile -t {{ image_name }} ../..
+      register: build_cmd
+      changed_when: not prev_hash.stdout or (prev_hash.stdout and prev_hash.stdout not in ''.join(build_cmd.stdout_lines[-2:]))
+
+- name: Converge
+  hosts: localhost
+  connection: local
+
+  vars:
+    ansible_python_interpreter: '{{ ansible_playbook_python }}'
+    deploy_dir: "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') }}/deploy"
+    pull_policy: Never
+    operator_image: tower.ansible.com/tower-operator:testing
+    custom_resource: "{{ lookup('file', '/'.join([deploy_dir, 'crds/tower_v1alpha1_tower_cr_tower.yaml'])) | from_yaml }}"
+
+  tasks:
+    - block:
+        - name: Delete the Operator Deployment
+          k8s:
+            state: absent
+            namespace: '{{ operator_namespace }}'
+            definition: "{{ lookup('template', '/'.join([deploy_dir, 'operator.yaml'])) }}"
+          register: delete_deployment
+          when: build_cmd.changed
+
+        - name: Wait 30s for Operator Deployment to terminate
+          k8s_info:
+            api_version: '{{ definition.apiVersion }}'
+            kind: '{{ definition.kind }}'
+            namespace: '{{ operator_namespace }}'
+            name: '{{ definition.metadata.name }}'
+          vars:
+            definition: "{{ lookup('template', '/'.join([deploy_dir, 'operator.yaml'])) | from_yaml }}"
+          register: deployment
+          until: not deployment.resources
+          delay: 3
+          retries: 10
+          when: delete_deployment.changed
+
+        - name: Create the Operator Deployment
+          k8s:
+            namespace: '{{ operator_namespace }}'
+            definition: "{{ lookup('template', '/'.join([deploy_dir, 'operator.yaml'])) }}"
+
+        - name: Ensure the Tower custom_resource namespace exists
+          k8s:
+            state: present
+            name: '{{ custom_resource.metadata.namespace }}'
+            kind: Namespace
+            api_version: v1
+
+        - name: Create the tower.ansible.com/v1alpha1.Tower
+          k8s:
+            state: present
+            namespace: '{{ custom_resource.metadata.namespace }}'
+            definition: '{{ custom_resource }}'
+
+        - name: Wait 15m for reconciliation to run
+          k8s_info:
+            api_version: '{{ custom_resource.apiVersion }}'
+            kind: '{{ custom_resource.kind }}'
+            namespace: '{{ custom_resource.metadata.namespace }}'
+            name: '{{ custom_resource.metadata.name }}'
+          register: cr
+          until:
+            - "'Successful' in (cr | json_query('resources[].status.conditions[].reason'))"
+          delay: 6
+          retries: 150
+
+      rescue:
+
+        - name: debug cr
+          ignore_errors: yes
+          failed_when: false
+          debug:
+            var: debug_cr
+          vars:
+            debug_cr: '{{ lookup("k8s",
+              kind=custom_resource.kind,
+              api_version=custom_resource.apiVersion,
+              namespace=custom_resource.metadata.namespace,
+              resource_name=custom_resource.metadata.name
+            )}}'
+
+        - name: debug tower deployment
+          ignore_errors: yes
+          failed_when: false
+          debug:
+            var: deploy
+          vars:
+            deploy: '{{ lookup("k8s",
+              kind="Deployment",
+              api_version="apps/v1",
+              namespace=custom_resource.metadata.namespace,
+              label_selector="app=tower"
+            )}}'
+
+        - name: get operator logs
+          ignore_errors: yes
+          failed_when: false
+          command: kubectl logs deployment/{{ definition.metadata.name }} -n {{ operator_namespace }} -c operator
+          environment:
+            KUBECONFIG: '{{ lookup("env", "KUBECONFIG") }}'
+          vars:
+            definition: "{{ lookup('template', '/'.join([deploy_dir, 'operator.yaml'])) | from_yaml }}"
+          register: log
+
+        - debug: var=log.stdout_lines
+
+        - fail:
+            msg: "Failed on action: converge"
+
+- import_playbook: '{{ playbook_dir }}/../default/asserts.yml'

molecule/test-minikube/molecule.yml

@@ -6,26 +6,22 @@ driver:
   options:
     managed: False
     ansible_connection_options: {}
-lint:
-  name: yamllint
-  enabled: False
+lint: |
+  yamllint .
+  ansible-lint
 platforms:
-- name: test-minikube
-  groups:
-  - k8s
+  - name: test-minikube
+    groups:
+      - k8s
 provisioner:
   name: ansible
   inventory:
     group_vars:
       all:
         operator_namespace: ${TEST_NAMESPACE:-default}
-  lint:
-    name: ansible-lint
-    enabled: False
   env:
     ANSIBLE_ROLES_PATH: ${MOLECULE_PROJECT_DIRECTORY}/roles
 scenario:
-  name: test-minikube
   test_sequence:
     - lint
     - destroy
@@ -34,10 +30,4 @@ scenario:
     - create
     - prepare
     - converge
-    - side_effect
-    - verify
     - destroy
-verifier:
-  name: testinfra
-  lint:
-    name: flake8

molecule/test-minikube/playbook.yml

@@ -1,136 +0,0 @@
----
-# TODO: For some reason prepare is not run after a destroy in the Minikube env.
-- import_playbook: ../default/prepare.yml
-
-- name: Build Operator in Minikube
-  hosts: localhost
-  connection: local
-
-  vars:
-    image_name: tower.ansible.com/tower-operator:testing
-
-  tasks:
-  # Use raw Docker commands inside Minikube to avoid extra Python dependencies.
-  - name: Get existing image hash
-    shell: |
-      eval $(minikube docker-env)
-      docker images -q {{ image_name }}
-    register: prev_hash
-    changed_when: false
-
-  - name: Build Operator Image
-    shell: |
-      eval $(minikube docker-env)
-      docker build -f ../../build/Dockerfile -t {{ image_name }} ../..
-    register: build_cmd
-    changed_when: not prev_hash.stdout or (prev_hash.stdout and prev_hash.stdout not in ''.join(build_cmd.stdout_lines[-2:]))
-
-- name: Converge
-  hosts: localhost
-  connection: local
-
-  vars:
-    ansible_python_interpreter: '{{ ansible_playbook_python }}'
-    deploy_dir: "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') }}/deploy"
-    pull_policy: Never
-    operator_image: tower.ansible.com/tower-operator:testing
-    custom_resource: "{{ lookup('file', '/'.join([deploy_dir, 'crds/tower_v1alpha1_tower_cr_tower.yaml'])) | from_yaml }}"
-
-  tasks:
-    - block:
-      - name: Delete the Operator Deployment
-        k8s:
-          state: absent
-          namespace: '{{ operator_namespace }}'
-          definition: "{{ lookup('template', '/'.join([deploy_dir, 'operator.yaml'])) }}"
-        register: delete_deployment
-        when: build_cmd.changed
-
-      - name: Wait 30s for Operator Deployment to terminate
-        k8s_info:
-          api_version: '{{ definition.apiVersion }}'
-          kind: '{{ definition.kind }}'
-          namespace: '{{ operator_namespace }}'
-          name: '{{ definition.metadata.name }}'
-        vars:
-          definition: "{{ lookup('template', '/'.join([deploy_dir, 'operator.yaml'])) | from_yaml }}"
-        register: deployment
-        until: not deployment.resources
-        delay: 3
-        retries: 10
-        when: delete_deployment.changed
-
-      - name: Create the Operator Deployment
-        k8s:
-          namespace: '{{ operator_namespace }}'
-          definition: "{{ lookup('template', '/'.join([deploy_dir, 'operator.yaml'])) }}"
-
-      - name: Ensure the Tower custom_resource namespace exists
-        k8s:
-          state: present
-          name: '{{ custom_resource.metadata.namespace }}'
-          kind: Namespace
-          api_version: v1
-
-      - name: Create the tower.ansible.com/v1alpha1.Tower
-        k8s:
-          state: present
-          namespace: '{{ custom_resource.metadata.namespace }}'
-          definition: '{{ custom_resource }}'
-
-      - name: Wait 15m for reconciliation to run
-        k8s_info:
-          api_version: '{{ custom_resource.apiVersion }}'
-          kind: '{{ custom_resource.kind }}'
-          namespace: '{{ custom_resource.metadata.namespace }}'
-          name: '{{ custom_resource.metadata.name }}'
-        register: cr
-        until:
-        - "'Successful' in (cr | json_query('resources[].status.conditions[].reason'))"
-        delay: 6
-        retries: 150
-
-      rescue:
-
-        - name: debug cr
-          ignore_errors: yes
-          failed_when: false
-          debug:
-            var: debug_cr
-          vars:
-            debug_cr: '{{ lookup("k8s",
-              kind=custom_resource.kind,
-              api_version=custom_resource.apiVersion,
-              namespace=custom_resource.metadata.namespace,
-              resource_name=custom_resource.metadata.name
-            )}}'
-
-        - name: debug tower deployment
-          ignore_errors: yes
-          failed_when: false
-          debug:
-            var: deploy
-          vars:
-            deploy: '{{ lookup("k8s",
-              kind="Deployment",
-              api_version="apps/v1",
-              namespace=custom_resource.metadata.namespace,
-              label_selector="app=tower"
-            )}}'
-
-        - name: get operator logs
-          ignore_errors: yes
-          failed_when: false
-          command: kubectl logs deployment/{{ definition.metadata.name }} -n {{ operator_namespace }} -c operator
-          environment:
-            KUBECONFIG: '{{ lookup("env", "KUBECONFIG") }}'
-          vars:
-            definition: "{{ lookup('template', '/'.join([deploy_dir, 'operator.yaml'])) | from_yaml }}"
-          register: log
-
-        - debug: var=log.stdout_lines
-
-        - fail:
-            msg: "Failed on action: converge"
-
-- import_playbook: '{{ playbook_dir }}/../default/asserts.yml'