From 19b7217bdb98b440a5f14dcf6b03be85f5e33046 Mon Sep 17 00:00:00 2001 From: Aashirwadjain Date: Mon, 10 Mar 2025 20:07:56 +0530 Subject: [PATCH 1/6] fix(centos-ami): update ami_image for centos --- test/definitions/otel/rhel/centos7-otel.json | 2 +- test/definitions/otel/rhel/centos8-otel.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/definitions/otel/rhel/centos7-otel.json b/test/definitions/otel/rhel/centos7-otel.json index 1ded5aabf..c1581607a 100644 --- a/test/definitions/otel/rhel/centos7-otel.json +++ b/test/definitions/otel/rhel/centos7-otel.json @@ -11,7 +11,7 @@ "provider": "aws", "type": "ec2", "size": "t3.nano", - "ami_name": "CentOS-7-????-????????_?.x86_64-*", + "ami_name": "brightheadnode-8.2-centos7u5-hvm-17", "user_name": "centos" }], diff --git a/test/definitions/otel/rhel/centos8-otel.json b/test/definitions/otel/rhel/centos8-otel.json index e353e46b1..886c2b332 100644 --- a/test/definitions/otel/rhel/centos8-otel.json +++ b/test/definitions/otel/rhel/centos8-otel.json @@ -11,7 +11,7 @@ "provider": "aws", "type": "ec2", "size": "t3.nano", - "ami_name": "CentOS Stream 8 x86_64 ????????", + "ami_name": "brightheadnode-9.1-centos8u3-hvm-6", "user_name": "centos" }], From 43172fd0f1614567f33fec72c72d0ee2c1d6468f Mon Sep 17 00:00:00 2001 From: Aashirwadjain Date: Tue, 11 Mar 2025 17:55:27 +0530 Subject: [PATCH 2/6] fix(centos8-otel-flow): Add ansible role and update deploy config for centOS8 --- test/definitions/otel/rhel/centos8-otel.json | 16 ++++++++++++++-- .../install/centos/roles/prepare/tasks/main.yml | 14 ++++++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 test/deploy/linux/otel/install/centos/roles/prepare/tasks/main.yml diff --git a/test/definitions/otel/rhel/centos8-otel.json b/test/definitions/otel/rhel/centos8-otel.json index 886c2b332..45e5fb79f 100644 --- a/test/definitions/otel/rhel/centos8-otel.json +++ b/test/definitions/otel/rhel/centos8-otel.json @@ -10,11 +10,23 @@ "id": "host1", "provider": "aws", "type": "ec2", - "size": "t3.nano", + "size": "t2.medium", "ami_name": "brightheadnode-9.1-centos8u3-hvm-6", - "user_name": "centos" + "user_name": "root" }], + "services": [ + { + "id": "centos", + "destinations": [ + "host1" + ], + "source_repository": "-b fix/non-regression-tests-us https://github.com/newrelic/open-install-library.git", + "deploy_script_path": "test/deploy/linux/otel/install/centos/roles", + "port": 9999 + } + ], + "instrumentations": { "resources": [ { diff --git a/test/deploy/linux/otel/install/centos/roles/prepare/tasks/main.yml b/test/deploy/linux/otel/install/centos/roles/prepare/tasks/main.yml new file mode 100644 index 000000000..8e6946b44 --- /dev/null +++ b/test/deploy/linux/otel/install/centos/roles/prepare/tasks/main.yml @@ -0,0 +1,14 @@ +--- +- debug: + msg: Update CentOS + +- name: Change directory to /etc/yum.repos.d/ + shell: cd /etc/yum.repos.d/ + +- name: Disable mirrorlist in CentOS repo files + shell: sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-* + +- name: Update baseurl to vault.centos.org in CentOS repo files + shell: sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-* + + From 0d845affc8bf7f4517b0a5ccada2b94e3f0c3a0a Mon Sep 17 00:00:00 2001 From: Aashirwadjain Date: Wed, 12 Mar 2025 16:34:31 +0530 Subject: [PATCH 3/6] fix(centos8-otel-ami): update ami image for centOS8 US region --- test/definitions/otel/rhel/centos8-otel.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/definitions/otel/rhel/centos8-otel.json b/test/definitions/otel/rhel/centos8-otel.json index 45e5fb79f..ef79b9afa 100644 --- a/test/definitions/otel/rhel/centos8-otel.json +++ b/test/definitions/otel/rhel/centos8-otel.json @@ -11,7 +11,7 @@ "provider": "aws", "type": "ec2", "size": "t2.medium", - "ami_name": "brightheadnode-9.1-centos8u3-hvm-6", + "ami_name": "brightheadnode-9.1-centos8u2-hvm-4", "user_name": "root" }], From 374e674f046b82a27d2ade3b966173c79b36ad3d Mon Sep 17 00:00:00 2001 From: Aashirwadjain Date: Wed, 12 Mar 2025 21:57:13 +0530 Subject: [PATCH 4/6] fix(centos7-otel-ami): update ami image for centOS7 US region --- test/definitions/otel/rhel/centos7-otel.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/definitions/otel/rhel/centos7-otel.json b/test/definitions/otel/rhel/centos7-otel.json index c1581607a..f79c1f06f 100644 --- a/test/definitions/otel/rhel/centos7-otel.json +++ b/test/definitions/otel/rhel/centos7-otel.json @@ -11,7 +11,7 @@ "provider": "aws", "type": "ec2", "size": "t3.nano", - "ami_name": "brightheadnode-8.2-centos7u5-hvm-17", + "ami_name": "brightheadnode-9.1-centos7u8-hvm-3", "user_name": "centos" }], From 56c4e4aa55d0ff173651d585a2f593556dae167c Mon Sep 17 00:00:00 2001 From: Aashirwadjain Date: Wed, 12 Mar 2025 22:17:52 +0530 Subject: [PATCH 5/6] fix(centos7-otel-config): update config for centOS7 US region --- test/definitions/otel/rhel/centos7-otel.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/definitions/otel/rhel/centos7-otel.json b/test/definitions/otel/rhel/centos7-otel.json index f79c1f06f..a66a7e915 100644 --- a/test/definitions/otel/rhel/centos7-otel.json +++ b/test/definitions/otel/rhel/centos7-otel.json @@ -10,9 +10,9 @@ "id": "host1", "provider": "aws", "type": "ec2", - "size": "t3.nano", + "size": "t3.medium", "ami_name": "brightheadnode-9.1-centos7u8-hvm-3", - "user_name": "centos" + "user_name": "root" }], "instrumentations": { From c31f1a41a2e691d756c5cb80136c19e56e9a95a2 Mon Sep 17 00:00:00 2001 From: Aashirwadjain Date: Thu, 13 Mar 2025 02:01:58 +0530 Subject: [PATCH 6/6] fix(centos7-otel-config): add ansible role for centOS7 US region --- test/definitions/otel/rhel/centos7-otel.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/test/definitions/otel/rhel/centos7-otel.json b/test/definitions/otel/rhel/centos7-otel.json index a66a7e915..4aa2c0cca 100644 --- a/test/definitions/otel/rhel/centos7-otel.json +++ b/test/definitions/otel/rhel/centos7-otel.json @@ -15,6 +15,18 @@ "user_name": "root" }], + "services": [ + { + "id": "centos", + "destinations": [ + "host1" + ], + "source_repository": "-b fix/non-regression-tests-us https://github.com/newrelic/open-install-library.git", + "deploy_script_path": "test/deploy/linux/otel/install/centos/roles", + "port": 9999 + } + ], + "instrumentations": { "resources": [ {