From 2da9d1607f153505acbc70508c7d856a848d4a2b Mon Sep 17 00:00:00 2001
From: Sven Nierlein <sven@consol.de>
Date: Tue, 23 Jan 2024 16:31:56 +0100
Subject: [PATCH] make tests more reliable

---
 MANIFEST                                      |  1 +
 t/scenarios/_common/ansible/install_role.sh   |  2 +-
 .../grafana_node_puppeteer/tasks/main.yml     |  3 +++
 .../ansible/roles/local_tests/tasks/main.yml  |  5 +++--
 .../test-config-generator/tasks/main.yml      |  2 +-
 .../roles/thruk_developer/tasks/main.yml      |  5 ++++-
 .../roles/yum_apt_retry/tasks/main.yml        |  7 +++++-
 .../ansible/roles/yum_apt_retry/vars/main.yml |  4 ++++
 .../docker-compose.yml                        | 22 +++++++++----------
 9 files changed, 34 insertions(+), 17 deletions(-)
 create mode 100644 t/scenarios/_common/ansible/roles/yum_apt_retry/vars/main.yml

diff --git a/MANIFEST b/MANIFEST
index 730bdcc867..bf7f08229f 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -2144,6 +2144,7 @@ t/scenarios/_common/ansible/roles/thruk_logcache_mysql/vars/main.yml
 t/scenarios/_common/ansible/roles/thruk_plugin_editor/tasks/main.yml
 t/scenarios/_common/ansible/roles/thruk_plugin_editor/vars/main.yml
 t/scenarios/_common/ansible/roles/yum_apt_retry/tasks/main.yml
+t/scenarios/_common/ansible/roles/yum_apt_retry/vars/main.yml
 t/scenarios/_common/base_images/rocky-nightly/Dockerfile
 t/scenarios/_common/docker-compose.yml
 t/scenarios/_common/Makefile
diff --git a/t/scenarios/_common/ansible/install_role.sh b/t/scenarios/_common/ansible/install_role.sh
index 2dcd00dea4..12fddcf4a7 100755
--- a/t/scenarios/_common/ansible/install_role.sh
+++ b/t/scenarios/_common/ansible/install_role.sh
@@ -4,7 +4,7 @@ ROLE=$1
 shift
 
 export ANSIBLE_RETRY_FILES_ENABLED="False"
-ansible-playbook -i localhost, -c local -e SITENAME=demo "$@" /dev/stdin <<END
+ansible-playbook -f1 -i localhost, -c local -e SITENAME=demo "$@" /dev/stdin <<END
 ---
 - hosts: localhost
   roles:
diff --git a/t/scenarios/_common/ansible/roles/grafana_node_puppeteer/tasks/main.yml b/t/scenarios/_common/ansible/roles/grafana_node_puppeteer/tasks/main.yml
index 759991fdc4..482ea88abf 100644
--- a/t/scenarios/_common/ansible/roles/grafana_node_puppeteer/tasks/main.yml
+++ b/t/scenarios/_common/ansible/roles/grafana_node_puppeteer/tasks/main.yml
@@ -5,5 +5,8 @@
     package:
       - npm
       - chromium
+    rpm:
       - libxshmfence
+    deb:
+      - libxshmfence1
 - shell: "sudo su - {{ site }} -c 'npm i puppeteer'"
diff --git a/t/scenarios/_common/ansible/roles/local_tests/tasks/main.yml b/t/scenarios/_common/ansible/roles/local_tests/tasks/main.yml
index 7b229fb2e0..26f7ea288b 100644
--- a/t/scenarios/_common/ansible/roles/local_tests/tasks/main.yml
+++ b/t/scenarios/_common/ansible/roles/local_tests/tasks/main.yml
@@ -3,11 +3,12 @@
     name: yum_apt_retry
   vars:
     package:
+      - diffutils
+      - expect  # contains unbuffer
+    rpm:
       - perl-Test-Harness
       - perl-ExtUtils-Manifest
       - perl-ExtUtils-Install
-      - diffutils
-      - expect  # contains unbuffer
 - 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
index 3bfe972a5a..d62eb7d61c 100644
--- a/t/scenarios/_common/ansible/roles/test-config-generator/tasks/main.yml
+++ b/t/scenarios/_common/ansible/roles/test-config-generator/tasks/main.yml
@@ -2,7 +2,7 @@
   include_role:
     name: yum_apt_retry
   vars:
-    package:
+    rpm:
       - perl-ExtUtils-Manifest
       - perl-ExtUtils-Install
       - perl-File-Which
diff --git a/t/scenarios/_common/ansible/roles/thruk_developer/tasks/main.yml b/t/scenarios/_common/ansible/roles/thruk_developer/tasks/main.yml
index 4abe52f600..df0b598c1d 100644
--- a/t/scenarios/_common/ansible/roles/thruk_developer/tasks/main.yml
+++ b/t/scenarios/_common/ansible/roles/thruk_developer/tasks/main.yml
@@ -2,10 +2,13 @@
   include_role:
     name: yum_apt_retry
   vars:
-    package:
+    rpm:
       - perl-ExtUtils-Manifest
       - perl-ExtUtils-Install
       - git-core
+    deb:
+      - git
+    package:
       - make
 
 - stat: path=/usr/lib/locale/en_US.utf8
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
index 5744f150eb..fc192282fa 100644
--- a/t/scenarios/_common/ansible/roles/yum_apt_retry/tasks/main.yml
+++ b/t/scenarios/_common/ansible/roles/yum_apt_retry/tasks/main.yml
@@ -1,6 +1,11 @@
 ---
 - name: "package yum/apt retry installer: {{ package }}"
-  shell: "if test -f /usr/bin/apt; then apt install -y {{ package | join(' ') }}; else yum install -y {{ package | join(' ') }}; fi"
+  shell: |
+      if test -f /usr/bin/apt; then
+        apt-get install -y {{ package | join(' ') }} {{ deb | join(' ') }}
+      else
+        yum install -y {{ package | join(' ') }} {{ rpm | join(' ') }}
+      fi
   register: install_result
   ignore_errors: yes
   failed_when: install_result.rc != 0
diff --git a/t/scenarios/_common/ansible/roles/yum_apt_retry/vars/main.yml b/t/scenarios/_common/ansible/roles/yum_apt_retry/vars/main.yml
new file mode 100644
index 0000000000..374dbea942
--- /dev/null
+++ b/t/scenarios/_common/ansible/roles/yum_apt_retry/vars/main.yml
@@ -0,0 +1,4 @@
+---
+package: []
+rpm: []
+deb: []
diff --git a/t/scenarios/lmd_federation_multitier_e2e/docker-compose.yml b/t/scenarios/lmd_federation_multitier_e2e/docker-compose.yml
index f75aee5cef..c7e4cd32df 100644
--- a/t/scenarios/lmd_federation_multitier_e2e/docker-compose.yml
+++ b/t/scenarios/lmd_federation_multitier_e2e/docker-compose.yml
@@ -49,7 +49,7 @@ services:
     deploy:
       resources:
         limits:
-          memory: 300M
+          memory: 1000M
 
   tier1c:
     build: tier1c/
@@ -71,7 +71,7 @@ services:
     deploy:
       resources:
         limits:
-          memory: 600M
+          memory: 1000M
 
   tier1d:
     build: tier1d/
@@ -93,7 +93,7 @@ services:
     deploy:
       resources:
         limits:
-          memory: 300M
+          memory: 1000M
 
 
   tier2a:
@@ -113,7 +113,7 @@ services:
     deploy:
       resources:
         limits:
-          memory: 500M
+          memory: 1000M
 
   tier2b:
     build: tier2b/
@@ -132,7 +132,7 @@ services:
     deploy:
       resources:
         limits:
-          memory: 300M
+          memory: 1000M
 
   tier2c:
     build: tier2c/
@@ -150,7 +150,7 @@ services:
     deploy:
       resources:
         limits:
-          memory: 600M
+          memory: 1000M
 
   tier2d:
     build: tier2d/
@@ -169,7 +169,7 @@ services:
     deploy:
       resources:
         limits:
-          memory: 300M
+          memory: 1000M
 
   tier2e:
     build: tier2e/
@@ -188,7 +188,7 @@ services:
     deploy:
       resources:
         limits:
-          memory: 300M
+          memory: 1000M
 
   tier3a:
     build: tier3a/
@@ -206,7 +206,7 @@ services:
     deploy:
       resources:
         limits:
-          memory: 300M
+          memory: 1000M
 
   tier3b:
     build: tier3b/
@@ -224,7 +224,7 @@ services:
     deploy:
       resources:
         limits:
-          memory: 600M
+          memory: 1000M
 
   tier3c:
     build: tier3c/
@@ -242,4 +242,4 @@ services:
     deploy:
       resources:
         limits:
-          memory: 300M
+          memory: 1000M