From 429666380bc52fe5ca85bf1ebc79a2db4675beef Mon Sep 17 00:00:00 2001 From: Bartek Grzybowski Date: Thu, 15 Apr 2021 12:32:33 +0200 Subject: [ANSIBLE][MOLECULE] Skip checking packager cache cleaning idempotency Change-Id: I621bd2ed4452c10a6747392a709d1c17282a11ef Issue-ID: OOM-2722 Signed-off-by: Bartek Grzybowski --- .../molecule/default/molecule.yml | 19 ------------------- .../molecule/ubuntu/molecule.yml | 19 ------------------- .../roles/package-repository-check/tasks/Debian.yml | 5 +++++ .../roles/package-repository-check/tasks/RedHat.yml | 2 ++ 4 files changed, 7 insertions(+), 38 deletions(-) (limited to 'ansible/roles') diff --git a/ansible/roles/package-repository-check/molecule/default/molecule.yml b/ansible/roles/package-repository-check/molecule/default/molecule.yml index 7bb276e4..78d6f32a 100755 --- a/ansible/roles/package-repository-check/molecule/default/molecule.yml +++ b/ansible/roles/package-repository-check/molecule/default/molecule.yml @@ -31,25 +31,6 @@ provisioner: name: ansible env: ANSIBLE_ROLES_PATH: ../../../../test/roles -scenario: - test_sequence: - - lint - - cleanup - - destroy - - dependency - - syntax - - create - - prepare - - converge - # - idempotence - # --> Action: 'idempotence' - # ERROR: Idempotence test failed because of the following tasks: - # * [infra_host] => package-repository-check : Clean yum cache - # * [node0] => package-repository-check : Clean yum cache - - side_effect - - verify - - cleanup - - destroy verifier: name: testinfra options: diff --git a/ansible/roles/package-repository-check/molecule/ubuntu/molecule.yml b/ansible/roles/package-repository-check/molecule/ubuntu/molecule.yml index 84ccfb85..a641ae0a 100755 --- a/ansible/roles/package-repository-check/molecule/ubuntu/molecule.yml +++ b/ansible/roles/package-repository-check/molecule/ubuntu/molecule.yml @@ -27,25 +27,6 @@ provisioner: host_vars: infrastructure-server: cluster_ip: 6.5.4.3 -scenario: - test_sequence: - - lint - - cleanup - - destroy - - dependency - - syntax - - create - - prepare - - converge - # - idempotence - # --> Action: 'idempotence' - # ERROR: Idempotence test failed because of the following tasks: - # * [infra_host] => package-repository-check : Clean yum cache - # * [node0] => package-repository-check : Clean yum cache - - side_effect - - verify - - cleanup - - destroy verifier: name: testinfra options: diff --git a/ansible/roles/package-repository-check/tasks/Debian.yml b/ansible/roles/package-repository-check/tasks/Debian.yml index 45a2b1cf..bfa21c82 100755 --- a/ansible/roles/package-repository-check/tasks/Debian.yml +++ b/ansible/roles/package-repository-check/tasks/Debian.yml @@ -6,6 +6,8 @@ command: apt clean && apt autoclean args: warn: false + tags: + - molecule-idempotence-notest # Refresh cache to ensure repo is reachable - name: Update apt cache apt: @@ -13,6 +15,7 @@ state: latest tags: - skip_ansible_lint # Prevent '[403] Package installs should not use latest' ansible lint task rule + - molecule-idempotence-notest rescue: - name: Fail if apt cache updating failed fail: @@ -34,3 +37,5 @@ service: name: resolvconf state: restarted + tags: + - molecule-idempotence-notest diff --git a/ansible/roles/package-repository-check/tasks/RedHat.yml b/ansible/roles/package-repository-check/tasks/RedHat.yml index e841f172..b0466b5e 100755 --- a/ansible/roles/package-repository-check/tasks/RedHat.yml +++ b/ansible/roles/package-repository-check/tasks/RedHat.yml @@ -6,6 +6,8 @@ command: yum clean all args: warn: false + tags: + - molecule-idempotence-notest # Refresh cache to ensure repo is reachable - name: Update yum cache yum: -- cgit 1.2.3-korg