update molecule e2e and attempt to fix failures

Signed-off-by: Bryce Palmer <bpalmer@redhat.com>
operator-framework · Jun 30, 2023 · db8647c · db8647c
1 parent 3be3bba
commit db8647c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 21 deletions.
diff --git a/hack/tests/e2e-ansible-molecule.sh b/hack/tests/e2e-ansible-molecule.sh
@@ -27,10 +27,10 @@ set +u; source "${ENVDIR}/bin/activate"; set -u
 TMPDIR="$(mktemp -d)"
 trap_add "rm -rf $TMPDIR" EXIT
 pip3 install pyasn1==0.4.7 pyasn1-modules==0.2.6 idna==2.8 ipaddress==1.0.23
-pip3 install cryptography==3.3.2 molecule==3.6.0
+pip3 install cryptography molecule==5.1.0
 pip3 install ansible-lint yamllint
-pip3 install docker openshift==0.12.1 jmespath
-ansible-galaxy collection install 'kubernetes.core:==2.2.0'
+pip3 install docker kubernetes jmespath
+ansible-galaxy collection install 'kubernetes.core:==2.4.0'
 ansible-galaxy collection install 'operator_sdk.util:==0.4.0'
 ansible-galaxy collection install 'community.docker:==3.4.0'
 

diff --git a/internal/plugins/ansible/v1/scaffolds/internal/templates/molecule/mdefault/molecule.go b/internal/plugins/ansible/v1/scaffolds/internal/templates/molecule/mdefault/molecule.go
@@ -41,18 +41,12 @@ dependency:
   name: galaxy
 driver:
   name: delegated
-lint: |
-  set -e
-  yamllint -d "{extends: relaxed, rules: {line-length: {max: 120}}}" .
 platforms:
   - name: cluster
     groups:
       - k8s
 provisioner:
   name: ansible
-  lint: |
-    set -e
-    ansible-lint
   inventory:
     group_vars:
       all:
@@ -69,7 +63,4 @@ provisioner:
     K8S_AUTH_KUBECONFIG: ${KUBECONFIG:-"~/.kube/config"}
 verifier:
   name: ansible
-  lint: |
-    set -e
-    ansible-lint
 `
diff --git a/internal/plugins/ansible/v1/scaffolds/internal/templates/molecule/mkind/molecule.go b/internal/plugins/ansible/v1/scaffolds/internal/templates/molecule/mkind/molecule.go
@@ -41,9 +41,6 @@ dependency:
   name: galaxy
 driver:
   name: delegated
-lint: |
-  set -e
-  yamllint -d "{extends: relaxed, rules: {line-length: {max: 120}}}" .
 platforms:
   - name: cluster
     groups:
@@ -53,9 +50,6 @@ provisioner:
   playbooks:
     prepare: ../default/prepare.yml
     verify: ../default/verify.yml
-  lint: |
-    set -e
-    ansible-lint
   inventory:
     group_vars:
       all:
@@ -75,7 +69,4 @@ provisioner:
     KUBECONFIG: ${MOLECULE_EPHEMERAL_DIRECTORY}/kubeconfig
 verifier:
   name: ansible
-  lint: |
-    set -e
-    ansible-lint
 `