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.

Sign up for GitHub

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

chore(e2e): Extend yum lock timeout for failing deploy scripts #943

Merged
merged 3 commits into from
Jul 13, 2023
Merged

chore(e2e): Extend yum lock timeout for failing deploy scripts #943

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d5ebc5d
chore(e2e): Extend yum lock t/o for failing deploy scripts
rthorn-nr Jul 13, 2023
9a69147
trigger validation
rthorn-nr Jul 13, 2023
8b36f4a
restore rpm install
rthorn-nr Jul 13, 2023
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
10 changes: 5 additions & 5 deletions test/definitions/apm/dotNet/linux/linux2-aspnetcore5.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
},
"resources": [
{
"id": "linux2host1",
"id": "host1",
"provider": "aws",
"type": "ec2",
"size": "t3.micro",
Expand All @@ -19,7 +19,7 @@
{
"id": "aspnetcore",
"destinations": [
"linux2host1"
"host1"
],
"source_repository": "https://github.com/newrelic/open-install-library.git",
"deploy_script_path": "test/deploy/linux/dotNet/install/rhel/roles",
Expand All @@ -28,7 +28,7 @@
{
"id": "apache1",
"destinations": [
"linux2host1"
"host1"
],
"source_repository": "https://github.com/newrelic/open-install-library.git",
"deploy_script_path": "test/deploy/linux/apache/install/rhel/roles",
Expand All @@ -37,7 +37,7 @@
{
"id": "dotnet1",
"destinations": [
"linux2host1"
"host1"
],
"source_repository": "https://github.com/newrelic/open-install-library.git",
"deploy_script_path": "test/deploy/linux/apache/deploy-application/dotNet/rhel/roles",
Expand All @@ -49,7 +49,7 @@
{
"id": "dotnet2",
"destinations": [
"linux2host1"
"host1"
],
"source_repository": "https://github.com/newrelic/open-install-library.git",
"deploy_script_path": "test/deploy/linux/apache/deploy-application/dotNet/rhel/roles",
Expand Down
12 changes: 6 additions & 6 deletions test/definitions/smoke/linux2-aspnetcore5.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
},
"resources": [
{
"id": "linux2host1",
"id": "smokehost1",
"provider": "aws",
"type": "ec2",
"size": "t3.micro",
Expand All @@ -19,7 +19,7 @@
{
"id": "aspnetcore",
"destinations": [
"linux2host1"
"smokehost1"
],
"source_repository": "https://github.com/newrelic/open-install-library.git",
"deploy_script_path": "test/deploy/linux/dotNet/install/rhel/roles",
Expand All @@ -28,7 +28,7 @@
{
"id": "apache1",
"destinations": [
"linux2host1"
"smokehost1"
],
"source_repository": "https://github.com/newrelic/open-install-library.git",
"deploy_script_path": "test/deploy/linux/apache/install/rhel/roles",
Expand All @@ -37,7 +37,7 @@
{
"id": "dotnet1",
"destinations": [
"linux2host1"
"smokehost1"
],
"source_repository": "https://github.com/newrelic/open-install-library.git",
"deploy_script_path": "test/deploy/linux/apache/deploy-application/dotNet/rhel/roles",
Expand All @@ -51,7 +51,7 @@
{
"id": "dotnet2",
"destinations": [
"linux2host1"
"smokehost1"
],
"source_repository": "https://github.com/newrelic/open-install-library.git",
"deploy_script_path": "test/deploy/linux/apache/deploy-application/dotNet/rhel/roles",
Expand All @@ -66,7 +66,7 @@
{
"id": "cli1",
"resource_ids": [
"linux2host1"
"smokehost1"
],
"provider": "newrelic",
"source_repository": "https://github.com/newrelic/open-install-library.git",
Expand Down
2 changes: 1 addition & 1 deletion test/definitions/smoke/mysql-rhel.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,4 @@
}
]
}
}
}
16 changes: 12 additions & 4 deletions test/deploy/linux/apache/deploy-application/dotNet/rhel/roles/configure/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,17 @@
---

- name: Update packages
shell: yum update -y
ansible.builtin.yum:
name: '*'
state: latest
lock_timeout: 180
become: true

- name: Install depends
shell: yum install libicu unzip -y
become: true
- name: Install dependencies
ansible.builtin.yum:
name:
- libicu
- unzip
state: latest
lock_timeout: 180
become: true
2 changes: 2 additions & 0 deletions test/deploy/linux/dotNet/install/rhel/roles/prepare/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
ansible.builtin.yum:
name: https://packages.microsoft.com/config/centos/7/packages-microsoft-prod.rpm
state: present
lock_timeout: 180
become: true

- name: Install .NET SDK 7.0 and ASP.NET Core 7.0 runtime
Expand All @@ -16,4 +17,5 @@
- dotnet-sdk-7.0
- aspnetcore-runtime-7.0
state: latest
lock_timeout: 180
become: true
9 changes: 6 additions & 3 deletions test/deploy/linux/mysql/install/rhel/roles/configure/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
become: true

- name: Add MySQL Repository
yum:
ansible.builtin.yum:
name: "{{ mysql_rpm_file }}"
state: present
lock_timeout: 180
Expand All @@ -41,8 +41,11 @@
shell: "rpm --import https://repo.mysql.com/RPM-GPG-KEY-mysql-2022"
become: true

- name: Install the MySQL
shell: "yum install mysql-community-server -y"
- name: Install MySQL
ansible.builtin.yum:
name: mysql-community-server
state: present
lock_timeout: 180
become: true

- name: Install systemctl
Expand Down