fix: Migrate infra config after super agent config, tests for supported distros (#1079)

rubenruizdegauna · web-flow · commit 10f52392564c · 2024-05-31T19:23:23.000+05:30
* NR-270389 migrate infra config after super agent config * rhel and suse * fix supported distros tests * remove duplicated test
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/test/definitions-eu/super-agent/debians/debian10-super-agent-eu-fail.json b/test/definitions-eu/super-agent/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/test/definitions-eu/super-agent/debians/debian10arm64-super-agent-eu-fail.json b/test/definitions-eu/super-agent/debians/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/test/definitions-eu/super-agent/debians/ubuntu16-super-agent-eu.json b/test/definitions-eu/super-agent/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/test/definitions-eu/super-agent/debians/ubuntu18-super-agent-eu.json b/test/definitions-eu/super-agent/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/test/definitions-eu/super-agent/rhel/awslinux23-super-agent-eu.json b/test/definitions-eu/super-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/test/definitions-eu/super-agent/rhel/awslinuxarm64-super-agent-eu.json b/test/definitions-eu/super-agent/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/test/definitions-eu/super-agent/rhel/centos7-super-agent-eu.json b/test/definitions-eu/super-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/test/definitions-eu/super-agent/rhel/redhat7-super-agent-eu.json b/test/definitions-eu/super-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/test/definitions-eu/super-agent/suse/suse125-super-agent-eu.json b/test/definitions-eu/super-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/test/definitions/super-agent/debians/ubuntu16-super-agent.json b/test/definitions/super-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/test/definitions/super-agent/debians/ubuntu18-super-agent.json b/test/definitions/super-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/test/definitions/super-agent/rhel/awslinux23-super-agent.json b/test/definitions/super-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/test/definitions/super-agent/rhel/awslinuxarm64-super-agent.json b/test/definitions/super-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/test/definitions/super-agent/rhel/centos7-super-agent.json b/test/definitions/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/test/definitions/super-agent/rhel/redhat7-super-agent.json b/test/definitions/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/test/definitions/super-agent/suse/suse125-super-agent.json b/test/definitions/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"
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`	`"deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",`
`26`	`26`	`"params": {`
`27`	`27`	`"recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/debian.yml",`
`28`		`- "validate_output": "New Relic Super Agent\\s+\\(installed\\)",`
	`28`	`+ "validate_output": "super-agent\\s+\\(unsupported\\)",`
`29`	`29`	`"recipe_targeted": "super-agent"`
`30`	`30`	`}`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`"deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",`
`28`	`28`	`"params": {`
`29`	`29`	`"recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/debian.yml",`
`30`		`- "validate_output": "New Relic Super Agent\\s+\\(incomplete\\)",`
	`30`	`+ "validate_output": "New Relic Super Agent\\s+\\(installed\\)",`
`31`	`31`	`"recipe_targeted": "super-agent"`
`32`	`32`	`}`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`"deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",`
`27`	`27`	`"params": {`
`28`	`28`	`"recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/super-agent/rhel.yml",`
`29`		`- "validate_output": "New Relic Super Agent\\s+\\(incomplete\\)",`
	`29`	`+ "validate_output": "New Relic Super Agent\\s+\\(installed\\)",`
`30`	`30`	`"recipe_targeted": "super-agent"`
`31`	`31`	`}`
`32`	`32`	`}`