Merge pull request #8210 from vespa-engine/jvenstad/deploy-to-dev-on-spec-major

Jvenstad/deploy to dev on spec major MERGEOK

1 files changed, 8 insertions, 0 deletions

diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java
index 1199f0229b6..343deaec752 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java
@@ -446,10 +446,13 @@ public class ControllerTest {
     @Test
     public void testDeployDirectly() {
         DeploymentTester tester = new DeploymentTester();
+        Version six = Version.fromString("6.1");
+        tester.upgradeSystem(six);
         tester.controllerTester().zoneRegistry().setSystemName(SystemName.cd);
         tester.controllerTester().zoneRegistry().setZones(ZoneId.from("prod", "cd-us-central-1"));
         ApplicationPackage applicationPackage = new ApplicationPackageBuilder()
                 .environment(Environment.prod)
+                .majorVersion(6)
                 .region("cd-us-central-1")
                 .build();
 
@@ -468,6 +471,11 @@ public class ControllerTest {
 
         assertTrue("No job status added",
                    tester.applications().require(app.id()).deploymentJobs().jobStatus().isEmpty());
+
+        Version seven = Version.fromString("7.2");
+        tester.upgradeSystem(seven);
+        tester.controller().applications().deploy(app.id(), zone, Optional.of(applicationPackage), options);
+        assertEquals(six, tester.application(app.id()).deployments().get(zone).version());
     }
 
     @Test