summaryrefslogtreecommitdiffstats
path: root/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/pkg/TestPackageTest.java
diff options
context:
space:
mode:
authorJon Marius Venstad <jonmv@users.noreply.github.com>2023-08-14 16:20:24 +0200
committerGitHub <noreply@github.com>2023-08-14 16:20:24 +0200
commit25a4b1fa51e2803dc528d1726ea2eddc04e46eea (patch)
treee5cd691771b5693973d220df4b866397056f8e1e /controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/pkg/TestPackageTest.java
parente9840e436e7b2d1bfcf173d5ecf58cf030625b62 (diff)
parentddc6ee8e7fd20dbf1529806340345b4fd8a816a2 (diff)
Merge pull request #28038 from vespa-engine/freva/x86_for_tester_enclavev8.211.15
Use x86_64 for tester nodes in enclave
Diffstat (limited to 'controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/pkg/TestPackageTest.java')
-rw-r--r--controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/pkg/TestPackageTest.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/pkg/TestPackageTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/pkg/TestPackageTest.java
index c948da6936c..4c61fe7c77d 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/pkg/TestPackageTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/pkg/TestPackageTest.java
@@ -221,10 +221,10 @@ public class TestPackageTest {
</deployment>
""");
- NodeResources firstResources = TestPackage.testerResourcesFor(ZoneId.from("prod", "gcp-us-west-1"), spec.requireInstance("first"));
- assertEquals(TestPackage.DEFAULT_TESTER_RESOURCES_CLOUD, firstResources);
+ NodeResources firstResources = TestPackage.testerResourcesFor(ZoneId.from("prod", "gcp-us-west-1"), spec.requireInstance("first"), true);
+ assertEquals(TestPackage.DEFAULT_TESTER_RESOURCES_CLOUD.with(NodeResources.Architecture.x86_64), firstResources);
- NodeResources secondResources = TestPackage.testerResourcesFor(ZoneId.from("prod", "us-west-1"), spec.requireInstance("second"));
+ NodeResources secondResources = TestPackage.testerResourcesFor(ZoneId.from("prod", "us-west-1"), spec.requireInstance("second"), false);
assertEquals(6, secondResources.vcpu(), 1e-9);
assertEquals(16, secondResources.memoryGb(), 1e-9);
assertEquals(100, secondResources.diskGb(), 1e-9);