diff options
| author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2020-06-30 10:41:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-30 10:41:50 +0200 |
| commit | 41bdf5a8939faec9fe68db3f6fcd81d733123aa4 (patch) | |
| tree | fb4e3d0606dbe54f6872ace251ee8911d69748ea /config-model/src/main | |
| parent | 0a1ae76aa090985823a546bc29e32f61373ad8b5 (diff) | |
| parent | 17d282c222b4214920e2f07fe031c6cf05191bb3 (diff) | |
Merge pull request #13680 from vespa-engine/mortent/install-testrunner-bundles
install testrunner bundles
Diffstat (limited to 'config-model/src/main')
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java index 71d16303573..234387f5a6b 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java @@ -124,8 +124,14 @@ public final class ApplicationContainerCluster extends ContainerCluster<Applicat } private void addTestrunnerComponentsIfTester(DeployState deployState) { - if (deployState.isHosted() && deployState.getProperties().applicationId().instance().isTester()) + if (deployState.isHosted() && deployState.getProperties().applicationId().instance().isTester()) { addPlatformBundle(Paths.get(Defaults.getDefaults().underVespaHome("lib/jars/vespa-testrunner-components-jar-with-dependencies.jar"))); + addPlatformBundle(Paths.get(Defaults.getDefaults().underVespaHome("lib/jars/vespa-osgi-testrunner-jar-with-dependencies.jar"))); + addPlatformBundle(Paths.get(Defaults.getDefaults().underVespaHome("lib/jars/tenant-cd-api-jar-with-dependencies.jar"))); + if(deployState.zone().system().isPublic()) { + addPlatformBundle(Paths.get(Defaults.getDefaults().underVespaHome("lib/jars/cloud-tenant-cd-jar-with-dependencies.jar"))); + } + } } public void setModelEvaluation(ContainerModelEvaluation modelEvaluation) { |