Skip to content

Commit 240a12f

Browse files
authored
fb version upgrade to 3.2.2 for suse packages (#192)
Upgrade fb version to 3.2.2 for suse packages
1 parent 30ddb0d commit 240a12f

File tree

6 files changed

+7
-5
lines changed

6 files changed

+7
-5
lines changed

.github/workflows/pull_request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ jobs:
193193

194194
# Runs E2E tests using the packages available in the tmp-pr-#PR prerelease
195195
run_e2e_tests_prerelease:
196-
needs: [ setup_environment,upload_official_packages_to_prerelease ]
196+
needs: [ setup_environment,sign_suse_packages ]
197197
name: Run E2E tests by installing NRIA from Production and installing Fluent Bit from the PR pre-release
198198
uses: ./.github/workflows/run_e2e_tests.yml
199199
with:

ansible/build-fb-suse/playbook.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,8 @@
120120
cmd: "{{ cmake_path }}/bin/cpack -G RPM"
121121
chdir: "{{ fluent_bit_path }}/build"
122122
creates: "{{ fluent_bit_path }}/build/fluent-bit-{{ fluent_bit_version }}-1.x86_64.rpm"
123+
async: 420 # timeout 7m
124+
poll: 30 # poll every 30s
123125

124126
- name: Rename binary for the specific OS type, version and arch
125127
# Not actually renaming but copying, so that the previous step nor this one won't be re-executed thanks to "creates"

versions/sles_12.5.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ osDistro: sles
22
osVersion: 12.5
33
packages:
44
- arch: x86_64
5-
ami: ami-06dec9fcc0c723281
5+
ami: ami-09e4a5ed1b412cf53

versions/sles_15.3.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ osDistro: sles
22
osVersion: 15.3
33
packages:
44
- arch: x86_64
5-
ami: ami-048206b517bb4a5c2
5+
ami: ami-0c0ca60d1d7619525

versions/sles_15.5.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ osDistro: sles
22
osVersion: 15.5
33
packages:
44
- arch: x86_64
5-
ami: ami-056fd006f96380745
5+
ami: ami-0b7de87a082366f50

versions/strategyMatrix.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ def list_distro_files():
186186
return [
187187
filename
188188
for filename in os.listdir(".")
189-
if (filename.startswith("ubuntu"))
189+
if (filename.startswith("sles_15.3") or filename.startswith("sles_15.4") or filename.startswith("sles_12.5") or filename.startswith("sles_15.5"))
190190
and filename != "common.yml"
191191
]
192192
except Exception as e:

0 commit comments

Comments
 (0)