From 84ced9d017b3448906e0a471385aa4e75ed92f0f Mon Sep 17 00:00:00 2001 From: Akhil Date: Wed, 9 Apr 2025 12:31:38 +0530 Subject: [PATCH 1/6] Bump fb version to 3.2.10 --- versions/common.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/common.yml b/versions/common.yml index 26a6b133..6e3492aa 100644 --- a/versions/common.yml +++ b/versions/common.yml @@ -1,4 +1,4 @@ -fbVersion: 3.2.7 +fbVersion: 3.2.10 # 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 c4f957f0a677f7780dec15f18cb5bd882ff41c81 Mon Sep 17 00:00:00 2001 From: Akhil Date: Wed, 23 Apr 2025 09:17:00 +0530 Subject: [PATCH 2/6] commented out ubuntu-16 --- integration-tests/test-suite/winlog.test.js | 3 ++- versions/ubuntu_16_xenial.yml | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/integration-tests/test-suite/winlog.test.js b/integration-tests/test-suite/winlog.test.js index f7ed75ca..b957c578 100644 --- a/integration-tests/test-suite/winlog.test.js +++ b/integration-tests/test-suite/winlog.test.js @@ -63,7 +63,8 @@ describe('WINLOG & WINEVTLOG inputs', () => { // NOTE: this may take a while, since unlike winevtlog (which just reads // new events by default), winlog will read all events in the monitored log await waitForLogMessageContaining(nrdb, message); - }); + },30000 + ); testOnlyIfSet('MONITORED_WINDOWS_LOG_NAME_USING_WINEVTLOG')('detects a Windows event using "winevtlog" input plugin', async () => { // Create a unique string so that we can find the log message later diff --git a/versions/ubuntu_16_xenial.yml b/versions/ubuntu_16_xenial.yml index 36f3c324..92a31baf 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-01e7407a20284c7ff \ No newline at end of file +# osDistro: ubuntu +# osVersion: xenial +# packages: +# - arch: amd64 +# ami: ami-01e7407a20284c7ff \ No newline at end of file From 43bd425ad27372f99a0302776b88ad98636ad23d Mon Sep 17 00:00:00 2001 From: Akhil Date: Wed, 23 Apr 2025 11:10:39 +0530 Subject: [PATCH 3/6] modified ubuntu-16 version file --- 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 92a31baf..1cea3b0a 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-01e7407a20284c7ff \ No newline at end of file +osDistro: ubuntu +osVersion: xenial +packages: + # - arch: amd64 + # ami: ami-01e7407a20284c7ff \ No newline at end of file From 491e79bfe71cd754377a4e06859180b0b6925509 Mon Sep 17 00:00:00 2001 From: Akhil Date: Wed, 23 Apr 2025 11:12:07 +0530 Subject: [PATCH 4/6] modified ubuntu-16 version file --- versions/{ubuntu_16_xenial.yml => ubuntu_16_xenial.ymlx} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename versions/{ubuntu_16_xenial.yml => ubuntu_16_xenial.ymlx} (100%) diff --git a/versions/ubuntu_16_xenial.yml b/versions/ubuntu_16_xenial.ymlx similarity index 100% rename from versions/ubuntu_16_xenial.yml rename to versions/ubuntu_16_xenial.ymlx From c85f99b8e28ed1f64f4c4c89778b4a7a759ec636 Mon Sep 17 00:00:00 2001 From: Rajeev Kumar Date: Mon, 28 Apr 2025 17:12:24 +0530 Subject: [PATCH 5/6] Update windows-server-2022.yml --- versions/windows-server-2022.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/versions/windows-server-2022.yml b/versions/windows-server-2022.yml index 95f078ae..06582511 100644 --- 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-00087f5bc76de01b4 + ami: ami-06fbbb433da1a5bf7 - arch: win32 - ami: ami-00087f5bc76de01b4 + ami: ami-06fbbb433da1a5bf7 From fc918e8c8c51eb16a02310d6d04f90f899ae044d Mon Sep 17 00:00:00 2001 From: Rajeev Kumar Date: Mon, 28 Apr 2025 21:21:48 +0530 Subject: [PATCH 6/6] increasing timeout and retry limit --- ansible/build-fb-suse/aws_ec2.yml.dist | 2 +- ansible/build-fb-suse/playbook.yml | 6 +++--- ansible/provision-and-execute-tests/aws_ec2.yml.dist | 2 +- ansible/provision-and-execute-tests/playbook-windows.yml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ansible/build-fb-suse/aws_ec2.yml.dist b/ansible/build-fb-suse/aws_ec2.yml.dist index 86164694..02a94191 100644 --- a/ansible/build-fb-suse/aws_ec2.yml.dist +++ b/ansible/build-fb-suse/aws_ec2.yml.dist @@ -27,4 +27,4 @@ compose: ansible_aws_ssm_bucket_name: '"logging-e2e-testing-ssm-transfers-logint"' ansible_aws_ssm_bucket_sse_mode: '"AES256"' ansible_aws_ssm_region: '"us-east-2"' - ansible_aws_ssm_retries : 20 \ No newline at end of file + ansible_aws_ssm_retries : 40 \ No newline at end of file diff --git a/ansible/build-fb-suse/playbook.yml b/ansible/build-fb-suse/playbook.yml index b9ee00e9..7accfdaf 100644 --- a/ansible/build-fb-suse/playbook.yml +++ b/ansible/build-fb-suse/playbook.yml @@ -78,7 +78,7 @@ until: install_status is success # Retry up to 5 minutes, because at startup the zypper command might temporarily hold a lock that prevents installing packages delay: 15 - retries: 20 + retries: 40 - name: Download and extract Bison {{ bison_version }} unarchive: @@ -138,8 +138,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 + async: 1200 # timeout 7m + poll: 60 # 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/ansible/provision-and-execute-tests/aws_ec2.yml.dist b/ansible/provision-and-execute-tests/aws_ec2.yml.dist index 8a676e38..a83ab954 100644 --- a/ansible/provision-and-execute-tests/aws_ec2.yml.dist +++ b/ansible/provision-and-execute-tests/aws_ec2.yml.dist @@ -28,4 +28,4 @@ compose: ansible_aws_ssm_bucket_name: '"logging-e2e-testing-ssm-transfers-logint"' ansible_aws_ssm_bucket_sse_mode: '"AES256"' ansible_aws_ssm_region: '"us-east-2"' - ansible_aws_ssm_retries : 20 \ No newline at end of file + ansible_aws_ssm_retries : 40 \ No newline at end of file diff --git a/ansible/provision-and-execute-tests/playbook-windows.yml b/ansible/provision-and-execute-tests/playbook-windows.yml index 6df6e5a1..edbde1d0 100644 --- a/ansible/provision-and-execute-tests/playbook-windows.yml +++ b/ansible/provision-and-execute-tests/playbook-windows.yml @@ -30,7 +30,7 @@ any_errors_fatal: true strategy: free vars: - ansible_win_async_startup_timeout: 180 + ansible_win_async_startup_timeout: 300 node_version: 21.6.0 # The following information is populated using the gathered inventory variables fluent_bit_package_name: "{{ tags.fb_package_name }}"