Fix comparison between manually deployed package and not, and remove outdated safeguard

3 files changed, 8 insertions, 21 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
index a23cb40dcb1..d710a8a2948 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
@@ -370,7 +370,6 @@ public class ApplicationController {
             try (Lock lock = lock(applicationId)) {
                 LockedApplication application = new LockedApplication(requireApplication(applicationId), lock);
                 Instance instance = application.get().require(job.application().instance());
-                rejectOldChange(instance, platform, revision, job, zone);
 
                 if (   ! applicationPackage.trustedCertificates().isEmpty()
                     &&   run.testerCertificate().isPresent())
@@ -801,20 +800,6 @@ public class ApplicationController {
         }
     }
 
-    private void rejectOldChange(Instance instance, Version platform, ApplicationVersion revision, JobId job, ZoneId zone) {
-        Deployment deployment = instance.deployments().get(zone);
-        if (deployment == null) return;
-        if (!zone.environment().isProduction()) return;
-
-        boolean platformIsOlder = platform.compareTo(deployment.version()) < 0 && !instance.change().isPinned();
-        boolean revisionIsOlder = revision.compareTo(deployment.applicationVersion()) < 0 &&
-                                  !(revision.isUnknown() && controller.system().isCd());
-        if (platformIsOlder || revisionIsOlder)
-            throw new IllegalArgumentException(Text.format("Rejecting deployment of application %s to %s, as the requested versions (platform: %s, application: %s)" +
-                                                             " are older than the currently deployed (platform: %s, application: %s).",
-                                                             job.application(), zone, platform, revision, deployment.version(), deployment.applicationVersion()));
-    }
-
     private TenantAndApplicationId dashToUnderscore(TenantAndApplicationId id) {
         return TenantAndApplicationId.from(id.tenant().value(), id.application().value().replaceAll("-", "_"));
     }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentStatus.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentStatus.java
index ce03e84f2b9..b76f6c25bc4 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentStatus.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentStatus.java
@@ -26,6 +26,7 @@ import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.function.Function;
 import java.util.stream.Collectors;
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTriggerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTriggerTest.java
index 102dfde16ec..a622d9e0534 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTriggerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTriggerTest.java
@@ -1114,9 +1114,10 @@ public class DeploymentTriggerTest {
         tester.controller().applications().deploymentTrigger().forceTrigger(app.instanceId(), productionCdUsEast1, "user", false);
         app.runJob(productionCdUsEast1)
            .abortJob(stagingTest) // Complete failing run.
-           .runJob(stagingTest)
+           .runJob(stagingTest)   // Run staging-test for production zone with no prior deployment.
            .runJob(productionCdAwsUsEast1a);
 
+        // Manually deploy to east again, then upgrade the system.
         app.runJob(productionCdUsEast1, cdPackage);
         var version = new Version("7.1");
         tester.controllerTester().upgradeSystem(version);
@@ -1124,16 +1125,16 @@ public class DeploymentTriggerTest {
         // System and staging tests both require unknown versions, and are broken.
         tester.controller().applications().deploymentTrigger().forceTrigger(app.instanceId(), productionCdUsEast1, "user", false);
         app.runJob(productionCdUsEast1)
-           .jobAborted(systemTest)
+           .abortJob(systemTest)
            .jobAborted(stagingTest)
-           .runJob(systemTest)
-           .runJob(stagingTest)
+           .runJob(systemTest)  // Run test for aws zone again.
+           .runJob(stagingTest) // Run test for aws zone again.
            .runJob(productionCdAwsUsEast1a);
 
+        // Deploy manually again, then submit new package.
         app.runJob(productionCdUsEast1, cdPackage);
         app.submit(cdPackage);
-        app.jobAborted(systemTest)
-           .runJob(systemTest);
+        app.runJob(systemTest);
         // Staging test requires unknown initial version, and is broken.
         tester.controller().applications().deploymentTrigger().forceTrigger(app.instanceId(), productionCdUsEast1, "user", false);
         app.runJob(productionCdUsEast1)