tests: improve ansible pkg installation

sni · Jan 28, 2025 · 6c79815 · 6c79815
1 parent eb29698
commit 6c79815
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/t/scenarios/_common/ansible/roles/local_tests/tasks/main.yml b/t/scenarios/_common/ansible/roles/local_tests/tasks/main.yml
@@ -12,9 +12,9 @@
     creates:
       - /usr/bin/unbuffer
       - /usr/bin/diff
-      - /usr/share/doc/perl-Test-Harness
-      - /usr/share/doc/perl-ExtUtils-Manifest
-      - /usr/share/doc/perl-ExtUtils-Install
+      - /usr/share/perl5/vendor_perl/Test/Harness.pm
+      - /usr/share/perl5/vendor_perl/ExtUtils/Manifest.pm
+      - "/usr/share/perl5/vendor_perl/ExtUtils/Install.pm,/usr/share/perl5/ExtUtils/Install.pm"
 - lineinfile:
     path: /etc/locale.conf
     regexp: '^LANG='

diff --git a/t/scenarios/_common/ansible/roles/test-config-generator/tasks/main.yml b/t/scenarios/_common/ansible/roles/test-config-generator/tasks/main.yml
@@ -8,10 +8,10 @@
       - perl-File-Which
       - perl-IPC-Cmd
     creates:
-      - /usr/share/doc/perl-ExtUtils-Manifest
-      - /usr/share/doc/perl-ExtUtils-Install
-      - /usr/share/doc/perl-File-Which
-      - /usr/share/doc/perl-IPC-Cmd
+      - /usr/share/perl5/vendor_perl/ExtUtils/Manifest.pm
+      - "/usr/share/perl5/vendor_perl/ExtUtils/Install.pm,/usr/share/perl5/ExtUtils/Install.pm"
+      - /usr/share/perl5/vendor_perl/File/Which.pm
+      - /usr/share/perl5/vendor_perl/IPC/Cmd.pm
 
 - name: "install Monitoring::Generator::TestConfig"
   shell: "sudo su - {{ site }} -c 'cpanm -n Monitoring::Generator::TestConfig'"

diff --git a/t/scenarios/_common/ansible/roles/thruk_developer/tasks/main.yml b/t/scenarios/_common/ansible/roles/thruk_developer/tasks/main.yml
@@ -11,8 +11,8 @@
     package:
       - make
     creates:
-      - /usr/share/doc/perl-ExtUtils-Manifest
-      - /usr/share/doc/perl-ExtUtils-Install
+      - /usr/share/perl5/vendor_perl/ExtUtils/Manifest.pm
+      - "/usr/share/perl5/vendor_perl/ExtUtils/Install.pm,/usr/share/perl5/ExtUtils/Install.pm"
       - /usr/bin/git
       - /usr/bin/make
 

diff --git a/t/scenarios/_common/ansible/roles/yum_apt_retry/tasks/main.yml b/t/scenarios/_common/ansible/roles/yum_apt_retry/tasks/main.yml
@@ -4,7 +4,7 @@
       if [ "{{ creates | join(' ') }}" != "" ]; then
         allfound=1
         for file in {{ creates | join(' ') }}; do
-          if ! test -e $file; then
+          if [ $(ls -l1 $(echo $file | tr , ' ') 2>/dev/null | wc -l) -eq 0 ]; then
             allfound=0
           fi
         done
@@ -18,7 +18,7 @@
         yum install -y {{ package | join(' ') }} {{ rpm | join(' ') }}
       fi
       for file in {{ creates | join(' ') }}; do
-        if ! test -e $file; then
+        if [ $(ls -l1 $(echo $file | tr , ' ') 2>/dev/null | wc -l) -eq 0 ]; then
           echo "file $file not found after pkg installation"
           exit 1
         fi