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

ci: changes for migration of aws account #172

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 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 @@ -38,15 +38,15 @@ jobs:
with:
aws_region: us-east-2
container_make_target: ${{ inputs.container_make_target }}
ecs_cluster_name: infra-agent-fb-e2e-testing
ecs_cluster_name: fb-e2e-testing
task_definition_name: infra-agent-fb-e2e-testing
cloud_watch_logs_group_name: infra-agent-fb-e2e-testing
# The log stream name must follow the {cloudwatch_log_prefix}/{container_name}
# 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-0c1657dd2e70a1365
aws_vpc_security_groups: |
sg-0de7ca06bb5972dcb
sg-0bafcb55ee2776412
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-1"'
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-1"'
ansible_aws_ssm_bucket_sse_mode: '"AES256"'
ansible_aws_ssm_region: '"us-east-2"'
2 changes: 1 addition & 1 deletion ansible/upload-win-packages/playbook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
hosts: localhost
vars:
pr_tag: "{{ lookup('ansible.builtin.env', 'PR_TAG') }}"
windows_bucket: logging-fb-windows-packages
windows_bucket: logging-fb-windows-packages-1
windows_matrix: "{{ lookup('file','../../versions/windowsMatrix.json') | from_json }}"
roles:
- andrewrothstein.gh
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-1"
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-1"
key = "test-executors-PRE_RELEASE_NAME"
region = "us-east-2"
}
Expand Down
2 changes: 1 addition & 1 deletion versions/strategyMatrix.py
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ def windows_package_details(data):
return {
"packageUrl": f"http://packages.fluentbit.io/windows/fluent-bit-{data['fbVersion']}-{data['arch']}.zip",
"targetPackageName": target_package_name,
"nrPackageUrl": f"https://logging-fb-windows-packages.s3.us-east-2.amazonaws.com/{target_package_name}",
"nrPackageUrl": f"https://logging-fb-windows-packages-1.s3.us-east-2.amazonaws.com/{target_package_name}",
"isStaging": True, # No staging for windows
}

Expand Down
Loading