Merge branch 'main' into change-ac-recipes-to-use-new-auth-cli

vjripoll · vjripoll · commit 74758fb25a5a · 2025-07-01T13:00:46.000+02:00
diff --git a/recipes/newrelic/infrastructure/agent-control/debian.yml b/recipes/newrelic/infrastructure/agent-control/debian.yml
@@ -510,6 +510,7 @@ install:
             chmod 700 /etc/newrelic-agent-control/keys
             sudo mv /usr/bin/newrelic-auth-cli/newrelic-auth-cli-* /usr/bin/newrelic-auth-cli2
             sudo chmod +x /usr/bin/newrelic-auth-cli2 
+            echo <<<HERE>>> 
             source ~/.bashrc
             ls /usr/local/bin
           
diff --git a/recipes/newrelic/infrastructure/agent-control/rhel.yml b/recipes/newrelic/infrastructure/agent-control/rhel.yml
@@ -451,6 +451,7 @@ install:
             chmod 700 /etc/newrelic-agent-control/keys
             sudo mv /usr/bin/newrelic-auth-cli/newrelic-auth-cli-* /usr/bin/newrelic-auth-cli2
             sudo chmod +x /usr/bin/newrelic-auth-cli2 
+            echo <<<HERE>>> 
             source ~/.bashrc
             ls /usr/local/bin
           
diff --git a/recipes/newrelic/infrastructure/agent-control/suse.yml b/recipes/newrelic/infrastructure/agent-control/suse.yml
@@ -401,6 +401,7 @@ install:
             chmod 700 /etc/newrelic-agent-control/keys
             sudo mv /usr/bin/newrelic-auth-cli/newrelic-auth-cli-* /usr/bin/newrelic-auth-cli2
             sudo chmod +x /usr/bin/newrelic-auth-cli2 
+            echo <<<HERE>>> 
             source ~/.bashrc
             ls /usr/local/bin
             
diff --git a/test/definitions-eu/agent-control/debians/ubuntu20-agent-control-eu.json b/test/definitions-eu/agent-control/debians/ubuntu20-agent-control-eu.json
@@ -12,7 +12,7 @@
       "provider": "aws",
       "type": "ec2",
       "size": "t3.nano",
-      "ami_name": "ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-2023*",
+      "ami_name": "ubuntu-pro-server/images/hvm-ssd/ubuntu-focal-20.04-amd64-pro-server-????????",
       "user_name": "ubuntu"
     }
   ],
diff --git a/test/definitions-eu/agent-control/logs/ubuntu20-agent-control-logs-eu.json b/test/definitions-eu/agent-control/logs/ubuntu20-agent-control-logs-eu.json
@@ -12,7 +12,7 @@
       "provider": "aws",
       "type": "ec2",
       "size": "t3.micro",
-      "ami_name": "ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-*",
+      "ami_name": "ubuntu-pro-server/images/hvm-ssd/ubuntu-focal-20.04-amd64-pro-server-????????",
       "user_name": "ubuntu"
     }
   ],
diff --git a/test/definitions-eu/apm/dotNet/linux/ubuntu20-apache-aspnetcore.json b/test/definitions-eu/apm/dotNet/linux/ubuntu20-apache-aspnetcore.json
@@ -11,7 +11,7 @@
         "provider": "aws",
         "type": "ec2",
         "size": "t3.micro",
-        "ami_name": "ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-????????",
+        "ami_name": "ubuntu-pro-server/images/hvm-ssd/ubuntu-focal-20.04-amd64-pro-server-????????",
         "user_name": "ubuntu"
     }],
 
diff --git a/test/definitions-eu/apm/java/ub20-apt-docker-jboss.json b/test/definitions-eu/apm/java/ub20-apt-docker-jboss.json
@@ -10,7 +10,7 @@
     "provider": "aws",
     "type": "ec2",
     "size": "t3.medium",
-    "ami_name": "ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-????????",
+    "ami_name": "ubuntu-pro-server/images/hvm-ssd/ubuntu-focal-20.04-amd64-pro-server-????????",
     "user_name": "ubuntu"
   }],
   "services": [
diff --git a/test/definitions-eu/apm/java/ub20-apt-docker-tomcat.json b/test/definitions-eu/apm/java/ub20-apt-docker-tomcat.json
@@ -10,7 +10,7 @@
     "provider": "aws",
     "type": "ec2",
     "size": "t3.micro",
-    "ami_name": "ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-????????",
+    "ami_name": "ubuntu-pro-server/images/hvm-ssd/ubuntu-focal-20.04-amd64-pro-server-????????",
     "user_name": "ubuntu"
   }],
   "services": [
diff --git a/test/definitions-eu/apm/java/ub20-apt-sysd-tomcat.json b/test/definitions-eu/apm/java/ub20-apt-sysd-tomcat.json
@@ -11,7 +11,7 @@
         "provider": "aws",
         "type": "ec2",
         "size": "t3.micro",
-        "ami_name": "ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-????????",
+        "ami_name": "ubuntu-pro-server/images/hvm-ssd/ubuntu-focal-20.04-amd64-pro-server-????????",
         "user_name": "ubuntu"
       }
     ],
diff --git a/test/definitions-eu/infra-agent/debians/ubuntu20-infra.json b/test/definitions-eu/infra-agent/debians/ubuntu20-infra.json
@@ -11,7 +11,7 @@
         "provider": "aws",
         "type": "ec2",
         "size": "t3.nano",
-        "ami_name": "ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-2023*",
+        "ami_name": "ubuntu-pro-server/images/hvm-ssd/ubuntu-focal-20.04-amd64-pro-server-????????",
         "user_name": "ubuntu"
     }],
 
diff --git a/test/definitions-eu/smoke/ubuntu20-infra.json b/test/definitions-eu/smoke/ubuntu20-infra.json
@@ -11,7 +11,7 @@
         "provider": "aws",
         "type": "ec2",
         "size": "t3.nano",
-        "ami_name": "ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-2023*",
+        "ami_name": "ubuntu-pro-server/images/hvm-ssd/ubuntu-focal-20.04-amd64-pro-server-????????",
         "user_name": "ubuntu"
     }],
 
diff --git a/test/definitions/agent-control/debians/ubuntu20-agent-control.json b/test/definitions/agent-control/debians/ubuntu20-agent-control.json
@@ -12,7 +12,7 @@
       "provider": "aws",
       "type": "ec2",
       "size": "t3.nano",
-      "ami_name": "ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-2023*",
+      "ami_name": "ubuntu-pro-server/images/hvm-ssd/ubuntu-focal-20.04-amd64-pro-server-????????",
       "user_name": "ubuntu"
     }
   ],
diff --git a/test/definitions/agent-control/logs/ubuntu20-agent-control-logs.json b/test/definitions/agent-control/logs/ubuntu20-agent-control-logs.json
@@ -12,7 +12,7 @@
       "provider": "aws",
       "type": "ec2",
       "size": "t3.micro",
-      "ami_name": "ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-*",
+      "ami_name": "ubuntu-pro-server/images/hvm-ssd/ubuntu-focal-20.04-amd64-pro-server-????????",
       "user_name": "ubuntu"
     }
   ],
diff --git a/test/definitions/logging/ubuntu20-logs.json b/test/definitions/logging/ubuntu20-logs.json
@@ -12,7 +12,7 @@
         "provider": "aws",
         "type": "ec2",
         "size": "t3.micro",
-        "ami_name": "ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-*",
+        "ami_name": "ubuntu-pro-server/images/hvm-ssd/ubuntu-focal-20.04-amd64-pro-server-????????",
         "user_name": "ubuntu"
       }
     ],
diff --git a/test/manual/definitions/apm/dotNet/linux/ubuntu20-apache-aspnetcore.json b/test/manual/definitions/apm/dotNet/linux/ubuntu20-apache-aspnetcore.json
@@ -11,7 +11,7 @@
         "provider": "aws",
         "type": "ec2",
         "size": "t3.micro",
-        "ami_name": "ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-????????",
+        "ami_name": "ubuntu-pro-server/images/hvm-ssd/ubuntu-focal-20.04-amd64-pro-server-????????",
         "user_name": "ubuntu"
     }],
 
diff --git a/test/manual/definitions/apm/dotNet/linux/ubuntu20-nginx-aspnetcore.json b/test/manual/definitions/apm/dotNet/linux/ubuntu20-nginx-aspnetcore.json
@@ -11,7 +11,7 @@
         "provider": "aws",
         "type": "ec2",
         "size": "t3.micro",
-        "ami_name": "ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-????????",
+        "ami_name": "ubuntu-pro-server/images/hvm-ssd/ubuntu-focal-20.04-amd64-pro-server-????????",
         "user_name": "ubuntu"
     }],
 
diff --git a/test/manual/definitions/apm/java/linux/jboss/docker/ub20-apt-docker.json b/test/manual/definitions/apm/java/linux/jboss/docker/ub20-apt-docker.json
@@ -10,7 +10,7 @@
     "provider": "aws",
     "type": "ec2",
     "size": "t3.medium",
-    "ami_name": "ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-????????",
+    "ami_name": "ubuntu-pro-server/images/hvm-ssd/ubuntu-focal-20.04-amd64-pro-server-????????",
     "user_name": "ubuntu"
   }],
   "services": [
diff --git a/test/manual/definitions/apm/java/linux/jboss/docker/ub20-docker-rest.json b/test/manual/definitions/apm/java/linux/jboss/docker/ub20-docker-rest.json
@@ -10,7 +10,7 @@
     "provider": "aws",
     "type": "ec2",
     "size": "t3.medium",
-    "ami_name": "ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-????????",
+    "ami_name": "ubuntu-pro-server/images/hvm-ssd/ubuntu-focal-20.04-amd64-pro-server-????????",
     "user_name": "ubuntu"
   }],
   "services": [
diff --git a/test/manual/definitions/apm/java/linux/jboss/docker/ub20-dockertomcat-jboss.json b/test/manual/definitions/apm/java/linux/jboss/docker/ub20-dockertomcat-jboss.json
@@ -10,7 +10,7 @@
     "provider": "aws",
     "type": "ec2",
     "size": "t3.medium",
-    "ami_name": "ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-????????",
+    "ami_name": "ubuntu-pro-server/images/hvm-ssd/ubuntu-focal-20.04-amd64-pro-server-????????",
     "user_name": "ubuntu"
   }],
   "services": [
diff --git a/test/manual/definitions/apm/java/linux/jboss/docker/ub20-tomcat-jboss.json b/test/manual/definitions/apm/java/linux/jboss/docker/ub20-tomcat-jboss.json
@@ -10,7 +10,7 @@
     "provider": "aws",
     "type": "ec2",
     "size": "t3.medium",
-    "ami_name": "ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-????????",
+    "ami_name": "ubuntu-pro-server/images/hvm-ssd/ubuntu-focal-20.04-amd64-pro-server-????????",
     "user_name": "ubuntu"
   }],
   "services": [
diff --git a/test/manual/definitions/apm/java/linux/tomcat/docker/ub20-apt-docker-tomcat.json b/test/manual/definitions/apm/java/linux/tomcat/docker/ub20-apt-docker-tomcat.json
@@ -10,7 +10,7 @@
     "provider": "aws",
     "type": "ec2",
     "size": "t3.micro",
-    "ami_name": "ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-????????",
+    "ami_name": "ubuntu-pro-server/images/hvm-ssd/ubuntu-focal-20.04-amd64-pro-server-????????",
     "user_name": "ubuntu"
   }],
   "services": [
diff --git a/test/manual/definitions/apm/java/linux/tomcat/docker/ub20-docker-rest.json b/test/manual/definitions/apm/java/linux/tomcat/docker/ub20-docker-rest.json
@@ -10,7 +10,7 @@
     "provider": "aws",
     "type": "ec2",
     "size": "t3.medium",
-    "ami_name": "ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-????????",
+    "ami_name": "ubuntu-pro-server/images/hvm-ssd/ubuntu-focal-20.04-amd64-pro-server-????????",
     "user_name": "ubuntu"
   }],
   "services": [
diff --git a/test/manual/definitions/apm/java/linux/tomcat/systemd/ub20-apt-sysd-tomcat.json b/test/manual/definitions/apm/java/linux/tomcat/systemd/ub20-apt-sysd-tomcat.json
@@ -10,7 +10,7 @@
       "provider": "aws",
       "type": "ec2",
       "size": "t3.micro",
-      "ami_name": "ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-????????",
+      "ami_name": "ubuntu-pro-server/images/hvm-ssd/ubuntu-focal-20.04-amd64-pro-server-????????",
       "user_name": "ubuntu"
   }],
   "services": [
diff --git a/test/manual/definitions/infra-agent/ubuntu20-infra-crowdstrike.json b/test/manual/definitions/infra-agent/ubuntu20-infra-crowdstrike.json
@@ -11,7 +11,7 @@
             "provider": "aws",
             "type": "ec2",
             "size": "t3.nano",
-            "ami_name": "ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-????????",
+            "ami_name": "ubuntu-pro-server/images/hvm-ssd/ubuntu-focal-20.04-amd64-pro-server-????????",
             "user_name": "ubuntu"
         }
     ],
diff --git a/test/manual/definitions/infra-agent/ubuntu20-infra.json b/test/manual/definitions/infra-agent/ubuntu20-infra.json
@@ -11,7 +11,7 @@
             "provider": "aws",
             "type": "ec2",
             "size": "t3.nano",
-            "ami_name": "ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-????????",
+            "ami_name": "ubuntu-pro-server/images/hvm-ssd/ubuntu-focal-20.04-amd64-pro-server-????????",
             "user_name": "ubuntu"
         }
     ]

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`"provider": "aws",`
`13`	`13`	`"type": "ec2",`
`14`	`14`	`"size": "t3.nano",`
`15`		`- "ami_name": "ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-2023*",`
	`15`	`+ "ami_name": "ubuntu-pro-server/images/hvm-ssd/ubuntu-focal-20.04-amd64-pro-server-????????",`
`16`	`16`	`"user_name": "ubuntu"`
`17`	`17`	`}`
`18`	`18`	`],`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`"provider": "aws",`
`12`	`12`	`"type": "ec2",`
`13`	`13`	`"size": "t3.micro",`
`14`		`- "ami_name": "ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-????????",`
	`14`	`+ "ami_name": "ubuntu-pro-server/images/hvm-ssd/ubuntu-focal-20.04-amd64-pro-server-????????",`
`15`	`15`	`"user_name": "ubuntu"`
`16`	`16`	`}`
`17`	`17`	`],`