Update controller-server tests

5 files changed, 27 insertions, 27 deletions

diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java
index a598c5d30e0..9337adb01de 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java
@@ -79,7 +79,7 @@ public class ConfigServerMock extends AbstractComponent implements ConfigServer
     private final Map<DeploymentId, ServiceConvergence> serviceStatus = new HashMap<>();
     private final Set<ApplicationId> disallowConvergenceCheckApplications = new HashSet<>();
     private final Version initialVersion = new Version(6, 1, 0);
-    private final DockerImage initialDockerImage = DockerImage.fromString("dockerImage:6.1.0");
+    private final DockerImage initialDockerImage = DockerImage.fromString("registry.example.com/vespa/vespa:6.1.0");
     private final Set<DeploymentId> suspendedApplications = new HashSet<>();
     private final Map<ZoneId, Set<LoadBalancer>> loadBalancers = new HashMap<>();
     private final Set<Environment> deferLoadBalancerProvisioning = new HashSet<>();
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/dev-us-east-1-log-first-part.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/dev-us-east-1-log-first-part.json
index e4786cd4aea..835bca7966e 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/dev-us-east-1-log-first-part.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/dev-us-east-1-log-first-part.json
@@ -33,7 +33,7 @@
       {
         "at": 0,
         "type": "info",
-        "message": "--- platform dockerImage:6.1"
+        "message": "--- platform registry.example.com/vespa/vespa:6.1"
       },
       {
         "at": 0,
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/staging-test-log.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/staging-test-log.json
index b1ebf43ec02..32bee6c7e7e 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/staging-test-log.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/staging-test-log.json
@@ -23,7 +23,7 @@
       {
         "at": 14503000,
         "type": "info",
-        "message": "--- platform dockerImage:6.1"
+        "message": "--- platform registry.example.com/vespa/vespa:6.1"
       },
       {
         "at": 14503000,
@@ -38,7 +38,7 @@
       {
         "at": 14503000,
         "type": "info",
-        "message": "--- platform dockerImage:6.1"
+        "message": "--- platform registry.example.com/vespa/vespa:6.1"
       },
       {
         "at": 14503000,
@@ -53,7 +53,7 @@
       {
         "at": 14503000,
         "type": "info",
-        "message": "--- platform dockerImage:6.1"
+        "message": "--- platform registry.example.com/vespa/vespa:6.1"
       },
       {
         "at": 14503000,
@@ -92,7 +92,7 @@
       {
         "at": 14503000,
         "type": "info",
-        "message": "--- platform dockerImage:6.1"
+        "message": "--- platform registry.example.com/vespa/vespa:6.1"
       },
       {
         "at": 14503000,
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/system-test-details.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/system-test-details.json
index ccfaf3341a2..0e7c100ea4e 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/system-test-details.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/system-test-details.json
@@ -28,7 +28,7 @@
       {
         "at": "(ignore)",
         "type": "info",
-        "message": "--- platform dockerImage:6.1"
+        "message": "--- platform registry.example.com/vespa/vespa:6.1"
       },
       {
         "at": "(ignore)",
@@ -43,7 +43,7 @@
       {
         "at": "(ignore)",
         "type": "info",
-        "message": "--- platform dockerImage:6.1"
+        "message": "--- platform registry.example.com/vespa/vespa:6.1"
       },
       {
         "at": "(ignore)",
@@ -58,7 +58,7 @@
       {
         "at": "(ignore)",
         "type": "info",
-        "message": "--- platform dockerImage:6.1"
+        "message": "--- platform registry.example.com/vespa/vespa:6.1"
       },
       {
         "at": "(ignore)",
@@ -73,7 +73,7 @@
       {
         "at": "(ignore)",
         "type": "info",
-        "message": "--- platform dockerImage:6.1"
+        "message": "--- platform registry.example.com/vespa/vespa:6.1"
       },
       {
         "at": "(ignore)",
@@ -112,7 +112,7 @@
       {
         "at": "(ignore)",
         "type": "info",
-        "message": "--- platform dockerImage:6.1"
+        "message": "--- platform registry.example.com/vespa/vespa:6.1"
       },
       {
         "at": "(ignore)",
@@ -127,7 +127,7 @@
       {
         "at": "(ignore)",
         "type": "info",
-        "message": "--- platform dockerImage:6.1"
+        "message": "--- platform registry.example.com/vespa/vespa:6.1"
       },
       {
         "at": "(ignore)",
@@ -142,7 +142,7 @@
       {
         "at": "(ignore)",
         "type": "info",
-        "message": "--- platform dockerImage:6.1"
+        "message": "--- platform registry.example.com/vespa/vespa:6.1"
       },
       {
         "at": "(ignore)",
@@ -157,7 +157,7 @@
       {
         "at": "(ignore)",
         "type": "info",
-        "message": "--- platform dockerImage:6.1"
+        "message": "--- platform registry.example.com/vespa/vespa:6.1"
       },
       {
         "at": "(ignore)",
@@ -172,7 +172,7 @@
       {
         "at": "(ignore)",
         "type": "info",
-        "message": "--- platform dockerImage:6.1"
+        "message": "--- platform registry.example.com/vespa/vespa:6.1"
       },
       {
         "at": "(ignore)",
@@ -187,7 +187,7 @@
       {
         "at": "(ignore)",
         "type": "info",
-        "message": "--- platform dockerImage:6.1"
+        "message": "--- platform registry.example.com/vespa/vespa:6.1"
       },
       {
         "at": "(ignore)",
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/system-test-log.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/system-test-log.json
index dea43549396..edaa01326ad 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/system-test-log.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/system-test-log.json
@@ -23,7 +23,7 @@
       {
         "at": 0,
         "type": "info",
-        "message": "--- platform dockerImage:6.1"
+        "message": "--- platform registry.example.com/vespa/vespa:6.1"
       },
       {
         "at": 0,
@@ -38,7 +38,7 @@
       {
         "at": 0,
         "type": "info",
-        "message": "--- platform dockerImage:6.1"
+        "message": "--- platform registry.example.com/vespa/vespa:6.1"
       },
       {
         "at": 0,
@@ -53,7 +53,7 @@
       {
         "at": 0,
         "type": "info",
-        "message": "--- platform dockerImage:6.1"
+        "message": "--- platform registry.example.com/vespa/vespa:6.1"
       },
       {
         "at": 0,
@@ -68,7 +68,7 @@
       {
         "at": 0,
         "type": "info",
-        "message": "--- platform dockerImage:6.1"
+        "message": "--- platform registry.example.com/vespa/vespa:6.1"
       },
       {
         "at": 0,
@@ -107,7 +107,7 @@
       {
         "at": 0,
         "type": "info",
-        "message": "--- platform dockerImage:6.1"
+        "message": "--- platform registry.example.com/vespa/vespa:6.1"
       },
       {
         "at": 0,
@@ -122,7 +122,7 @@
       {
         "at": 0,
         "type": "info",
-        "message": "--- platform dockerImage:6.1"
+        "message": "--- platform registry.example.com/vespa/vespa:6.1"
       },
       {
         "at": 0,
@@ -137,7 +137,7 @@
       {
         "at": 0,
         "type": "info",
-        "message": "--- platform dockerImage:6.1"
+        "message": "--- platform registry.example.com/vespa/vespa:6.1"
       },
       {
         "at": 0,
@@ -152,7 +152,7 @@
       {
         "at": 0,
         "type": "info",
-        "message": "--- platform dockerImage:6.1"
+        "message": "--- platform registry.example.com/vespa/vespa:6.1"
       },
       {
         "at": 0,
@@ -167,7 +167,7 @@
       {
         "at": 0,
         "type": "info",
-        "message": "--- platform dockerImage:6.1"
+        "message": "--- platform registry.example.com/vespa/vespa:6.1"
       },
       {
         "at": 0,
@@ -182,7 +182,7 @@
       {
         "at": 0,
         "type": "info",
-        "message": "--- platform dockerImage:6.1"
+        "message": "--- platform registry.example.com/vespa/vespa:6.1"
       },
       {
         "at": 0,
@@ -308,4 +308,4 @@
       "failed": 0
     }
   }
-}
\ No newline at end of file
+}