From ffa77999ee9b23c822d14ed43fd008f84ae7c772 Mon Sep 17 00:00:00 2001
From: sramesh <sramesh@newrelic.com>
Date: Tue, 21 Jan 2025 22:45:50 +0530
Subject: [PATCH 01/24] ubuntu 16 version support

---
 versions/ubuntu_16_xenial.yml | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 versions/ubuntu_16_xenial.yml

diff --git a/versions/ubuntu_16_xenial.yml b/versions/ubuntu_16_xenial.yml
new file mode 100644
index 00000000..80466314
--- /dev/null
+++ b/versions/ubuntu_16_xenial.yml
@@ -0,0 +1,5 @@
+osDistro: ubuntu
+osVersion: xenial
+packages:
+  - arch: amd64
+    ami: ami-0b4636c5dbb9cc605
\ No newline at end of file

From deaabcbd1d78fbafeb382bfa358b086378e725ca Mon Sep 17 00:00:00 2001
From: sramesh <sramesh@newrelic.com>
Date: Tue, 21 Jan 2025 22:52:37 +0530
Subject: [PATCH 02/24] ubuntu 16 version support

---
 .github/workflows/pull_request.yml | 26 +++++++++++++-------------
 versions/strategyMatrix.py         |  2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index ed6ce6b0..b0a93341 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -193,7 +193,7 @@ jobs:
 
   # Runs E2E tests using the packages available in the tmp-pr-#PR prerelease
   run_e2e_tests_prerelease:
-    needs: [ setup_environment,upload_official_packages_to_prerelease ]
+    needs: [ setup_environment,sign_suse_packages, upload_official_packages_to_prerelease ]
     name: Run E2E tests by installing NRIA from Production and installing Fluent Bit from the PR pre-release
     uses: ./.github/workflows/run_e2e_tests.yml
     with:
@@ -229,15 +229,15 @@ jobs:
           gpg_passphrase: ${{ secrets.OHAI_GPG_PASSPHRASE }}
           gpg_private_key_base64: ${{ secrets.OHAI_GPG_PRIVATE_KEY_BASE64 }} # base64 encoded
 
-  # run_e2e_tests_staging:
-  #   needs: [ setup_environment, run_e2e_tests_prerelease, publish_linux_to_staging ]
-  #   if: |
-  #     always() && !failure() && !cancelled()
-  #   name: Run E2E tests for all supported packages installing NRIA+FB from staging
-  #   uses: ./.github/workflows/run_e2e_tests.yml
-  #   with:
-  #     gh_release_name: ${{ needs.setup_environment.outputs.pre_release_name }}
-  #     infra_agent_version: latest
-  #     infra_agent_env: staging
-  #     test_report_filename: test-report-staging.xml
-  #   secrets: inherit
+  run_e2e_tests_staging:
+    needs: [ setup_environment, run_e2e_tests_prerelease, publish_linux_to_staging ]
+    if: |
+      always() && !failure() && !cancelled()
+    name: Run E2E tests for all supported packages installing NRIA+FB from staging
+    uses: ./.github/workflows/run_e2e_tests.yml
+    with:
+      gh_release_name: ${{ needs.setup_environment.outputs.pre_release_name }}
+      infra_agent_version: latest
+      infra_agent_env: staging
+      test_report_filename: test-report-staging.xml
+    secrets: inherit
diff --git a/versions/strategyMatrix.py b/versions/strategyMatrix.py
index d9c3eeae..f7a3c7f3 100644
--- a/versions/strategyMatrix.py
+++ b/versions/strategyMatrix.py
@@ -186,7 +186,7 @@ def list_distro_files():
         return [
             filename
             for filename in os.listdir(".")             
-            if (filename.startswith("windows"))
+            if (filename.endswith(".yml") or filename.endswith(".yaml"))
             and filename != "common.yml"
         ]
     except Exception as e:

From d0ef2cff667395700e2d23c912d4289533da8539 Mon Sep 17 00:00:00 2001
From: sramesh <sramesh@newrelic.com>
Date: Tue, 21 Jan 2025 23:52:59 +0530
Subject: [PATCH 03/24] remove suse dependency

---
 .github/workflows/pull_request.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index b0a93341..88df9c2a 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -193,7 +193,7 @@ jobs:
 
   # Runs E2E tests using the packages available in the tmp-pr-#PR prerelease
   run_e2e_tests_prerelease:
-    needs: [ setup_environment,sign_suse_packages, upload_official_packages_to_prerelease ]
+    needs: [ setup_environment, upload_official_packages_to_prerelease ]
     name: Run E2E tests by installing NRIA from Production and installing Fluent Bit from the PR pre-release
     uses: ./.github/workflows/run_e2e_tests.yml
     with:

From 126be6823a3508e3533e939a87fcef7cf710bfa7 Mon Sep 17 00:00:00 2001
From: sramesh <sramesh@newrelic.com>
Date: Wed, 22 Jan 2025 11:46:35 +0530
Subject: [PATCH 04/24] change ami

---
 versions/ubuntu_16_xenial.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/ubuntu_16_xenial.yml b/versions/ubuntu_16_xenial.yml
index 80466314..57e61d40 100644
--- a/versions/ubuntu_16_xenial.yml
+++ b/versions/ubuntu_16_xenial.yml
@@ -2,4 +2,4 @@ osDistro: ubuntu
 osVersion: xenial
 packages:
   - arch: amd64
-    ami: ami-0b4636c5dbb9cc605
\ No newline at end of file
+    ami: ami-003ec52235e3d8783
\ No newline at end of file

From 89d801b61b51d840c2840f49bb9d16ca3cf4830a Mon Sep 17 00:00:00 2001
From: sramesh <sramesh@newrelic.com>
Date: Mon, 27 Jan 2025 20:50:19 +0530
Subject: [PATCH 05/24] xenial ami update

---
 versions/ubuntu_16_xenial.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/ubuntu_16_xenial.yml b/versions/ubuntu_16_xenial.yml
index 57e61d40..3a06af0b 100644
--- a/versions/ubuntu_16_xenial.yml
+++ b/versions/ubuntu_16_xenial.yml
@@ -2,4 +2,4 @@ osDistro: ubuntu
 osVersion: xenial
 packages:
   - arch: amd64
-    ami: ami-003ec52235e3d8783
\ No newline at end of file
+    ami: ami-00288dd67c030259b
\ No newline at end of file

From 13c709e0eb1ecceee203987662ec5bfa307aad50 Mon Sep 17 00:00:00 2001
From: sramesh <sramesh@newrelic.com>
Date: Mon, 27 Jan 2025 21:24:23 +0530
Subject: [PATCH 06/24] testing ubuntu with 3.2.3

---
 versions/common.yml        | 2 +-
 versions/strategyMatrix.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/versions/common.yml b/versions/common.yml
index f06ccc6a..5ea45504 100644
--- a/versions/common.yml
+++ b/versions/common.yml
@@ -1,4 +1,4 @@
-fbVersion: 3.2.2
+fbVersion: 3.2.3
 
 #  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/strategyMatrix.py b/versions/strategyMatrix.py
index f7a3c7f3..315a191d 100644
--- a/versions/strategyMatrix.py
+++ b/versions/strategyMatrix.py
@@ -186,7 +186,7 @@ def list_distro_files():
         return [
             filename
             for filename in os.listdir(".")             
-            if (filename.endswith(".yml") or filename.endswith(".yaml"))
+            if (filename.startswith("ubuntu"))
             and filename != "common.yml"
         ]
     except Exception as e:

From 03d613e6d637dd0eb4d46a52bbd343f21612a919 Mon Sep 17 00:00:00 2001
From: sramesh <sramesh@newrelic.com>
Date: Mon, 27 Jan 2025 21:34:12 +0530
Subject: [PATCH 07/24] remove ubuntu 16

---
 versions/ubuntu_16_xenial.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/versions/ubuntu_16_xenial.yml b/versions/ubuntu_16_xenial.yml
index 3a06af0b..b8e96922 100644
--- a/versions/ubuntu_16_xenial.yml
+++ b/versions/ubuntu_16_xenial.yml
@@ -1,5 +1,5 @@
-osDistro: ubuntu
-osVersion: xenial
-packages:
-  - arch: amd64
-    ami: ami-00288dd67c030259b
\ No newline at end of file
+#osDistro: ubuntu
+#osVersion: xenial
+#packages:
+#  - arch: amd64
+#    ami: ami-00288dd67c030259b
\ No newline at end of file

From fee1793940d4dc1fa7623d30061f84ebc9017886 Mon Sep 17 00:00:00 2001
From: sramesh <sramesh@newrelic.com>
Date: Mon, 27 Jan 2025 21:35:29 +0530
Subject: [PATCH 08/24] remove ubuntu 16

---
 versions/{ubuntu_16_xenial.yml => 1ubuntu_16_xenial.yml} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename versions/{ubuntu_16_xenial.yml => 1ubuntu_16_xenial.yml} (100%)

diff --git a/versions/ubuntu_16_xenial.yml b/versions/1ubuntu_16_xenial.yml
similarity index 100%
rename from versions/ubuntu_16_xenial.yml
rename to versions/1ubuntu_16_xenial.yml

From adeb2b3c8e1693aa1626a8e7683c5cc823bf4f2a Mon Sep 17 00:00:00 2001
From: sramesh <sramesh@newrelic.com>
Date: Mon, 27 Jan 2025 21:49:50 +0530
Subject: [PATCH 09/24] update ami

---
 versions/1ubuntu_16_xenial.yml | 5 -----
 versions/strategyMatrix.py     | 2 +-
 versions/ubuntu_16_xenial.yml  | 5 +++++
 3 files changed, 6 insertions(+), 6 deletions(-)
 delete mode 100644 versions/1ubuntu_16_xenial.yml
 create mode 100644 versions/ubuntu_16_xenial.yml

diff --git a/versions/1ubuntu_16_xenial.yml b/versions/1ubuntu_16_xenial.yml
deleted file mode 100644
index b8e96922..00000000
--- a/versions/1ubuntu_16_xenial.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-#osDistro: ubuntu
-#osVersion: xenial
-#packages:
-#  - arch: amd64
-#    ami: ami-00288dd67c030259b
\ No newline at end of file
diff --git a/versions/strategyMatrix.py b/versions/strategyMatrix.py
index 315a191d..59476f7b 100644
--- a/versions/strategyMatrix.py
+++ b/versions/strategyMatrix.py
@@ -186,7 +186,7 @@ def list_distro_files():
         return [
             filename
             for filename in os.listdir(".")             
-            if (filename.startswith("ubuntu"))
+            if (filename.startswith("ubuntu_16"))
             and filename != "common.yml"
         ]
     except Exception as e:
diff --git a/versions/ubuntu_16_xenial.yml b/versions/ubuntu_16_xenial.yml
new file mode 100644
index 00000000..80466314
--- /dev/null
+++ b/versions/ubuntu_16_xenial.yml
@@ -0,0 +1,5 @@
+osDistro: ubuntu
+osVersion: xenial
+packages:
+  - arch: amd64
+    ami: ami-0b4636c5dbb9cc605
\ No newline at end of file

From a4a8ca9b978da9a95ea516fc564299b9e565de1a Mon Sep 17 00:00:00 2001
From: sramesh <sramesh@newrelic.com>
Date: Mon, 27 Jan 2025 22:31:07 +0530
Subject: [PATCH 10/24] update ami

---
 versions/ubuntu_16_xenial.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/ubuntu_16_xenial.yml b/versions/ubuntu_16_xenial.yml
index 80466314..15f611ff 100644
--- a/versions/ubuntu_16_xenial.yml
+++ b/versions/ubuntu_16_xenial.yml
@@ -2,4 +2,4 @@ osDistro: ubuntu
 osVersion: xenial
 packages:
   - arch: amd64
-    ami: ami-0b4636c5dbb9cc605
\ No newline at end of file
+    ami: ami-00afad98bfeb7fab3
\ No newline at end of file

From b8f70038b3fbc2d1719663b5dd1aaed44e709e72 Mon Sep 17 00:00:00 2001
From: sramesh <sramesh@newrelic.com>
Date: Tue, 28 Jan 2025 00:08:22 +0530
Subject: [PATCH 11/24] verbose

---
 ansible/provision-and-execute-tests/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ansible/provision-and-execute-tests/Makefile b/ansible/provision-and-execute-tests/Makefile
index 3a247cbc..24d9ca8b 100644
--- a/ansible/provision-and-execute-tests/Makefile
+++ b/ansible/provision-and-execute-tests/Makefile
@@ -2,7 +2,7 @@ include ../Ansible.common.mk
 
 .PHONY: prerelease
 prerelease: dependencies prepare-inventory
-	ansible-playbook $(ANSIBLE_FOLDER)/playbook-provision-prerelease.yml -i $(ANSIBLE_INVENTORY)
+	ansible-playbook $(ANSIBLE_FOLDER)/playbook-provision-prerelease.yml -i $(ANSIBLE_INVENTORY) -vvv
 	ansible-playbook $(ANSIBLE_FOLDER)/playbook-run-tests.yml -i $(ANSIBLE_INVENTORY)
 	ansible-playbook $(ANSIBLE_FOLDER)/playbook-windows.yml -i $(ANSIBLE_INVENTORY)
 	ansible-playbook $(ANSIBLE_FOLDER)/playbook-merge-results.yml -i $(ANSIBLE_INVENTORY)

From c87115a54b382c79841b93a3ace634a6adc40906 Mon Sep 17 00:00:00 2001
From: sramesh <sramesh@newrelic.com>
Date: Tue, 28 Jan 2025 00:53:44 +0530
Subject: [PATCH 12/24] verbose remove

---
 ansible/provision-and-execute-tests/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ansible/provision-and-execute-tests/Makefile b/ansible/provision-and-execute-tests/Makefile
index 24d9ca8b..3a247cbc 100644
--- a/ansible/provision-and-execute-tests/Makefile
+++ b/ansible/provision-and-execute-tests/Makefile
@@ -2,7 +2,7 @@ include ../Ansible.common.mk
 
 .PHONY: prerelease
 prerelease: dependencies prepare-inventory
-	ansible-playbook $(ANSIBLE_FOLDER)/playbook-provision-prerelease.yml -i $(ANSIBLE_INVENTORY) -vvv
+	ansible-playbook $(ANSIBLE_FOLDER)/playbook-provision-prerelease.yml -i $(ANSIBLE_INVENTORY)
 	ansible-playbook $(ANSIBLE_FOLDER)/playbook-run-tests.yml -i $(ANSIBLE_INVENTORY)
 	ansible-playbook $(ANSIBLE_FOLDER)/playbook-windows.yml -i $(ANSIBLE_INVENTORY)
 	ansible-playbook $(ANSIBLE_FOLDER)/playbook-merge-results.yml -i $(ANSIBLE_INVENTORY)

From c82ef17fe97d02b327997395abe50d94b84526b0 Mon Sep 17 00:00:00 2001
From: sramesh <sramesh@newrelic.com>
Date: Tue, 28 Jan 2025 10:41:29 +0530
Subject: [PATCH 13/24] degrade ssm version

---
 ansible/provision-and-execute-tests/requirements.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ansible/provision-and-execute-tests/requirements.yml b/ansible/provision-and-execute-tests/requirements.yml
index 054380b1..978c75e6 100644
--- a/ansible/provision-and-execute-tests/requirements.yml
+++ b/ansible/provision-and-execute-tests/requirements.yml
@@ -1,5 +1,6 @@
 collections:
   - name: community.aws
+    version: 3.2.0
   - name: ansible.windows
     version: 1.14.0
   - name: ansible.utils

From 63cedb84f8d3fe1f44080222ccc20a7230a49239 Mon Sep 17 00:00:00 2001
From: sramesh <sramesh@newrelic.com>
Date: Tue, 28 Jan 2025 11:10:41 +0530
Subject: [PATCH 14/24] testing python config

---
 ansible/provision-and-execute-tests/ansible.cfg      | 4 ++++
 ansible/provision-and-execute-tests/aws_ec2.yml.dist | 1 +
 ansible/provision-and-execute-tests/requirements.yml | 1 -
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ansible/provision-and-execute-tests/ansible.cfg b/ansible/provision-and-execute-tests/ansible.cfg
index d82e2302..20f7d09d 100644
--- a/ansible/provision-and-execute-tests/ansible.cfg
+++ b/ansible/provision-and-execute-tests/ansible.cfg
@@ -2,4 +2,8 @@
 # To avoid Ansible printing warnings such as:
 # [WARNING]: Platform linux on host ... is using the discovered Python interpreter at /usr/libexec/platform-python, but future installation of another Python interpreter could change the meaning of that path. See https://docs.ansible.com/ansible-
 #  core/2.15/reference_appendices/interpreter_discovery.html for more information.
+interpreter_python = auto_silent
+
+[xenial]
+ansible_python_interpreter=/usr/bin/python3.5
 interpreter_python = auto_silent
\ No newline at end of file
diff --git a/ansible/provision-and-execute-tests/aws_ec2.yml.dist b/ansible/provision-and-execute-tests/aws_ec2.yml.dist
index a513c0ba..8de3a8cc 100644
--- a/ansible/provision-and-execute-tests/aws_ec2.yml.dist
+++ b/ansible/provision-and-execute-tests/aws_ec2.yml.dist
@@ -18,6 +18,7 @@ groups:
     suse_15: "tags.os_version.startswith('15')"
     windows: "'windows-server' in tags.os_distro"
     linux: "'windows-server' not in tags.os_distro"
+    xenial: "tags.os_version.startswith('xenial')"
 compose:
     # This is how the Ansible SSM plugin will connect to each host. We cannot use the hostname (tag:Name) directly because
     # it contains "." characters, which are not allowed by the SSM plugin.
diff --git a/ansible/provision-and-execute-tests/requirements.yml b/ansible/provision-and-execute-tests/requirements.yml
index 978c75e6..054380b1 100644
--- a/ansible/provision-and-execute-tests/requirements.yml
+++ b/ansible/provision-and-execute-tests/requirements.yml
@@ -1,6 +1,5 @@
 collections:
   - name: community.aws
-    version: 3.2.0
   - name: ansible.windows
     version: 1.14.0
   - name: ansible.utils

From c85d97ae6878a2a54887ad6a258d6afd8b37000a Mon Sep 17 00:00:00 2001
From: sramesh <sramesh@newrelic.com>
Date: Tue, 28 Jan 2025 11:28:15 +0530
Subject: [PATCH 15/24] add group vars for ubuntu 16

---
 ansible/provision-and-execute-tests/ansible.cfg           | 4 ----
 ansible/provision-and-execute-tests/group_vars/xenial.yml | 1 +
 2 files changed, 1 insertion(+), 4 deletions(-)
 create mode 100644 ansible/provision-and-execute-tests/group_vars/xenial.yml

diff --git a/ansible/provision-and-execute-tests/ansible.cfg b/ansible/provision-and-execute-tests/ansible.cfg
index 20f7d09d..d82e2302 100644
--- a/ansible/provision-and-execute-tests/ansible.cfg
+++ b/ansible/provision-and-execute-tests/ansible.cfg
@@ -2,8 +2,4 @@
 # To avoid Ansible printing warnings such as:
 # [WARNING]: Platform linux on host ... is using the discovered Python interpreter at /usr/libexec/platform-python, but future installation of another Python interpreter could change the meaning of that path. See https://docs.ansible.com/ansible-
 #  core/2.15/reference_appendices/interpreter_discovery.html for more information.
-interpreter_python = auto_silent
-
-[xenial]
-ansible_python_interpreter=/usr/bin/python3.5
 interpreter_python = auto_silent
\ No newline at end of file
diff --git a/ansible/provision-and-execute-tests/group_vars/xenial.yml b/ansible/provision-and-execute-tests/group_vars/xenial.yml
new file mode 100644
index 00000000..3e16c105
--- /dev/null
+++ b/ansible/provision-and-execute-tests/group_vars/xenial.yml
@@ -0,0 +1 @@
+ansible_python_interpreter: /usr/bin/python3.5
\ No newline at end of file

From 383adbc05534fd1d07eb7a3c3389510574fed7f5 Mon Sep 17 00:00:00 2001
From: sramesh <sramesh@newrelic.com>
Date: Tue, 28 Jan 2025 11:35:13 +0530
Subject: [PATCH 16/24] python interpreter for xenial

---
 ansible/provision-and-execute-tests/group_vars/xenial.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ansible/provision-and-execute-tests/group_vars/xenial.yml b/ansible/provision-and-execute-tests/group_vars/xenial.yml
index 3e16c105..b4a2c4f8 100644
--- a/ansible/provision-and-execute-tests/group_vars/xenial.yml
+++ b/ansible/provision-and-execute-tests/group_vars/xenial.yml
@@ -1 +1 @@
-ansible_python_interpreter: /usr/bin/python3.5
\ No newline at end of file
+ansible_python_interpreter: /usr/bin/python3
\ No newline at end of file

From fc1a747da341042f7761693d7da9561166a51ff9 Mon Sep 17 00:00:00 2001
From: sramesh <sramesh@newrelic.com>
Date: Tue, 28 Jan 2025 12:46:27 +0530
Subject: [PATCH 17/24] remove interpreter changes

---
 ansible/provision-and-execute-tests/aws_ec2.yml.dist      | 1 -
 ansible/provision-and-execute-tests/group_vars/xenial.yml | 1 -
 2 files changed, 2 deletions(-)
 delete mode 100644 ansible/provision-and-execute-tests/group_vars/xenial.yml

diff --git a/ansible/provision-and-execute-tests/aws_ec2.yml.dist b/ansible/provision-and-execute-tests/aws_ec2.yml.dist
index 8de3a8cc..a513c0ba 100644
--- a/ansible/provision-and-execute-tests/aws_ec2.yml.dist
+++ b/ansible/provision-and-execute-tests/aws_ec2.yml.dist
@@ -18,7 +18,6 @@ groups:
     suse_15: "tags.os_version.startswith('15')"
     windows: "'windows-server' in tags.os_distro"
     linux: "'windows-server' not in tags.os_distro"
-    xenial: "tags.os_version.startswith('xenial')"
 compose:
     # This is how the Ansible SSM plugin will connect to each host. We cannot use the hostname (tag:Name) directly because
     # it contains "." characters, which are not allowed by the SSM plugin.
diff --git a/ansible/provision-and-execute-tests/group_vars/xenial.yml b/ansible/provision-and-execute-tests/group_vars/xenial.yml
deleted file mode 100644
index b4a2c4f8..00000000
--- a/ansible/provision-and-execute-tests/group_vars/xenial.yml
+++ /dev/null
@@ -1 +0,0 @@
-ansible_python_interpreter: /usr/bin/python3
\ No newline at end of file

From e490dde9b50456c85d22cb8b4f8f9688aef5c644 Mon Sep 17 00:00:00 2001
From: sramesh <sramesh@newrelic.com>
Date: Tue, 28 Jan 2025 15:44:45 +0530
Subject: [PATCH 18/24] try python 2.7

---
 ansible/provision-and-execute-tests/aws_ec2.yml.dist      | 1 +
 ansible/provision-and-execute-tests/group_vars/xenail.yml | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 ansible/provision-and-execute-tests/group_vars/xenail.yml

diff --git a/ansible/provision-and-execute-tests/aws_ec2.yml.dist b/ansible/provision-and-execute-tests/aws_ec2.yml.dist
index a513c0ba..8de3a8cc 100644
--- a/ansible/provision-and-execute-tests/aws_ec2.yml.dist
+++ b/ansible/provision-and-execute-tests/aws_ec2.yml.dist
@@ -18,6 +18,7 @@ groups:
     suse_15: "tags.os_version.startswith('15')"
     windows: "'windows-server' in tags.os_distro"
     linux: "'windows-server' not in tags.os_distro"
+    xenial: "tags.os_version.startswith('xenial')"
 compose:
     # This is how the Ansible SSM plugin will connect to each host. We cannot use the hostname (tag:Name) directly because
     # it contains "." characters, which are not allowed by the SSM plugin.
diff --git a/ansible/provision-and-execute-tests/group_vars/xenail.yml b/ansible/provision-and-execute-tests/group_vars/xenail.yml
new file mode 100644
index 00000000..f6657b8f
--- /dev/null
+++ b/ansible/provision-and-execute-tests/group_vars/xenail.yml
@@ -0,0 +1 @@
+ansible_python_interpreter: /usr/bin/python
\ No newline at end of file

From 158fc8d469baf7b5265fefb783e16868795290ba Mon Sep 17 00:00:00 2001
From: sramesh <sramesh@newrelic.com>
Date: Tue, 28 Jan 2025 16:50:22 +0530
Subject: [PATCH 19/24] add custom ami with python 2.7

---
 versions/ubuntu_16_xenial.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/ubuntu_16_xenial.yml b/versions/ubuntu_16_xenial.yml
index 15f611ff..e55f3f1f 100644
--- a/versions/ubuntu_16_xenial.yml
+++ b/versions/ubuntu_16_xenial.yml
@@ -2,4 +2,4 @@ osDistro: ubuntu
 osVersion: xenial
 packages:
   - arch: amd64
-    ami: ami-00afad98bfeb7fab3
\ No newline at end of file
+    ami: ami-004845fc1d31e61df
\ No newline at end of file

From be071c2d93533b1c88ebcdaaace6ac45afd64d01 Mon Sep 17 00:00:00 2001
From: sramesh <sramesh@newrelic.com>
Date: Tue, 28 Jan 2025 17:06:15 +0530
Subject: [PATCH 20/24] ami change

---
 versions/ubuntu_16_xenial.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/ubuntu_16_xenial.yml b/versions/ubuntu_16_xenial.yml
index e55f3f1f..57e61d40 100644
--- a/versions/ubuntu_16_xenial.yml
+++ b/versions/ubuntu_16_xenial.yml
@@ -2,4 +2,4 @@ osDistro: ubuntu
 osVersion: xenial
 packages:
   - arch: amd64
-    ami: ami-004845fc1d31e61df
\ No newline at end of file
+    ami: ami-003ec52235e3d8783
\ No newline at end of file

From 32ff18585f5126fcf0f84699dbf4bc5f3731002b Mon Sep 17 00:00:00 2001
From: sramesh <sramesh@newrelic.com>
Date: Tue, 28 Jan 2025 17:21:05 +0530
Subject: [PATCH 21/24] custom ami

---
 versions/sles_15.3.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/sles_15.3.yml b/versions/sles_15.3.yml
index 2cd72750..fb28f9ae 100644
--- 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-0c0ca60d1d7619525
\ No newline at end of file
+    ami: ami-01e7407a20284c7ff
\ No newline at end of file

From bfd9133e48d71290dcbf00795ac85667956d9343 Mon Sep 17 00:00:00 2001
From: sramesh <sramesh@newrelic.com>
Date: Tue, 28 Jan 2025 17:21:29 +0530
Subject: [PATCH 22/24] custom ami

---
 versions/sles_15.3.yml        | 2 +-
 versions/ubuntu_16_xenial.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/versions/sles_15.3.yml b/versions/sles_15.3.yml
index fb28f9ae..2cd72750 100644
--- 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-01e7407a20284c7ff
\ No newline at end of file
+    ami: ami-0c0ca60d1d7619525
\ No newline at end of file
diff --git a/versions/ubuntu_16_xenial.yml b/versions/ubuntu_16_xenial.yml
index 57e61d40..36f3c324 100644
--- a/versions/ubuntu_16_xenial.yml
+++ b/versions/ubuntu_16_xenial.yml
@@ -2,4 +2,4 @@ osDistro: ubuntu
 osVersion: xenial
 packages:
   - arch: amd64
-    ami: ami-003ec52235e3d8783
\ No newline at end of file
+    ami: ami-01e7407a20284c7ff
\ No newline at end of file

From 92bbed08a6916c75957d76bced1704c29ec0d19e Mon Sep 17 00:00:00 2001
From: sramesh <sramesh@newrelic.com>
Date: Mon, 24 Feb 2025 14:34:45 +0530
Subject: [PATCH 23/24] fluent bit version 3.2.2

---
 versions/common.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/common.yml b/versions/common.yml
index 5ea45504..f06ccc6a 100644
--- a/versions/common.yml
+++ b/versions/common.yml
@@ -1,4 +1,4 @@
-fbVersion: 3.2.3
+fbVersion: 3.2.2
 
 #  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

From 398fe979fb572a4979295c0cea3b08df4b222290 Mon Sep 17 00:00:00 2001
From: sramesh <sramesh@newrelic.com>
Date: Mon, 24 Feb 2025 14:37:21 +0530
Subject: [PATCH 24/24] action version upgrade

---
 .github/workflows/pull_request.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 88df9c2a..36447295 100644
--- 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@v3
+      - uses: actions/upload-artifact@v4
         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
@@ -132,7 +132,7 @@ jobs:
 
     steps:
       - name: Download all artifacts from shared filesystem
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           path: packages