diff options
3 files changed, 8 insertions, 8 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/ArtifactRepository.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/ArtifactRepository.java index b44e7f6f5e7..117dbd38a3b 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/ArtifactRepository.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/ArtifactRepository.java @@ -21,10 +21,10 @@ public interface ArtifactRepository { /** Returns the system application package of the given version. */ byte[] getSystemApplicationPackage(ApplicationId application, ZoneId zone, Version version); - /** Stores the given tester application fat jar of the given version. */ - void putTesterJar(ApplicationId tester, String applicationVersion, byte[] fatTestJar); + /** Stores the given tester application package of the given version. Does NOT contain the services.xml. */ + void putTesterPackage(ApplicationId tester, String applicationVersion, byte[] testerPackage); - /** Returns the tester application fat jar of the given version. */ - byte[] getTesterJar(ApplicationId tester, String applicationVersion); + /** Returns the tester application package of the given version. Does NOT contain the services.xml. */ + byte[] getTesterPackage(ApplicationId tester, String applicationVersion); } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java index 359ceceb519..9fd5faaba16 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java @@ -403,8 +403,8 @@ public class InternalStepRunner implements StepRunner { .lastTriggered().get() .application(); - byte[] testJar = controller.applications().artifacts().getTesterJar(testerOf(id.application()), version.id()); - byte[] servicesXml = servicesXml(); + byte[] testPackage = controller.applications().artifacts().getTesterPackage(testerOf(id.application()), version.id()); + byte[] servicesXml = servicesXml(controller.system()); // TODO hakonhall: Assemble! diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ArtifactRepositoryMock.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ArtifactRepositoryMock.java index c722d30c885..3f800ad9a56 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ArtifactRepositoryMock.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ArtifactRepositoryMock.java @@ -52,12 +52,12 @@ public class ArtifactRepositoryMock extends AbstractComponent implements Artifac } @Override - public byte[] getTesterJar(ApplicationId tester, String applicationVersion) { + public byte[] getTesterPackage(ApplicationId tester, String applicationVersion) { throw new AssertionError(); } @Override - public void putTesterJar(ApplicationId tester, String applicationVersion, byte[] fatTestJar) { + public void putTesterPackage(ApplicationId tester, String applicationVersion, byte[] testerPackage) { throw new AssertionError(); } |