fix: Migrate infra config after super agent config, tests for support…

…ed distros (#1079) * NR-270389 migrate infra config after super agent config * rhel and suse * fix supported distros tests * remove duplicated test
newrelic · May 31, 2024 · 10f5239 · 10f5239
1 parent 5f61da1
commit 10f5239
Show file tree

Hide file tree

Showing 21 changed files with 26 additions and 21 deletions.
diff --git a/recipes/newrelic/infrastructure/super-agent/debian.yml b/recipes/newrelic/infrastructure/super-agent/debian.yml
@@ -10,6 +10,7 @@ installTargets:
   - type: host
     os: linux
     platformFamily: "debian"
+    platformVersion: "((11|12)\\.?.*)" # Bullseye, Bookworm #
   - type: host
     os: linux
     platform: "ubuntu"
@@ -75,13 +76,13 @@ install:
         - task: add_nr_source
         - task: update_apt_nr_source
         - task: install_super_agent
-        - task: migrate_newrelic_infra_config
         - task: update_otel_license_key
         - task: config_supervisors
         - task: config_opamp
         - task: config_host_monitoring
         - task: update_otel_mem_limit
         - task: update_otel_end_point
+        - task: migrate_newrelic_infra_config
         - task: restart_super_agent
         - task: assert_super_agent_started
         - task: post_install

diff --git a/recipes/newrelic/infrastructure/super-agent/rhel.yml b/recipes/newrelic/infrastructure/super-agent/rhel.yml
@@ -24,9 +24,13 @@ installTargets:
   - type: host
     os: linux
     platform: "centos"
+    platformFamily: rhel
+    platformVersion: "((7|8|9)\\.?.*)"
   - type: host
     os: linux
     platform: "redhat"
+    platformFamily: rhel
+    platformVersion: "((7|8|9)\\.?.*)"
 
 keywords:
   - SuperAgent
@@ -94,13 +98,13 @@ install:
         - task: setup_infra_license
         - task: setup_infra_proxy
         - task: install_super_agent
-        - task: migrate_newrelic_infra_config
         - task: update_otel_license_key
         - task: config_supervisors
         - task: config_opamp
         - task: config_host_monitoring
         - task: update_otel_mem_limit
         - task: update_otel_end_point
+        - task: migrate_newrelic_infra_config
         - task: restart_super_agent
         - task: assert_super_agent_started
         - task: post_install

diff --git a/recipes/newrelic/infrastructure/super-agent/suse.yml b/recipes/newrelic/infrastructure/super-agent/suse.yml
@@ -65,13 +65,13 @@ install:
         - task: setup_infra_license
         - task: setup_infra_proxy
         - task: install_super_agent
-        - task: migrate_newrelic_infra_config
         - task: update_otel_license_key
         - task: config_supervisors
         - task: config_opamp
         - task: config_host_monitoring
         - task: update_otel_mem_limit
         - task: update_otel_end_point
+        - task: migrate_newrelic_infra_config
         - task: restart_super_agent
         - task: assert_super_agent_started
         - task: post_install

diff --git a/...gent/debians/debian10-super-agent-eu.json → ...debians/debian10-super-agent-eu-fail.json b/...gent/debians/debian10-super-agent-eu.json → ...debians/debian10-super-agent-eu-fail.json
@@ -25,7 +25,7 @@
               "deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",
               "params": {
                   "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/debian.yml",
-                  "validate_output": "New Relic Super Agent\\s+\\(installed\\)",
+                  "validate_output": "super-agent\\s+\\(unsupported\\)",
                   "recipe_targeted": "super-agent"
               }
           }

diff --git a/...debians/debian10arm64-super-agent-eu.json → ...ns/debian10arm64-super-agent-eu-fail.json b/...debians/debian10arm64-super-agent-eu.json → ...ns/debian10arm64-super-agent-eu-fail.json
@@ -25,7 +25,7 @@
               "deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",
               "params": {
                   "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/debian.yml",
-                  "validate_output": "New Relic Super Agent\\s+\\(installed\\)",
+                  "validate_output": "super-agent\\s+\\(unsupported\\)",
                   "recipe_targeted": "super-agent"
               }
           }

diff --git a/...debians/ubuntu16-super-agent-eu-fail.json → ...gent/debians/ubuntu16-super-agent-eu.json b/...debians/ubuntu16-super-agent-eu-fail.json → ...gent/debians/ubuntu16-super-agent-eu.json
@@ -27,7 +27,7 @@
                 "deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",
                 "params": {
                     "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/debian.yml",
-                    "validate_output": "New Relic Super Agent\\s+\\(incomplete\\)",
+                  "validate_output": "New Relic Super Agent\\s+\\(installed\\)",
                     "recipe_targeted": "super-agent"
                 }
             }

diff --git a/...nt/debians/ubuntu18-super-agent-fail.json → ...gent/debians/ubuntu18-super-agent-eu.json b/...nt/debians/ubuntu18-super-agent-fail.json → ...gent/debians/ubuntu18-super-agent-eu.json
@@ -27,7 +27,7 @@
                 "deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",
                 "params": {
                     "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/debian.yml",
-                    "validate_output": "New Relic Super Agent\\s+\\(incomplete\\)",
+                  "validate_output": "New Relic Super Agent\\s+\\(installed\\)",
                     "recipe_targeted": "super-agent"
                 }
             }

diff --git a/...ent/rhel/awslinux23-super-agent-fail.json → ...agent/rhel/awslinux23-super-agent-eu.json b/...ent/rhel/awslinux23-super-agent-fail.json → ...agent/rhel/awslinux23-super-agent-eu.json
@@ -27,7 +27,7 @@
                 "deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",
                 "params": {
                     "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/rhel.yml",
-                    "validate_output": "New Relic Super Agent\\s+\\(incomplete\\)",
+                  "validate_output": "New Relic Super Agent\\s+\\(installed\\)",
                     "recipe_targeted": "super-agent"
                 }
             }

diff --git a/...el/awslinuxarm64-super-agent-eu-fail.json → ...nt/rhel/awslinuxarm64-super-agent-eu.json b/...el/awslinuxarm64-super-agent-eu-fail.json → ...nt/rhel/awslinuxarm64-super-agent-eu.json
@@ -26,7 +26,7 @@
                 "deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",
                 "params": {
                     "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/rhel.yml",
-                    "validate_output": "New Relic Super Agent\\s+\\(incomplete\\)",
+                  "validate_output": "New Relic Super Agent\\s+\\(installed\\)",
                     "recipe_targeted": "super-agent"
                 }
             }

diff --git a/...ent/rhel/centos7-super-agent-eu-fail.json → ...er-agent/rhel/centos7-super-agent-eu.json b/...ent/rhel/centos7-super-agent-eu-fail.json → ...er-agent/rhel/centos7-super-agent-eu.json
@@ -27,7 +27,7 @@
                 "deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",
                 "params": {
                     "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/rhel.yml",
-                    "validate_output": "New Relic Super Agent\\s+\\(incomplete\\)",
+                  "validate_output": "New Relic Super Agent\\s+\\(installed\\)",
                     "recipe_targeted": "super-agent"
                 }
             }

diff --git a/...-agent/rhel/redhat7-super-agent-fail.json → ...er-agent/rhel/redhat7-super-agent-eu.json b/...-agent/rhel/redhat7-super-agent-fail.json → ...er-agent/rhel/redhat7-super-agent-eu.json
@@ -26,7 +26,7 @@
                 "deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",
                 "params": {
                     "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/rhel.yml",
-                    "validate_output": "New Relic Super Agent\\s+\\(incomplete\\)",
+                  "validate_output": "New Relic Super Agent\\s+\\(installed\\)",
                     "recipe_targeted": "super-agent"
                 }
             }

diff --git a/...-agent/suse/suse125-super-agent-fail.json → ...er-agent/suse/suse125-super-agent-eu.json b/...-agent/suse/suse125-super-agent-fail.json → ...er-agent/suse/suse125-super-agent-eu.json
@@ -26,7 +26,7 @@
                 "deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",
                 "params": {
                     "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/suse.yml",
-                    "validate_output": "New Relic Super Agent\\s+\\(incomplete\\)",
+                    "validate_output": "New Relic Super Agent\\s+\\(installed\\)",
                     "recipe_targeted": "super-agent"
                 }
             }

diff --git a/test/definitions/super-agent/debians/debian10-super-agent.json b/test/definitions/super-agent/debians/debian10-super-agent.json
@@ -25,7 +25,7 @@
               "deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",
               "params": {
                   "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/debian.yml",
-                  "validate_output": "New Relic Super Agent\\s+\\(installed\\)",
+                  "validate_output": "super-agent\\s+\\(unsupported\\)",
                   "recipe_targeted": "super-agent"
               }
           }

diff --git a/test/definitions/super-agent/debians/debian10arm64-super-agent.json b/test/definitions/super-agent/debians/debian10arm64-super-agent.json
@@ -25,7 +25,7 @@
               "deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",
               "params": {
                   "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/debian.yml",
-                  "validate_output": "New Relic Super Agent\\s+\\(installed\\)",
+                  "validate_output": "super-agent\\s+\\(unsupported\\)",
                   "recipe_targeted": "super-agent"
               }
           }

diff --git a/...nt/debians/ubuntu16-super-agent-fail.json → ...r-agent/debians/ubuntu16-super-agent.json b/...nt/debians/ubuntu16-super-agent-fail.json → ...r-agent/debians/ubuntu16-super-agent.json
@@ -27,7 +27,7 @@
                 "deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",
                 "params": {
                     "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/debian.yml",
-                    "validate_output": "New Relic Super Agent\\s+\\(incomplete\\)",
+                  "validate_output": "New Relic Super Agent\\s+\\(installed\\)",
                     "recipe_targeted": "super-agent"
                 }
             }

diff --git a/...debians/ubuntu18-super-agent-eu-fail.json → ...r-agent/debians/ubuntu18-super-agent.json b/...debians/ubuntu18-super-agent-eu-fail.json → ...r-agent/debians/ubuntu18-super-agent.json
@@ -27,7 +27,7 @@
                 "deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",
                 "params": {
                     "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/debian.yml",
-                    "validate_output": "New Relic Super Agent\\s+\\(incomplete\\)",
+                  "validate_output": "New Relic Super Agent\\s+\\(installed\\)",
                     "recipe_targeted": "super-agent"
                 }
             }

diff --git a/.../rhel/awslinux23-super-agent-eu-fail.json → ...er-agent/rhel/awslinux23-super-agent.json b/.../rhel/awslinux23-super-agent-eu-fail.json → ...er-agent/rhel/awslinux23-super-agent.json
@@ -27,7 +27,7 @@
                 "deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",
                 "params": {
                     "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/rhel.yml",
-                    "validate_output": "New Relic Super Agent\\s+\\(incomplete\\)",
+                    "validate_output": "New Relic Super Agent\\s+\\(installed\\)",
                     "recipe_targeted": "super-agent"
                 }
             }

diff --git a/.../rhel/awslinuxarm64-super-agent-fail.json → ...agent/rhel/awslinuxarm64-super-agent.json b/.../rhel/awslinuxarm64-super-agent-fail.json → ...agent/rhel/awslinuxarm64-super-agent.json
@@ -26,7 +26,7 @@
                 "deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",
                 "params": {
                     "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/rhel.yml",
-                    "validate_output": "New Relic Super Agent\\s+\\(incomplete\\)",
+                    "validate_output": "New Relic Super Agent\\s+\\(installed\\)",
                     "recipe_targeted": "super-agent"
                 }
             }

diff --git a/...-agent/rhel/centos7-super-agent-fail.json → ...super-agent/rhel/centos7-super-agent.json b/...-agent/rhel/centos7-super-agent-fail.json → ...super-agent/rhel/centos7-super-agent.json
@@ -27,7 +27,7 @@
                 "deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",
                 "params": {
                     "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/rhel.yml",
-                    "validate_output": "New Relic Super Agent\\s+\\(incomplete\\)",
+                  "validate_output": "New Relic Super Agent\\s+\\(installed\\)",
                     "recipe_targeted": "super-agent"
                 }
             }

diff --git a/...ent/rhel/redhat7-super-agent-eu-fail.json → ...super-agent/rhel/redhat7-super-agent.json b/...ent/rhel/redhat7-super-agent-eu-fail.json → ...super-agent/rhel/redhat7-super-agent.json
@@ -26,7 +26,7 @@
                 "deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",
                 "params": {
                     "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/rhel.yml",
-                    "validate_output": "New Relic Super Agent\\s+\\(incomplete\\)",
+                  "validate_output": "New Relic Super Agent\\s+\\(installed\\)",
                     "recipe_targeted": "super-agent"
                 }
             }

diff --git a/...ent/suse/suse125-super-agent-eu-fail.json → ...super-agent/suse/suse125-super-agent.json b/...ent/suse/suse125-super-agent-eu-fail.json → ...super-agent/suse/suse125-super-agent.json
@@ -26,7 +26,7 @@
                 "deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",
                 "params": {
                     "recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/suse.yml",
-                    "validate_output": "New Relic Super Agent\\s+\\(incomplete\\)",
+                    "validate_output": "New Relic Super Agent\\s+\\(installed\\)",
                     "recipe_targeted": "super-agent"
                 }
             }