From 0eab2f9686c144f61f8d43920a036d28933f6f06 Mon Sep 17 00:00:00 2001 From: Yanis Guenane Date: Tue, 9 Feb 2021 18:48:10 +0100 Subject: [PATCH] travis.yml: Explicitly list ansible as a dep --- .travis.yml | 2 +- ansible/chain-operator-files.yml | 2 ++ molecule/default/converge.yml | 2 +- molecule/test-local/converge.yml | 8 ++++---- molecule/test-minikube/converge.yml | 8 ++++---- 5 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index de146bd1..b8ef301c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ env: - DOCKER_API_VERSION=1.38 install: - - pip3 install docker molecule molecule-docker yamllint ansible-lint openshift jmespath + - pip3 install docker molecule molecule-docker yamllint ansible-lint openshift jmespath ansible - ansible-galaxy collection install community.kubernetes operator_sdk.util script: diff --git a/ansible/chain-operator-files.yml b/ansible/chain-operator-files.yml index 5edf0a4a..03f460bf 100644 --- a/ansible/chain-operator-files.yml +++ b/ansible/chain-operator-files.yml @@ -10,8 +10,10 @@ template: src: crd.yml.j2 dest: "{{ playbook_dir }}/../deploy/crds/awx_v1beta1_crd.yaml" + mode: '0644' - name: Template awx-operator.yaml template: src: awx-operator.yaml.j2 dest: ../deploy/awx-operator.yaml + mode: '0644' diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml index ec391972..4a8b251e 100644 --- a/molecule/default/converge.yml +++ b/molecule/default/converge.yml @@ -5,6 +5,6 @@ vars: ansible_python_interpreter: '{{ ansible_playbook_python }}' roles: - - awx + - installer - import_playbook: '{{ playbook_dir }}/asserts.yml' diff --git a/molecule/test-local/converge.yml b/molecule/test-local/converge.yml index 3678d8a8..4b339a1b 100644 --- a/molecule/test-local/converge.yml +++ b/molecule/test-local/converge.yml @@ -97,8 +97,8 @@ kind=custom_resource.kind, api_version=custom_resource.apiVersion, namespace=custom_resource.metadata.namespace, - resource_name=custom_resource.metadata.name - )}}' + resource_name=custom_resource.metadata.name) + }}' - name: debug awx deployment ignore_errors: yes @@ -110,8 +110,8 @@ kind="Deployment", api_version="apps/v1", namespace=custom_resource.metadata.namespace, - label_selector="app=awx" - )}}' + label_selector="app=awx") + }}' - name: get operator logs ignore_errors: yes diff --git a/molecule/test-minikube/converge.yml b/molecule/test-minikube/converge.yml index 9ab0d90a..fe91e4b6 100644 --- a/molecule/test-minikube/converge.yml +++ b/molecule/test-minikube/converge.yml @@ -105,8 +105,8 @@ kind=custom_resource.kind, api_version=custom_resource.apiVersion, namespace=custom_resource.metadata.namespace, - resource_name=custom_resource.metadata.name - )}}' + resource_name=custom_resource.metadata.name) + }}' - name: debug awx deployment ignore_errors: yes @@ -118,8 +118,8 @@ kind="Deployment", api_version="apps/v1", namespace=custom_resource.metadata.namespace, - label_selector="app=awx" - )}}' + label_selector="app=awx") + }}' - name: get operator logs ignore_errors: yes