Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

testing migration #180

Open
wants to merge 51 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
ade7b03
testing migration
gunnalahema Dec 23, 2024
97a156a
add new aws role from logging-integrations
gunnalahema Dec 23, 2024
05b712b
update SG
gunnalahema Dec 23, 2024
08b02bf
update vpc_subnet and SG
gunnalahema Dec 23, 2024
904f341
update al 2023 ami
gunnalahema Dec 26, 2024
2476163
testing
gunnalahema Dec 26, 2024
fbeea7d
test only al 2023
gunnalahema Dec 26, 2024
dc6a954
testing with prod credentials
gunnalahema Dec 26, 2024
f2085d8
testing with all prod cred
gunnalahema Dec 27, 2024
180d126
update repo endpoint for infra agent
gunnalahema Dec 27, 2024
dce096b
testing all OS
gunnalahema Jan 1, 2025
9ee1d0f
revert to old keys
gunnalahema Jan 1, 2025
a8ae81a
testing only amazonlinux_2023
gunnalahema Jan 2, 2025
b9fc70a
testing sles 15.3 and al 2023
gunnalahema Jan 2, 2025
ff05794
update ami
gunnalahema Jan 2, 2025
37c456c
testing sles 15.4
gunnalahema Jan 2, 2025
5cd5b83
update ami
gunnalahema Jan 3, 2025
2a38eca
update amis
gunnalahema Jan 4, 2025
9eab36b
test amazonlinux
gunnalahema Jan 5, 2025
1e74184
testing centos
gunnalahema Jan 5, 2025
18e0718
update amis
gunnalahema Jan 5, 2025
d6a0f00
test centos 7 and update AMIs
gunnalahema Jan 5, 2025
1b2f24e
update ami
gunnalahema Jan 5, 2025
71cdf7c
update ami
gunnalahema Jan 5, 2025
c49ae16
test centos 7 and update AMIs
gunnalahema Jan 5, 2025
98e33a8
test centos
gunnalahema Jan 5, 2025
37bea5f
update amis
gunnalahema Jan 5, 2025
ca3c64e
update amis
gunnalahema Jan 5, 2025
3a2f807
test windows server
gunnalahema Jan 5, 2025
3506ded
test ubuntu 18
gunnalahema Jan 6, 2025
f09cb12
ubuntu 20
gunnalahema Jan 6, 2025
021f560
testing ubuntu 18
gunnalahema Jan 6, 2025
5008e3f
testing ubuntu 20
gunnalahema Jan 6, 2025
f989885
testing ubuntu
gunnalahema Jan 6, 2025
6a9c32d
test ubuntu and sles 12.5
gunnalahema Jan 6, 2025
e53a203
testing windows
gunnalahema Jan 6, 2025
5b5608c
testing centos
gunnalahema Jan 6, 2025
f07330e
testing sles
gunnalahema Jan 6, 2025
a021ba4
testing sles
gunnalahema Jan 6, 2025
bbef021
testing sles
gunnalahema Jan 6, 2025
fa31141
test
gunnalahema Jan 6, 2025
a6e7db8
test
gunnalahema Jan 6, 2025
758d199
test debian
gunnalahema Jan 7, 2025
ed44187
test centos 7
gunnalahema Jan 7, 2025
828f12c
testing all OS
gunnalahema Jan 7, 2025
dd91aee
update ami
gunnalahema Jan 7, 2025
60d5e5c
update ami for debain 11
gunnalahema Jan 8, 2025
19d53f8
update ami for debain 11
gunnalahema Jan 8, 2025
2278f70
revert back changes
gunnalahema Jan 8, 2025
40ade72
test only debian 11
gunnalahema Jan 9, 2025
cd65341
remove sign_suse_packages dep
gunnalahema Jan 9, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/run_e2e_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/run_task.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 }}
2 changes: 1 addition & 1 deletion ansible/build-fb-suse/aws_ec2.yml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -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-hema-testing"'
ansible_aws_ssm_bucket_sse_mode: '"AES256"'
ansible_aws_ssm_region: '"us-east-2"'
2 changes: 1 addition & 1 deletion ansible/provision-and-execute-tests/aws_ec2.yml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -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-hema-testing"'
ansible_aws_ssm_bucket_sse_mode: '"AES256"'
ansible_aws_ssm_region: '"us-east-2"'
4 changes: 2 additions & 2 deletions terraform/ec2-instances-creator/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion terraform/ec2-suse-builders/terraform.backend.tf.dist
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
terraform {
backend "s3" {
encrypt = true
bucket = "logging-e2e-testing-tf"
bucket = "logging-e2e-testing-tf-hema-testing"
key = "suse-builders-PRE_RELEASE_NAME"
region = "us-east-2"
}
Expand Down
2 changes: 1 addition & 1 deletion terraform/ec2-test-executors/terraform.backend.tf.dist
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
terraform {
backend "s3" {
encrypt = true
bucket = "logging-e2e-testing-tf"
bucket = "logging-e2e-testing-tf-hema-testing"
key = "test-executors-PRE_RELEASE_NAME"
region = "us-east-2"
}
Expand Down
4 changes: 2 additions & 2 deletions versions/amazonlinux_2023.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion versions/centos_7.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ osDistro: centos
osVersion: 7
packages:
- arch: x86_64
ami: ami-05a36e1502605b4aa
ami: ami-006bb80361db75ce3
- arch: aarch64
ami: ami-01f5164ccc6a81e61
2 changes: 1 addition & 1 deletion versions/centos_8.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ osDistro: centos
osVersion: 8
packages:
- arch: x86_64
ami: ami-0af29b92a1457bf87
ami: ami-00399f19e7ac4f3f6
- arch: aarch64
ami: ami-0dce27ea07b1afb8f
4 changes: 2 additions & 2 deletions versions/centos_9.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion versions/common.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions versions/debian_10_buster.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions versions/debian_11_bullseye.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions versions/debian_12_bookworm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion versions/strategyMatrix.py
Original file line number Diff line number Diff line change
Expand Up @@ -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("debian_11_"))
and filename != "common.yml"
]
except Exception as e:
Expand Down
4 changes: 2 additions & 2 deletions versions/ubuntu_18_bionic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions versions/ubuntu_20_focal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions versions/ubuntu_22_jammy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions versions/windows-server-2022.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading