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

* chore(e2e): Extend yum lock t/o for failing deploy scripts * trigger validation * restore rpm install
newrelic · Jul 13, 2023 · 882ddc4 · 882ddc4
1 parent 0dbe2ba
commit 882ddc4
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 19 deletions.
diff --git a/test/definitions/apm/dotNet/linux/linux2-aspnetcore5.json b/test/definitions/apm/dotNet/linux/linux2-aspnetcore5.json
@@ -7,7 +7,7 @@
   },
   "resources": [
     {
-      "id": "linux2host1",
+      "id": "host1",
       "provider": "aws",
       "type": "ec2",
       "size": "t3.micro",
@@ -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",
@@ -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",
@@ -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",
@@ -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",

diff --git a/test/definitions/smoke/linux2-aspnetcore5.json b/test/definitions/smoke/linux2-aspnetcore5.json
@@ -7,7 +7,7 @@
   },
   "resources": [
     {
-      "id": "linux2host1",
+      "id": "smokehost1",
       "provider": "aws",
       "type": "ec2",
       "size": "t3.micro",
@@ -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",
@@ -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",
@@ -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",
@@ -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",
@@ -66,7 +66,7 @@
       {
         "id": "cli1",
         "resource_ids": [
-          "linux2host1"
+          "smokehost1"
         ],
         "provider": "newrelic",
         "source_repository": "https://github.com/newrelic/open-install-library.git",

diff --git a/test/definitions/smoke/mysql-rhel.json b/test/definitions/smoke/mysql-rhel.json
@@ -46,4 +46,4 @@
       }
     ]
   }
-}
+}
diff --git a/test/deploy/linux/apache/deploy-application/dotNet/rhel/roles/configure/tasks/main.yml b/test/deploy/linux/apache/deploy-application/dotNet/rhel/roles/configure/tasks/main.yml
@@ -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
diff --git a/test/deploy/linux/dotNet/install/rhel/roles/prepare/tasks/main.yml b/test/deploy/linux/dotNet/install/rhel/roles/prepare/tasks/main.yml
@@ -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
@@ -16,4 +17,5 @@
       - dotnet-sdk-7.0
       - aspnetcore-runtime-7.0
     state: latest
+    lock_timeout: 180
   become: true
diff --git a/test/deploy/linux/mysql/install/rhel/roles/configure/tasks/main.yml b/test/deploy/linux/mysql/install/rhel/roles/configure/tasks/main.yml
@@ -31,7 +31,7 @@
   become: true
 
 - name: Add MySQL Repository
-  yum: 
+  ansible.builtin.yum: 
     name: "{{ mysql_rpm_file }}"
     state: present
     lock_timeout: 180
@@ -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
-Original file line number
+Diff line change
@@ Expand Up / @@ -46,4 +46,4 @@ @@
           }
         ]
       }
-    }
+    }