Upgrade fluent bit version to 3.2.2 to amazonlinux packages only (#187)

Upgrading fluent bit version to 3.2.2 for amazonlinux 2 and amazonlinux 2023 Upgrading the systems separately by batching one operating system at a time , cause we are encountering issues with the test cases, as they remain flaky and fail most of the time. Migrations changes : Update vpc subnet and security groups New role is created in Logging integrations account Update S3 buckets logging-e2e-testing-ssm-transfers-logint logging-e2e-testing-ssm-transfers-logint logging-e2e-testing-tf-logint Update AMIs
newrelic · Jan 15, 2025 · 5b163c4 · 5b163c4
1 parent 21b92fb
commit 5b163c4
Show file tree

Hide file tree

Showing 21 changed files with 33 additions and 33 deletions.
diff --git 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:

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()
     needs: report_test_results
     uses: ./.github/workflows/run_task.yml
     with:

diff --git a/.github/workflows/run_task.yml b/.github/workflows/run_task.yml
@@ -19,7 +19,7 @@ jobs:
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v3
         with:
-          role-to-assume: ${{ secrets.AWS_ROLE_ARN }}
+          role-to-assume: ${{ secrets.AWS_ROLE_ARN_NEW }}
           # https://github.com/aws-actions/configure-aws-credentials#credential-lifetime
           role-duration-seconds: 21600 # default to 1 hour, which might not suffice
           aws-region: us-east-2
@@ -45,8 +45,8 @@ jobs:
           # that was used to create the ECS infrastructure. "ecs" is the default cloudwatch_log_prefix
           # when not specified, and our container_name is infra-agent-fb-e2e-testing
           cloud_watch_logs_stream_name: ecs/infra-agent-fb-e2e-testing
-          aws_vpc_subnet: subnet-0d99e0c3f57f87c58
+          aws_vpc_subnet: subnet-0271924cb6b30c703
           aws_vpc_security_groups: |
-            sg-0de7ca06bb5972dcb
+            sg-0e8e90f88828d510d
           repo_name: "newrelic/fluent-bit-package"
           ref: ${{ env.GIT_BRANCH }}
diff --git a/ansible/build-fb-suse/aws_ec2.yml.dist b/ansible/build-fb-suse/aws_ec2.yml.dist
@@ -24,6 +24,6 @@ compose:
     # Host variables that are strings (not variables) need to be wrapped with two sets of quotes.
     # See https://docs.ansible.com/ansible/latest/plugins/inventory.html#using-inventory-plugins for details.
     ansible_connection: '"community.aws.aws_ssm"'
-    ansible_aws_ssm_bucket_name: '"logging-e2e-testing-ssm-transfers"'
+    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"'
diff --git a/ansible/provision-and-execute-tests/aws_ec2.yml.dist b/ansible/provision-and-execute-tests/aws_ec2.yml.dist
@@ -25,6 +25,6 @@ compose:
     # Host variables that are strings (not variables) need to be wrapped with two sets of quotes.
     # See https://docs.ansible.com/ansible/latest/plugins/inventory.html#using-inventory-plugins for details.
     ansible_connection: '"community.aws.aws_ssm"'
-    ansible_aws_ssm_bucket_name: '"logging-e2e-testing-ssm-transfers"'
+    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"'
diff --git a/terraform/ec2-instances-creator/main.tf b/terraform/ec2-instances-creator/main.tf
@@ -11,8 +11,8 @@ locals {
   #  }
   instance_matrix = jsondecode(file(var.instance_matrix_file))
 
-  aws_vpc_subnet = "subnet-0d99e0c3f57f87c58"
-  ec2_instances_security_group = "sg-0de7ca06bb5972dcb"
+  aws_vpc_subnet = "subnet-0271924cb6b30c703"
+  ec2_instances_security_group = "sg-0e8e90f88828d510d"
   ec2_instance_profile = "logging-e2e-testing-ec2-ssm-instance-profile"
 
   # See: https://docs.aws.amazon.com/systems-manager/latest/userguide/ssm-agent-status-and-restart.html

diff --git a/terraform/ec2-suse-builders/terraform.backend.tf.dist b/terraform/ec2-suse-builders/terraform.backend.tf.dist
@@ -4,7 +4,7 @@
 terraform {
   backend "s3" {
     encrypt = true
-    bucket  = "logging-e2e-testing-tf"
+    bucket  = "logging-e2e-testing-tf-logint"
     key     = "suse-builders-PRE_RELEASE_NAME"
     region  = "us-east-2"
   }

diff --git a/terraform/ec2-test-executors/terraform.backend.tf.dist b/terraform/ec2-test-executors/terraform.backend.tf.dist
@@ -4,7 +4,7 @@
 terraform {
   backend "s3" {
     encrypt = true
-    bucket  = "logging-e2e-testing-tf"
+    bucket  = "logging-e2e-testing-tf-logint"
     key     = "test-executors-PRE_RELEASE_NAME"
     region  = "us-east-2"
   }

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-0798fb070bcaff6e9
+    ami: ami-0b4624933067d393a
   - arch: aarch64
-    ami: ami-0b9df99d3514cdede
+    ami: ami-00136537838fffb8e
diff --git a/versions/centos_7.yml b/versions/centos_7.yml
@@ -2,6 +2,6 @@ osDistro: centos
 osVersion: 7
 packages:
   - arch: x86_64
-    ami: ami-05a36e1502605b4aa
+    ami: ami-006bb80361db75ce3
   - arch: aarch64
     ami: ami-01f5164ccc6a81e61
diff --git a/versions/centos_8.yml b/versions/centos_8.yml
@@ -2,6 +2,6 @@ osDistro: centos
 osVersion: 8
 packages:
   - arch: x86_64
-    ami: ami-0af29b92a1457bf87
+    ami: ami-00399f19e7ac4f3f6
   - arch: aarch64
     ami: ami-0dce27ea07b1afb8f
diff --git a/versions/centos_9.yml b/versions/centos_9.yml
@@ -2,6 +2,6 @@ osDistro: centos
 osVersion: 9
 packages:
   - arch: x86_64
-    ami: ami-011d59a275b482a49
+    ami: ami-008abbe3205afef66
   - arch: aarch64
-    ami: ami-008dee3b597bad5c2
+    ami: ami-0a0083d5b697457a6
diff --git a/versions/common.yml b/versions/common.yml
@@ -1,4 +1,4 @@
-fbVersion: 3.1.9
+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

diff --git a/versions/debian_10_buster.yml b/versions/debian_10_buster.yml
@@ -2,6 +2,6 @@ osDistro: debian
 osVersion: buster
 packages:
   - arch: amd64
-    ami: ami-05bf29fabdee3e5d2
+    ami: ami-001693acd462ba69b
   - arch: arm64
-    ami: ami-03e6e856fa72db174
+    ami: ami-003304e7bf14f24f7
diff --git a/versions/debian_11_bullseye.yml b/versions/debian_11_bullseye.yml
@@ -2,6 +2,6 @@ osDistro: debian
 osVersion: bullseye
 packages:
   - arch: amd64
-    ami: ami-06a7641d5bd7bdc65
+    ami: ami-0c18857b85f7df9ca
   - arch: arm64
-    ami: ami-0237d8bf4f989d904
+    ami: ami-0cdb8035f7aaf063d
diff --git a/versions/debian_12_bookworm.yml b/versions/debian_12_bookworm.yml
@@ -2,6 +2,6 @@ osDistro: debian
 osVersion: bookworm
 packages:
   - arch: amd64
-    ami: ami-0ddf7dfd13a83d8c8
+    ami: ami-08146b553b4767866
   - arch: arm64
-    ami: ami-0edd7fb88540aa37c
+    ami: ami-07cb96810e4caaea5
diff --git 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("amazonlinux"))
             and filename != "common.yml"
         ]
     except Exception as e:

diff --git a/versions/ubuntu_18_bionic.yml b/versions/ubuntu_18_bionic.yml
@@ -2,6 +2,6 @@ osDistro: ubuntu
 osVersion: bionic
 packages:
   - arch: amd64
-    ami: ami-04c8fda7dfbb7604a
+    ami: ami-097963bffada588c8
   - arch: arm64
-    ami: ami-0d8ade5793886b541
+    ami: ami-0f494cccc2516f9ba
diff --git a/versions/ubuntu_20_focal.yml b/versions/ubuntu_20_focal.yml
@@ -2,6 +2,6 @@ osDistro: ubuntu
 osVersion: focal
 packages:
   - arch: amd64
-    ami: ami-0fbe25808b51a1ac4
+    ami: ami-0a6462c415d101954
   - arch: arm64
-    ami: ami-0a60c2b5a4afb1607
+    ami: ami-0f7c78c0da1ef6eda
diff --git a/versions/ubuntu_22_jammy.yml b/versions/ubuntu_22_jammy.yml
@@ -2,6 +2,6 @@ osDistro: ubuntu
 osVersion: jammy
 packages:
   - arch: amd64
-    ami: ami-03a03b8680a3d588e
+    ami: ami-0552845828225afdc
   - arch: arm64
-    ami: ami-0058b7812506d8659
+    ami: ami-0d7783ddfbcc9cc3c
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-0c808db6baea2d0ed
+    ami: ami-00087f5bc76de01b4
   - arch: win32
-    ami: ami-0c25be66a8d4215e5
+    ami: ami-00087f5bc76de01b4