Merge pull request #15158 from vespa-engine/ogronnesby/dont-enforce-quota-in-pipeline

Don't enforce quota in test deployments

2 files changed, 9 insertions, 7 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/DeploymentQuotaCalculator.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/DeploymentQuotaCalculator.java
index 4bef2ef7648..cf135fc6b6e 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/DeploymentQuotaCalculator.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/DeploymentQuotaCalculator.java
@@ -23,12 +23,11 @@ public class DeploymentQuotaCalculator {
     public static Quota calculate(Quota tenantQuota,
                                   List<Application> tenantApps,
                                   ApplicationId deployingApp, ZoneId deployingZone,
-                                  DeploymentSpec deploymentSpec) {
-
+                                  DeploymentSpec deploymentSpec)
+    {
         if (tenantQuota.budget().isEmpty()) return tenantQuota; // Shortcut if there is no budget limit to care about.
-
+        if (deployingZone.environment().isTest()) return Quota.unlimited();
         if (deployingZone.environment().isProduction()) return probablyEnoughForAll(tenantQuota, tenantApps, deployingApp, deploymentSpec);
-
         return getMaximumAllowedQuota(tenantQuota, tenantApps, deployingApp, deployingZone);
     }
 
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/DeploymentQuotaCalculatorTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/DeploymentQuotaCalculatorTest.java
index fd719ab4619..98710ce9b26 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/DeploymentQuotaCalculatorTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/DeploymentQuotaCalculatorTest.java
@@ -4,16 +4,13 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.yahoo.config.application.api.DeploymentSpec;
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.zone.ZoneId;
-import com.yahoo.io.IOUtils;
 import com.yahoo.vespa.hosted.controller.api.integration.billing.Quota;
 import com.yahoo.vespa.hosted.controller.api.integration.noderepository.ApplicationData;
 import org.junit.Test;
 
-import java.io.File;
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.nio.file.Files;
-import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.List;
 
@@ -65,4 +62,10 @@ public class DeploymentQuotaCalculatorTest {
         var usage = DeploymentQuotaCalculator.calculateQuotaUsage(application);
         assertEquals(1.164, usage.rate(), 0.001);
     }
+
+    @Test
+    public void unlimited_quota_in_pipeline() {
+        Quota calculated = DeploymentQuotaCalculator.calculate(Quota.zero(), List.of(), ApplicationId.defaultId(), ZoneId.from("test", "apac1"), DeploymentSpec.empty);
+        assertEquals(Quota.unlimited(), calculated);
+    }
 }
\ No newline at end of file