summaryrefslogtreecommitdiffstats
path: root/config-model
diff options
context:
space:
mode:
authorGeir Storli <geirstorli@yahoo.no>2017-08-16 10:00:09 +0200
committerGitHub <noreply@github.com>2017-08-16 10:00:09 +0200
commit92653789e4f355b8aaaf6bcd1a1d8fb0b3f25eb7 (patch)
tree9385278f22192e41519d3495594cb64b5977830e /config-model
parentcde02a5457a5f5efccd346bc3c82a464158b3afc (diff)
parentc55abf678c86f7941205797abda13392547bb2ef (diff)
Merge pull request #3117 from vespa-engine/hmusum/set-hmusum/remove-pan-rtx-config-remnants
Remove files that are not used anymore (config does not exist anymore)
Diffstat (limited to 'config-model')
-rw-r--r--config-model/src/test/cfg/search/compare/complex/search/cluster.rt/rtx/0/pan-rtx-rtlogic.MODEL.cfg19
-rw-r--r--config-model/src/test/cfg/search/compare/complex/search/cluster.rt/rtx/1/pan-rtx-rtlogic.MODEL.cfg19
-rw-r--r--config-model/src/test/cfg/search/compare/simple/search/cluster.music/rtx/0/pan-rtx-rtlogic.MODEL.cfg7
-rw-r--r--config-model/src/test/cfg/search/compare/twoFeedTargetClusters/search/cluster.music1/rtx/0/pan-rtx-rtlogic.MODEL.cfg7
-rw-r--r--config-model/src/test/java/com/yahoo/searchdefinition/derived/AbstractExportingTestCase.java2
5 files changed, 0 insertions, 54 deletions
diff --git a/config-model/src/test/cfg/search/compare/complex/search/cluster.rt/rtx/0/pan-rtx-rtlogic.MODEL.cfg b/config-model/src/test/cfg/search/compare/complex/search/cluster.rt/rtx/0/pan-rtx-rtlogic.MODEL.cfg
deleted file mode 100644
index 9c332f32703..00000000000
--- a/config-model/src/test/cfg/search/compare/complex/search/cluster.rt/rtx/0/pan-rtx-rtlogic.MODEL.cfg
+++ /dev/null
@@ -1,19 +0,0 @@
-parts 2
-minnodesperpart 1
-maxbadparts 0
-cluster.rtc[0].spec "tcp/zarya:19151"
-cluster.rtc[0].part 0
-cluster.rtc[0].row 0
-cluster.rtc[0].feedservice "search/cluster.rt/c0/r0/feed-destination"
-cluster.rtc[1].spec "tcp/dev-mathiasm:19100"
-cluster.rtc[1].part 0
-cluster.rtc[1].row 1
-cluster.rtc[1].feedservice "search/cluster.rt/c0/r1/feed-destination"
-cluster.rtc[2].spec "tcp/dev-mathiasm:19106"
-cluster.rtc[2].part 1
-cluster.rtc[2].row 0
-cluster.rtc[2].feedservice "search/cluster.rt/c1/r0/feed-destination"
-cluster.rtc[3].spec "tcp/zarya:19157"
-cluster.rtc[3].part 1
-cluster.rtc[3].row 1
-cluster.rtc[3].feedservice "search/cluster.rt/c1/r1/feed-destination"
diff --git a/config-model/src/test/cfg/search/compare/complex/search/cluster.rt/rtx/1/pan-rtx-rtlogic.MODEL.cfg b/config-model/src/test/cfg/search/compare/complex/search/cluster.rt/rtx/1/pan-rtx-rtlogic.MODEL.cfg
deleted file mode 100644
index 9c332f32703..00000000000
--- a/config-model/src/test/cfg/search/compare/complex/search/cluster.rt/rtx/1/pan-rtx-rtlogic.MODEL.cfg
+++ /dev/null
@@ -1,19 +0,0 @@
-parts 2
-minnodesperpart 1
-maxbadparts 0
-cluster.rtc[0].spec "tcp/zarya:19151"
-cluster.rtc[0].part 0
-cluster.rtc[0].row 0
-cluster.rtc[0].feedservice "search/cluster.rt/c0/r0/feed-destination"
-cluster.rtc[1].spec "tcp/dev-mathiasm:19100"
-cluster.rtc[1].part 0
-cluster.rtc[1].row 1
-cluster.rtc[1].feedservice "search/cluster.rt/c0/r1/feed-destination"
-cluster.rtc[2].spec "tcp/dev-mathiasm:19106"
-cluster.rtc[2].part 1
-cluster.rtc[2].row 0
-cluster.rtc[2].feedservice "search/cluster.rt/c1/r0/feed-destination"
-cluster.rtc[3].spec "tcp/zarya:19157"
-cluster.rtc[3].part 1
-cluster.rtc[3].row 1
-cluster.rtc[3].feedservice "search/cluster.rt/c1/r1/feed-destination"
diff --git a/config-model/src/test/cfg/search/compare/simple/search/cluster.music/rtx/0/pan-rtx-rtlogic.MODEL.cfg b/config-model/src/test/cfg/search/compare/simple/search/cluster.music/rtx/0/pan-rtx-rtlogic.MODEL.cfg
deleted file mode 100644
index d8d30dc5af3..00000000000
--- a/config-model/src/test/cfg/search/compare/simple/search/cluster.music/rtx/0/pan-rtx-rtlogic.MODEL.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-parts 1
-minnodesperpart 1
-maxbadparts 0
-cluster.rtc[0].spec "tcp/zarya:19113"
-cluster.rtc[0].part 0
-cluster.rtc[0].row 0
-cluster.rtc[0].feedservice "search/cluster.music/c0/r0/feed-destination"
diff --git a/config-model/src/test/cfg/search/compare/twoFeedTargetClusters/search/cluster.music1/rtx/0/pan-rtx-rtlogic.MODEL.cfg b/config-model/src/test/cfg/search/compare/twoFeedTargetClusters/search/cluster.music1/rtx/0/pan-rtx-rtlogic.MODEL.cfg
deleted file mode 100644
index 2a20e0bca1e..00000000000
--- a/config-model/src/test/cfg/search/compare/twoFeedTargetClusters/search/cluster.music1/rtx/0/pan-rtx-rtlogic.MODEL.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-parts 1
-minnodesperpart 1
-maxbadparts 0
-cluster.rtc[0].spec "tcp/zarya:19110"
-cluster.rtc[0].part 0
-cluster.rtc[0].row 0
-cluster.rtc[0].feedservice "search/cluster.music1/c0/r0/feed-destination"
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/AbstractExportingTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/AbstractExportingTestCase.java
index 55dfc1d5b6e..84edb50aed3 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/AbstractExportingTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/AbstractExportingTestCase.java
@@ -42,8 +42,6 @@ public abstract class AbstractExportingTestCase extends SearchDefinitionTestCase
//System.setProperty("sd.updatetestfile", "index-info");
//System.setProperty("sd.updatetestfile", "indexschema");
//System.setProperty("sd.updatetestfile", "juniperrc");
- //System.setProperty("sd.updatetestfile", "pan-rtx");
- //System.setProperty("sd.updatetestfile", "pan-rtx-rtlogic");
//System.setProperty("sd.updatetestfile", "partitions");
//System.setProperty("sd.updatetestfile", "qr-logging");
//System.setProperty("sd.updatetestfile", "qr-searchers");