Merge pull request #164 from newrelic/NR-328274

gunnalahema · web-flow · commit 6aacd0f0bfb9 · 2024-10-31T14:50:57.000+05:30
Upgrade fluent bit version 3.1.9
diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml
@@ -57,7 +57,7 @@ jobs:
           sudo apt-get install -y debsigs
           bash ./scripts/sign.sh
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         if: ${{ contains(matrix.packages.available-flavors, env.FB_PACKAGE_NAME) }}
         with:
           name: ${{ env.FB_PACKAGE_NAME }}_${{ env.VERSION }}_rpm
@@ -100,7 +100,7 @@ jobs:
           sudo apt-get install -y debsigs
           bash ./scripts/sign.sh
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         if: ${{ contains(matrix.packages.available-flavors, env.FB_PACKAGE_NAME) }}
         with:
           name: ${{ env.FB_PACKAGE_NAME }}_${{ env.VERSION }}_deb
@@ -128,7 +128,7 @@ jobs:
           unzip fluent-bit-${{ env.VERSION }}-${{ matrix.packages.version }}.zip
           zip -r -j packages/fb-windows-${{ matrix.packages.arch }}.zip fluent-bit-${{ env.VERSION }}-${{ matrix.packages.version }}/bin/fluent-bit.exe fluent-bit-${{ env.VERSION }}-${{ matrix.packages.version }}/bin/fluent-bit.dll
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           name: fluent-bit_${{ env.VERSION }}_zip
           path: packages/
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -119,7 +119,7 @@ jobs:
         # for those distros using the same package, such as Windows). To avoid this, we first push all the files to a
         # shared filesystem and let the "prepare_prerelease" step below upload them later, sequentially. This GH action
         # ensures that if two jobs attempt pushing the same file, they get overwritten (last one prevails).
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           # Artifacts are pushed to *shared network folders* that have this name and that contain
           # the artifact inside of them. Example: fluent-bit-2.1.8-386.exe/fluent-bit-2.1.8-386.exe
diff --git a/.github/workflows/run_e2e_tests.yml b/.github/workflows/run_e2e_tests.yml
@@ -99,7 +99,7 @@ jobs:
 
   tear_down_test_executor_instances:
     name: Tear down test executor instances
-    if: always()
+    #if: always() #Uncomment after 3.1.9 version release
     needs: report_test_results
     uses: ./.github/workflows/run_task.yml
     with:
diff --git a/ansible/build-fb-suse/requirements.yml b/ansible/build-fb-suse/requirements.yml
@@ -1,7 +1,7 @@
 collections:
   - name: community.aws
   - name: community.general
-  - name: git+https://github.com/Sivakumar3695/caos-ansible-roles#/caos.ansible_roles/
+  - name: git+https://github.com/luckslovez/caos-ansible-roles#/caos.ansible_roles/
     type: git
 roles:
   - name: andrewrothstein.gh
diff --git a/versions/amazonlinux_2023.yml b/versions/amazonlinux_2023.yml
@@ -2,6 +2,6 @@ osDistro: amazonlinux
 osVersion: 2023
 packages:
   - arch: x86_64
-    ami: ami-01103fb68b3569475
+    ami: ami-0798fb070bcaff6e9
   - arch: aarch64
     ami: ami-0b9df99d3514cdede
diff --git a/versions/common.yml b/versions/common.yml
@@ -1,4 +1,4 @@
-fbVersion: 3.1.2
+fbVersion: 3.1.9
 
 #  This file, together with each distro file are processed and merged incrementally to
 #  build all the information required to download and test each package. Each package ends
diff --git a/versions/sles_12.1.ymlx b/versions/sles_12.1.ymlx
diff --git a/versions/sles_12.2.ymlx b/versions/sles_12.2.ymlx
diff --git a/versions/sles_12.3.ymlx b/versions/sles_12.3.ymlx
diff --git a/versions/sles_12.4.ymlx b/versions/sles_12.4.ymlx
diff --git a/versions/sles_15.1.ymlx b/versions/sles_15.1.ymlx
diff --git a/versions/sles_15.2.yml b/versions/sles_15.2.yml
diff --git a/versions/sles_15.2.ymlx b/versions/sles_15.2.ymlx
@@ -0,0 +1,5 @@
+osDistro: sles
+osVersion: 15.2
+packages:
+  - arch: x86_64
+    ami: ami-03bb89b7d26709c14 # TODO: This AMI is from publisher kurian. Need to confirm with security team before making it to production.
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-0d80ccb98990ccf53
+    ami: ami-048206b517bb4a5c2
diff --git a/versions/sles_15.4.yml b/versions/sles_15.4.yml
@@ -2,4 +2,4 @@ osDistro: sles
 osVersion: 15.4
 packages:
   - arch: x86_64
-    ami: ami-04bec2ee7152c1c8c
+    ami: ami-0f48f109f1e6a8a4c
diff --git a/versions/strategyMatrix.py b/versions/strategyMatrix.py
@@ -185,7 +185,7 @@ def list_distro_files():
     try:
         return [
             filename
-            for filename in os.listdir(".")
+            for filename in os.listdir(".")             
             if (filename.endswith(".yml") or filename.endswith(".yaml"))
             and filename != "common.yml"
         ]
diff --git a/versions/windows-server-2019.yml b/versions/windows-server-2019.yml
@@ -2,7 +2,7 @@ osDistro: windows-server
 osVersion: 2019
 packages:
   - arch: win64
-    ami: ami-0cd3008ce2e0d1c0c
+    ami: ami-04a0f66869c37da73
   # There is no win32 image available in AWS, so we use the w64 one to test the w32 binaries
   - arch: win32
-    ami: ami-0cd3008ce2e0d1c0c
+    ami: ami-0131f8b98ba082b3b
diff --git a/versions/windows-server-2022.yml b/versions/windows-server-2022.yml
@@ -2,6 +2,6 @@ osDistro: windows-server
 osVersion: 2022
 packages:
   - arch: win64
-    ami: ami-094aa6728b151e05a
+    ami: ami-0c808db6baea2d0ed
   - arch: win32
-    ami: ami-094aa6728b151e05a
+    ami: ami-0c25be66a8d4215e5

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-fbVersion: 3.1.2`
	`1`	`+fbVersion: 3.1.9`
`2`	`2`
`3`	`3`	`# This file, together with each distro file are processed and merged incrementally to`
`4`	`4`	`# build all the information required to download and test each package. Each package ends`