summaryrefslogtreecommitdiffstats
path: root/configserver
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2020-06-16 11:54:04 +0200
committerHarald Musum <musum@verizonmedia.com>2020-06-16 11:54:04 +0200
commiteec40a01d1c084505491250b1aa89994b17ad2c5 (patch)
treec5b196bc199ea6001baa19842b9830d3c87ceda1 /configserver
parent24ddfd3a00c722cb439b0e0617e6791aff15ea6c (diff)
Remove unused files
Diffstat (limited to 'configserver')
-rw-r--r--configserver/src/test/java/com/yahoo/vespa/config/server/a-music-indexer-correct.cfg78
-rw-r--r--configserver/src/test/java/com/yahoo/vespa/config/server/a-sports-indexer-correct.cfg48
-rw-r--r--configserver/src/test/java/com/yahoo/vespa/config/server/app_stripped/components/testbundle.jarbin696 -> 0 bytes
-rw-r--r--configserver/src/test/java/com/yahoo/vespa/config/server/app_stripped/services.xml18
-rw-r--r--configserver/src/test/java/com/yahoo/vespa/config/server/modelconfigs/a.search-clustermusic-c0-r0-indexer4.cfg44
-rw-r--r--configserver/src/test/java/com/yahoo/vespa/config/server/modelconfigs/a.search-clustersports-c0-r0-indexer4.cfg2
-rw-r--r--configserver/src/test/java/com/yahoo/vespa/config/server/modelconfigs/a.vespamodel.cfg1
-rw-r--r--configserver/src/test/java/com/yahoo/vespa/config/server/modelconfigs/c.search-clustersports-c0-r0-indexer4.cfg2
-rw-r--r--configserver/src/test/java/com/yahoo/vespa/config/server/modelconfigs/compositeinclude.search-qrservers-0.cfg2
-rw-r--r--configserver/src/test/java/com/yahoo/vespa/config/server/modelconfigs/recursiveinclude.search-clustermusic-c0-r0.cfg1
-rw-r--r--configserver/src/test/java/com/yahoo/vespa/config/server/sdconfigs/a.search-clustermusic.cfg5
-rw-r--r--configserver/src/test/java/com/yahoo/vespa/config/server/sdconfigs/a.search-clustersports.cfg2
-rw-r--r--configserver/src/test/java/com/yahoo/vespa/config/server/sdconfigs/b.search-clustersports.cfg1
-rw-r--r--configserver/src/test/java/com/yahoo/vespa/config/server/sdconfigs/compositeinclude.search-clusterlogical.cfg8
-rw-r--r--configserver/src/test/java/com/yahoo/vespa/config/server/sdconfigs/compositeinclude.search-clustervideo.cfg8
-rw-r--r--configserver/src/test/java/com/yahoo/vespa/config/server/sdconfigs/compositeinclude.search-part-clusterlogical.cfg14
-rw-r--r--configserver/src/test/java/com/yahoo/vespa/config/server/sdconfigs/compositeinclude.search-part-clustervideo.cfg14
-rw-r--r--configserver/src/test/java/com/yahoo/vespa/config/server/sdconfigs/recursiveinclude.search-clustermusic-conf1.4.cfg7
-rw-r--r--configserver/src/test/java/com/yahoo/vespa/config/server/sdconfigs/recursiveinclude.search-clustermusic-conf2.4.cfg7
-rw-r--r--configserver/src/test/java/com/yahoo/vespa/config/server/sdconfigs/recursiveinclude.search-clustermusic.cfg2
-rw-r--r--configserver/src/test/java/com/yahoo/vespa/config/server/userconfigs/a.cfg18
-rw-r--r--configserver/src/test/java/com/yahoo/vespa/config/server/userconfigs/b.search#cluster.sports#c0#r0#indexer4.cfg1
-rw-r--r--configserver/src/test/java/com/yahoo/vespa/config/server/userconfigs/c.cfg1
-rw-r--r--configserver/src/test/java/com/yahoo/vespa/config/server/userconfigs/d.cfg1
-rw-r--r--configserver/src/test/java/com/yahoo/vespa/config/server/userconfigs/spooler.cfg1
25 files changed, 0 insertions, 286 deletions
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/a-music-indexer-correct.cfg b/configserver/src/test/java/com/yahoo/vespa/config/server/a-music-indexer-correct.cfg
deleted file mode 100644
index 8b43ff9c793..00000000000
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/a-music-indexer-correct.cfg
+++ /dev/null
@@ -1,78 +0,0 @@
-accesslog "/home/vespa/logs/vespa/foo.log"
-partialsd "sd"
-partialsd2 "global2"
-asyncfetchocc 10
-a 0
-b 1
-c 2
-d 3
-e 4
-onlyindef 45
-listenport 13700
-rangecheck2 10
-rangecheck3 10
-kanon -78.56
-rangecheck1 10.0
-testref search/cluster.music/c0/r0/indexer.4
-testref2 some/babbel
-mode BATCH
-functionmodules[0]
-storage[2]
-storage[0].feeder[1]
-storage[0].feeder[0] "test"
-storage[1].id search/cluster.music/c0/r0/indexer.4
-storage[1].id2 pjatt
-storage[1].feeder[2]
-storage[1].feeder[0] "me"
-storage[1].feeder[1] "now"
-search[3]
-search[0].feeder[1]
-search[0].feeder[0] "foofeeder"
-search[1].feeder[4]
-search[1].feeder[0] "barfeeder1_1"
-search[1].feeder[1] "barfeeder2"
-search[1].feeder[2] ""
-search[1].feeder[3] "barfeeder2_1"
-search[2].feeder[2]
-search[2].feeder[0] ""
-search[2].feeder[1] "bazfeeder"
-f[1]
-f[0].a "A"
-f[0].b "B"
-f[0].c "C"
-f[0].h "H"
-f[0].f "F"
-config[1]
-config[0].role "rtx"
-config[0].usewrapper false
-config[0].id search/cluster.music/rtx/0
-routingtable[1]
-routingtable[0].hop[3]
-routingtable[0].hop[0].name "docproc/cluster.music.indexing/chain.music.indexing"
-routingtable[0].hop[0].selector "docproc/cluster.music.indexing/*/chain.music.indexing"
-routingtable[0].hop[0].recipient[0]
-routingtable[0].hop[1].name "search/cluster.music"
-routingtable[0].hop[1].selector "search/cluster.music/[SearchColumn]/[SearchRow]/feed-destination"
-routingtable[0].hop[1].recipient[1]
-routingtable[0].hop[1].recipient[0] "search/cluster.music/c0/r0/feed-destination"
-routingtable[0].hop[2].selector "[DocumentRouteSelector]"
-routingtable[0].hop[2].name "indexing"
-routingtable[0].hop[2].recipient[1]
-routingtable[0].hop[2].recipient[0] "search/cluster.music"
-speciallog[1]
-speciallog[0].filehandler.name "QueryAccessLog"
-speciallog[0].filehandler.pattern "logs/vespa/qrs/QueryAccessLog.%Y%m%d%H%M%S"
-speciallog[0].filehandler.rotation "0 1 ..."
-speciallog[0].cachehandler.name "QueryAccessLog"
-speciallog[0].name "QueryAccessLog"
-speciallog[0].type "file"
-speciallog[0].cachehandler.size 1000
-rulebase[4]
-rulebase[0].name "cjk"
-rulebase[0].rules "# Use unicode equivalents in java source:\n#\n# 佳:\u4f73\n# 能:\u80fd\n# 索:\u7d22\n# 尼:\u5c3c\n# 惠:\u60e0\n# 普:\u666e\n\n@default\n\na索 -> 索a;\n\n[brand] -> brand:[brand];\n\n[brand] :- 索尼,惠普,佳能;\n"
-rulebase[1].name "common"
-rulebase[1].rules "## Some test rules\n\n# Spelling correction\nbahc -> bach;\n\n# Stopwords\nsomelongstopword -> ;\n[stopword] -> ;\n[stopword] :- someotherlongstopword, yetanotherstopword;\n\n# \n[song] by [artist] -> song:[song] artist:[artist];\n\n[song] :- together, imagine, tinseltown;\n[artist] :- youngbloods, beatles, zappa;\n\n# Negative\nvarious +> -kingz;\n\n\n"
-rulebase[2].name "egyik"
-rulebase[2].rules "@include(common.sr)\n@automata(/home/vespa/etc/vespa/fsa/stopwords.fsa)\n[stopwords] -> ;\n\n"
-rulebase[3].name "masik"
-rulebase[3].rules "@include(common.sr)\n[stopwords] :- etaoin, shrdlu;\n[stopwords] -> ;\n\n"
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/a-sports-indexer-correct.cfg b/configserver/src/test/java/com/yahoo/vespa/config/server/a-sports-indexer-correct.cfg
deleted file mode 100644
index 927ff8a26c9..00000000000
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/a-sports-indexer-correct.cfg
+++ /dev/null
@@ -1,48 +0,0 @@
-accesslog "/home/vespa/logs/vespa/foo.log"
-partialsd "global"
-partialsd2 "global2"
-asyncfetchocc 10
-a 0
-b 1
-c 67
-d 89
-e 4
-onlyindef 45
-listenport 13700
-rangecheck2 10
-rangecheck3 10
-rangecheck1 10.0
-mode BATCH
-functionmodules[0]
-storage[0]
-search[3]
-search[0].feeder[1]
-search[0].feeder[0] "foofeeder"
-search[1].feeder[4]
-search[1].feeder[0] "barfeeder1_1"
-search[1].feeder[1] "sportsfeeder1"
-search[1].feeder[2] ""
-search[1].feeder[3] "barfeeder2_1"
-search[2].feeder[2]
-search[2].feeder[0] ""
-search[2].feeder[1] "bazfeeder"
-f[0]
-config[0]
-routingtable[0]
-speciallog[1]
-speciallog[0].filehandler.name "QueryAccessLog"
-speciallog[0].filehandler.pattern "logs/vespa/qrs/QueryAccessLog.%Y%m%d%H%M%S"
-speciallog[0].filehandler.rotation "0 1 ..."
-speciallog[0].cachehandler.name "QueryAccessLog"
-speciallog[0].name "QueryAccessLog"
-speciallog[0].type "file"
-speciallog[0].cachehandler.size 1000
-rulebase[4]
-rulebase[0].name "cjk"
-rulebase[0].rules "# Use unicode equivalents in java source:\n#\n# 佳:\u4f73\n# 能:\u80fd\n# 索:\u7d22\n# 尼:\u5c3c\n# 惠:\u60e0\n# 普:\u666e\n\n@default\n\na索 -> 索a;\n\n[brand] -> brand:[brand];\n\n[brand] :- 索尼,惠普,佳能;\n"
-rulebase[1].name "common"
-rulebase[1].rules "## Some test rules\n\n# Spelling correction\nbahc -> bach;\n\n# Stopwords\nsomelongstopword -> ;\n[stopword] -> ;\n[stopword] :- someotherlongstopword, yetanotherstopword;\n\n# \n[song] by [artist] -> song:[song] artist:[artist];\n\n[song] :- together, imagine, tinseltown;\n[artist] :- youngbloods, beatles, zappa;\n\n# Negative\nvarious +> -kingz;\n\n\n"
-rulebase[2].name "egyik"
-rulebase[2].rules "@include(common.sr)\n@automata(/home/vespa/etc/vespa/fsa/stopwords.fsa)\n[stopwords] -> ;\n\n"
-rulebase[3].name "masik"
-rulebase[3].rules "@include(common.sr)\n[stopwords] :- etaoin, shrdlu;\n[stopwords] -> ;\n\n"
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/app_stripped/components/testbundle.jar b/configserver/src/test/java/com/yahoo/vespa/config/server/app_stripped/components/testbundle.jar
deleted file mode 100644
index 69f6e335092..00000000000
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/app_stripped/components/testbundle.jar
+++ /dev/null
Binary files differ
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/app_stripped/services.xml b/configserver/src/test/java/com/yahoo/vespa/config/server/app_stripped/services.xml
deleted file mode 100644
index b7924e73e7a..00000000000
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/app_stripped/services.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-<services version="1.0">
-
- <admin version="2.0">
- <adminserver hostalias="node1"/>
- </admin>
-
- <content version="1.0">
- <redundancy>1</redundancy>
- <documents>
- <document type="music" mode="index"/>
- </documents>
- <nodes>>
- <node hostalias="node1" distribution-key="0"/>
- </nodes>
- </content>
-</services>
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/modelconfigs/a.search-clustermusic-c0-r0-indexer4.cfg b/configserver/src/test/java/com/yahoo/vespa/config/server/modelconfigs/a.search-clustermusic-c0-r0-indexer4.cfg
deleted file mode 100644
index d3970ee48eb..00000000000
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/modelconfigs/a.search-clustermusic-c0-r0-indexer4.cfg
+++ /dev/null
@@ -1,44 +0,0 @@
-include: search/cluster.music
-include: search/cluster.music
-c 2
-storage[2]
-storage[0].feeder[1]
-storage[0].feeder[0] "test"
-storage[1].feeder[2]
-storage[1].feeder[0] "me"
-storage[1].feeder[1] now
-storage[1].id :parent:
-storage[1].id2 pjatt
-testref :parent:
-testref2 some/babbel
-config[1]
-config[0].role "rtx"
-#config[0].usewrapper false
-config[0].id search/cluster.music/rtx/0
-f[1]
-f[0].a "A"
-f[0].b "B"
-f[0].c "C"
-f[0].h "H"
-f[0].f "F"
-f[0].notindef "notindef"
-routingtable[1]
-routingtable[0].hop[3]
-routingtable[0].hop[0].name "docproc/cluster.music.indexing/chain.music.indexing"
-routingtable[0].hop[0].selector "docproc/cluster.music.indexing/*/chain.music.indexing"
-routingtable[0].hop[1].name "search/cluster.music"
-routingtable[0].hop[1].selector "search/cluster.music/[SearchColumn]/[SearchRow]/feed-destination"
-routingtable[0].hop[1].recipient[1]
-routingtable[0].hop[1].recipient[0] "search/cluster.music/c0/r0/feed-destination"
-routingtable[0].hop[2].selector "[DocumentRouteSelector]"
-routingtable[0].hop[2].name "indexing"
-routingtable[0].hop[2].notindef "not in def"
-routingtable[0].hop[2].recipient[1]
-routingtable[0].hop[2].recipient[0] "search/cluster.music"
-notindef "dfsd"
-nopenotindef[0] "boo"
-nadaindef[0].naw 98
-mode NOTINDEF
-rangecheck1 100
-rangecheck2 10000
-rangecheck3 20
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/modelconfigs/a.search-clustersports-c0-r0-indexer4.cfg b/configserver/src/test/java/com/yahoo/vespa/config/server/modelconfigs/a.search-clustersports-c0-r0-indexer4.cfg
deleted file mode 100644
index 727a5052ed6..00000000000
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/modelconfigs/a.search-clustersports-c0-r0-indexer4.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-include: search/cluster.sports
-c 67
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/modelconfigs/a.vespamodel.cfg b/configserver/src/test/java/com/yahoo/vespa/config/server/modelconfigs/a.vespamodel.cfg
deleted file mode 100644
index f4996027f60..00000000000
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/modelconfigs/a.vespamodel.cfg
+++ /dev/null
@@ -1 +0,0 @@
-model vespa
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/modelconfigs/c.search-clustersports-c0-r0-indexer4.cfg b/configserver/src/test/java/com/yahoo/vespa/config/server/modelconfigs/c.search-clustersports-c0-r0-indexer4.cfg
deleted file mode 100644
index d75d76810f9..00000000000
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/modelconfigs/c.search-clustersports-c0-r0-indexer4.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-foo "bar"
-gaz -78
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/modelconfigs/compositeinclude.search-qrservers-0.cfg b/configserver/src/test/java/com/yahoo/vespa/config/server/modelconfigs/compositeinclude.search-qrservers-0.cfg
deleted file mode 100644
index 7ccdb73eb9a..00000000000
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/modelconfigs/compositeinclude.search-qrservers-0.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-include: search/cluster.logical/*
-include: search/cluster.video/*
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/modelconfigs/recursiveinclude.search-clustermusic-c0-r0.cfg b/configserver/src/test/java/com/yahoo/vespa/config/server/modelconfigs/recursiveinclude.search-clustermusic-c0-r0.cfg
deleted file mode 100644
index 5b07d3a2890..00000000000
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/modelconfigs/recursiveinclude.search-clustermusic-c0-r0.cfg
+++ /dev/null
@@ -1 +0,0 @@
-include: search/cluster.music
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/sdconfigs/a.search-clustermusic.cfg b/configserver/src/test/java/com/yahoo/vespa/config/server/sdconfigs/a.search-clustermusic.cfg
deleted file mode 100644
index f3acd4cf8b9..00000000000
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/sdconfigs/a.search-clustermusic.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-asyncfetchocc 9
-d 3
-kanon -78.56
-
-partialsd "sd"
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/sdconfigs/a.search-clustersports.cfg b/configserver/src/test/java/com/yahoo/vespa/config/server/sdconfigs/a.search-clustersports.cfg
deleted file mode 100644
index 5d8a01a18ea..00000000000
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/sdconfigs/a.search-clustersports.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-d 89
-search[1].feeder[1] "sportsfeeder1"
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/sdconfigs/b.search-clustersports.cfg b/configserver/src/test/java/com/yahoo/vespa/config/server/sdconfigs/b.search-clustersports.cfg
deleted file mode 100644
index f6c35df398d..00000000000
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/sdconfigs/b.search-clustersports.cfg
+++ /dev/null
@@ -1 +0,0 @@
-gaff -89
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/sdconfigs/compositeinclude.search-clusterlogical.cfg b/configserver/src/test/java/com/yahoo/vespa/config/server/sdconfigs/compositeinclude.search-clusterlogical.cfg
deleted file mode 100644
index c3d9b1e45a1..00000000000
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/sdconfigs/compositeinclude.search-clusterlogical.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-classes[1]
-classes[logical].id 1906788747
-classes[logical].name logical
-classes[logical].fields[2]
-classes[logical].fields[0].name sddocnameNAM
-classes[logical].fields[0].type longstring
-classes[logical].fields[1].name title
-classes[logical].fields[1].type longstringSTRIN
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/sdconfigs/compositeinclude.search-clustervideo.cfg b/configserver/src/test/java/com/yahoo/vespa/config/server/sdconfigs/compositeinclude.search-clustervideo.cfg
deleted file mode 100644
index 12a21671b4a..00000000000
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/sdconfigs/compositeinclude.search-clustervideo.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-classes[1]
-classes[music].id 1906788746
-classes[music].name music
-classes[music].fields[2]
-classes[music].fields[0].name sddocnameNAME
-classes[music].fields[0].type longstring
-classes[music].fields[1].name title
-classes[music].fields[1].type longstringSTRING
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/sdconfigs/compositeinclude.search-part-clusterlogical.cfg b/configserver/src/test/java/com/yahoo/vespa/config/server/sdconfigs/compositeinclude.search-part-clusterlogical.cfg
deleted file mode 100644
index 4001c59adbc..00000000000
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/sdconfigs/compositeinclude.search-part-clusterlogical.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-classes[0]
-classes[smallsum614540714].id 614540714
-classes[smallsum614540714].name smallsum
-classes[smallsum614540714].fields[5]
-classes[smallsum614540714].fields[0].name s_13
-classes[smallsum614540714].fields[0].type longstring
-classes[smallsum614540714].fields[1].name ranklog
-classes[smallsum614540714].fields[1].type longstring
-classes[smallsum614540714].fields[2].name rankfeatures
-classes[smallsum614540714].fields[2].type longstring
-classes[smallsum614540714].fields[3].name summaryfeatures
-classes[smallsum614540714].fields[3].type longstring
-classes[smallsum614540714].fields[4].name sddocname
-classes[smallsum614540714].fields[4].type longstring
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/sdconfigs/compositeinclude.search-part-clustervideo.cfg b/configserver/src/test/java/com/yahoo/vespa/config/server/sdconfigs/compositeinclude.search-part-clustervideo.cfg
deleted file mode 100644
index 33d07b99ab6..00000000000
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/sdconfigs/compositeinclude.search-part-clustervideo.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-classes[0]
-classes[smallsum507688128].id 507688128
-classes[smallsum507688128].name smallsum
-classes[smallsum507688128].fields[5]
-classes[smallsum507688128].fields[0].name title
-classes[smallsum507688128].fields[0].type longstring
-classes[smallsum507688128].fields[1].name ranklog
-classes[smallsum507688128].fields[1].type longstring
-classes[smallsum507688128].fields[2].name rankfeatures
-classes[smallsum507688128].fields[2].type longstring
-classes[smallsum507688128].fields[3].name summaryfeatures
-classes[smallsum507688128].fields[3].type longstring
-classes[smallsum507688128].fields[4].name sddocname
-classes[smallsum507688128].fields[4].type longstring
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/sdconfigs/recursiveinclude.search-clustermusic-conf1.4.cfg b/configserver/src/test/java/com/yahoo/vespa/config/server/sdconfigs/recursiveinclude.search-clustermusic-conf1.4.cfg
deleted file mode 100644
index de9fbdd39f4..00000000000
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/sdconfigs/recursiveinclude.search-clustermusic-conf1.4.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-rec 56
-national 77
-ilscript[1]
-ilscript[music].name music
-ilscript[music].doctype music
-ilscript[music].content[1]
-ilscript[music].content[0] "input year | summary s_3 | tokenize \"stemming,normalizing\" { index f_3 | index f_4; };"
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/sdconfigs/recursiveinclude.search-clustermusic-conf2.4.cfg b/configserver/src/test/java/com/yahoo/vespa/config/server/sdconfigs/recursiveinclude.search-clustermusic-conf2.4.cfg
deleted file mode 100644
index e95f976a43a..00000000000
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/sdconfigs/recursiveinclude.search-clustermusic-conf2.4.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-ursive -50
-teatern 78
-ilscript[1]
-ilscript[father].name father
-ilscript[father].doctype father
-ilscript[father].content[6]
-ilscript[father].content[0] "input year | summary s_3 | tokenize \"stemming,normalizing\" { index f_3 | index f_5; };"
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/sdconfigs/recursiveinclude.search-clustermusic.cfg b/configserver/src/test/java/com/yahoo/vespa/config/server/sdconfigs/recursiveinclude.search-clustermusic.cfg
deleted file mode 100644
index cea943d5bc9..00000000000
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/sdconfigs/recursiveinclude.search-clustermusic.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-include: search/cluster.music/conf1.sd.derived
-include: search/cluster.music/conf2.sd.derived
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/userconfigs/a.cfg b/configserver/src/test/java/com/yahoo/vespa/config/server/userconfigs/a.cfg
deleted file mode 100644
index 0bc17bae65e..00000000000
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/userconfigs/a.cfg
+++ /dev/null
@@ -1,18 +0,0 @@
-asyncfetchocc 10
-e 4
-search[2].feeder[1] "bazfeeder"
-search[1].feeder[0] "barfeeder1_1"
-search[1].feeder[3] "barfeeder2_1"
-onlyindef 45
-
-speciallog[0].filehandler.rotation "0 1 ..."
-
-rulebase[4]
-rulebase[0].name "cjk"
-rulebase[0].rules "# Use unicode equivalents in java source:\n#\n# 佳:\u4f73\n# 能:\u80fd\n# 索:\u7d22\n# 尼:\u5c3c\n# 惠:\u60e0\n# 普:\u666e\n\n@default\n\na索 -> 索a;\n\n[brand] -> brand:[brand];\n\n[brand] :- 索尼,惠普,佳能;\n"
-rulebase[1].name "common"
-rulebase[1].rules "## Some test rules\n\n# Spelling correction\nbahc -> bach;\n\n# Stopwords\nsomelongstopword -> ;\n[stopword] -> ;\n[stopword] :- someotherlongstopword, yetanotherstopword;\n\n# \n[song] by [artist] -> song:[song] artist:[artist];\n\n[song] :- together, imagine, tinseltown;\n[artist] :- youngbloods, beatles, zappa;\n\n# Negative\nvarious +> -kingz;\n\n\n"
-rulebase[2].name "egyik"
-rulebase[2].rules "@include(common.sr)\n@automata(/home/vespa/etc/vespa/fsa/stopwords.fsa)\n[stopwords] -> ;\n\n"
-rulebase[3].name "masik"
-rulebase[3].rules "@include(common.sr)\n[stopwords] :- etaoin, shrdlu;\n[stopwords] -> ;\n\n"
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/userconfigs/b.search#cluster.sports#c0#r0#indexer4.cfg b/configserver/src/test/java/com/yahoo/vespa/config/server/userconfigs/b.search#cluster.sports#c0#r0#indexer4.cfg
deleted file mode 100644
index 88b50384058..00000000000
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/userconfigs/b.search#cluster.sports#c0#r0#indexer4.cfg
+++ /dev/null
@@ -1 +0,0 @@
-usercfgwithid 86
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/userconfigs/c.cfg b/configserver/src/test/java/com/yahoo/vespa/config/server/userconfigs/c.cfg
deleted file mode 100644
index b34c4ed311e..00000000000
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/userconfigs/c.cfg
+++ /dev/null
@@ -1 +0,0 @@
-foo "test"
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/userconfigs/d.cfg b/configserver/src/test/java/com/yahoo/vespa/config/server/userconfigs/d.cfg
deleted file mode 100644
index 12c5b53de7d..00000000000
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/userconfigs/d.cfg
+++ /dev/null
@@ -1 +0,0 @@
-theint 34
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/userconfigs/spooler.cfg b/configserver/src/test/java/com/yahoo/vespa/config/server/userconfigs/spooler.cfg
deleted file mode 100644
index 73ed41667f9..00000000000
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/userconfigs/spooler.cfg
+++ /dev/null
@@ -1 +0,0 @@
-keepsuccess true