diff options
| author | jonmv <venstad@gmail.com> | 2022-05-03 07:32:02 +0200 |
|---|---|---|
| committer | jonmv <venstad@gmail.com> | 2022-05-03 07:32:02 +0200 |
| commit | 6872505203d96295c1cdfe0c108daab554d64928 (patch) | |
| tree | 089155348b1b69f606ef1681e380402db119b090 /controller-server | |
| parent | 3592e408848787f75e721bf2d6f99f3f010f6610 (diff) | |
Revert "Merge pull request #22393 from vespa-engine/revert-22386-jonmv/remove-last-controller-jersey-client"
This reverts commit 04898b34190a3e3bb9d3053e11eb892bc48ff842, reversing
changes made to 3a757528a0a978d44cb1bd9aae28b567c477d139.
Diffstat (limited to 'controller-server')
| -rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/TestPackage.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/TestPackage.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/TestPackage.java index 751f6674128..0c9ff7863bd 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/TestPackage.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/TestPackage.java @@ -141,7 +141,9 @@ public class TestPackage { try { byte[] testsJar = ZipEntries.readFile(testPackage, "components/" + path, 1 << 30); Manifest manifest = new JarInputStream(new ByteArrayInputStream(testsJar)).getManifest(); - for (String suite : manifest.getMainAttributes().getValue("X-JDisc-Test-Bundle-Categories").split(",")) + String bundleCategoriesHeader = manifest.getMainAttributes().getValue("X-JDisc-Test-Bundle-Categories"); + if (bundleCategoriesHeader == null) continue; + for (String suite : bundleCategoriesHeader.split(",")) if ( ! suite.isBlank()) switch (suite.trim()) { case "SystemTest": suites.add(system); break; case "StagingSetup": suites.add(staging_setup); break; |