resolve conflicts

newrelic · Jan 21, 2025 · 7b4507c · 7b4507c
2 parents bc2c7e8 + 240a12f
commit 7b4507c
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/ansible/build-fb-suse/playbook.yml b/ansible/build-fb-suse/playbook.yml
@@ -120,6 +120,8 @@
         cmd: "{{ cmake_path }}/bin/cpack -G RPM"
         chdir: "{{ fluent_bit_path }}/build"
         creates: "{{ fluent_bit_path }}/build/fluent-bit-{{ fluent_bit_version }}-1.x86_64.rpm"
+      async: 420 # timeout 7m
+      poll: 30 # poll every 30s
 
     - name: Rename binary for the specific OS type, version and arch
       # Not actually renaming but copying, so that the previous step nor this one won't be re-executed thanks to "creates"

diff --git a/versions/debian_11_bullseye.yml b/versions/debian_11_bullseye.yml
@@ -4,4 +4,4 @@ packages:
   - arch: amd64
     ami: ami-0c18857b85f7df9ca
   - arch: arm64
-    ami: ami-0cdb8035f7aaf063d
+    ami: ami-00ae926787c25569b
diff --git a/versions/sles_12.5.yml b/versions/sles_12.5.yml
@@ -2,4 +2,4 @@ osDistro: sles
 osVersion: 12.5
 packages:
   - arch: x86_64
-    ami: ami-06dec9fcc0c723281
+    ami: ami-09e4a5ed1b412cf53
diff --git a/versions/sles_15.3.yml b/versions/sles_15.3.yml
@@ -2,4 +2,4 @@ osDistro: sles
 osVersion: 15.3
 packages:
   - arch: x86_64
-    ami: ami-048206b517bb4a5c2
+    ami: ami-0c0ca60d1d7619525
diff --git a/versions/sles_15.5.yml b/versions/sles_15.5.yml
@@ -2,4 +2,4 @@ osDistro: sles
 osVersion: 15.5
 packages:
   - arch: x86_64
-    ami: ami-056fd006f96380745
+    ami: ami-0b7de87a082366f50