Merge pull request #4191 from vespa-engine/hmusum/wait-longer-2

Wait longer for services to come up
vespa-engine · Sep 6, 2024 · 03378d1 · 03378d1
2 parents 8e44c33 + f2d6dae
commit 03378d1
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/tests/search/embedding/embedding.rb b/tests/search/embedding/embedding.rb
@@ -87,7 +87,7 @@ def test_default_embedding
         sd(selfdir + 'app_one_embedder/schemas/doc.sd').
         components_dir(selfdir + 'app_one_embedder/model').
         indexing_cluster('default').indexing_chain('indexing'))
-    start
+    start_vespa
     feed_and_wait_for_docs("doc", 1, :file => selfdir + "docs.json")
     verify_default_embedder
   end
@@ -102,7 +102,7 @@ def test_embedding
         sd(selfdir + 'app_two_embedders/schemas/doc.sd').
         components_dir(selfdir + 'app_two_embedders/model').
         indexing_cluster('default').indexing_chain('indexing'))
-    start
+    start_vespa
     feed_and_wait_for_docs("doc", 1, :file => selfdir + "docs.json")
     verify_tokens
     verify_embedding
@@ -118,7 +118,7 @@ def test_huggingface_embedding
             jvmoptions('-Xms4g -Xmx4g')).
         sd(selfdir + 'app_huggingface_embedder/schemas/doc.sd').
         indexing_cluster('default').indexing_chain('indexing'))
-    start
+    start_vespa
     feed_and_wait_for_docs("doc", 1, :file => selfdir + "docs.json")
     verify_huggingface_tokens
     verify_huggingface_embedding
@@ -133,7 +133,7 @@ def test_huggingface_embedding_binary_quantization
             jvmoptions('-Xms4g -Xmx4g')).
         sd(selfdir + 'app_huggingface_embedder_binarization_matryoshka/schemas/doc.sd').
         indexing_cluster('default').indexing_chain('indexing'))
-    start
+    start_vespa
     feed_and_wait_for_docs("doc", 1, :file => selfdir + "docs.json")
     verify_huggingface_embedding_binary_quantization
   end
@@ -147,7 +147,7 @@ def test_colbert_embedding
             jvmoptions('-Xms4g -Xmx4g')).
         sd(selfdir + 'app_colbert_embedder/schemas/doc.sd').
         indexing_cluster('default').indexing_chain('indexing'))
-    start
+    start_vespa
     feed_and_wait_for_docs("doc", 1, :file => selfdir + "docs.json")
     verify_colbert_embedding
   end
@@ -161,7 +161,7 @@ def test_colbert_embedding_fp16
             jvmoptions('-Xms4g -Xmx4g')).
         sd(selfdir + 'app_colbert_embedder_fp16/schemas/doc.sd').
         indexing_cluster('default').indexing_chain('indexing'))
-    start
+    start_vespa
     feed_and_wait_for_docs("doc", 1, :file => selfdir + "docs.json")
     verify_colbert_embedding_fp16
   end
@@ -175,7 +175,7 @@ def test_colbert_multivector_embedding
             jvmoptions('-Xms4g -Xmx4g')).
         sd(selfdir + 'app_colbert_multivector_embedder/schemas/doc.sd').
         indexing_cluster('default').indexing_chain('indexing'))
-    start
+    start_vespa
     feed_and_wait_for_docs("doc", 1, :file => selfdir + "multivector-docs.json")
     verify_colbert_multivector_embedding
   end
@@ -190,7 +190,7 @@ def test_splade_embedding
         sd(selfdir + 'app_splade_embedder/schemas/doc.sd').
         components_dir(selfdir + 'app_splade_embedder/models').
         indexing_cluster('default').indexing_chain('indexing'))
-    start
+    start_vespa
     feed_and_wait_for_docs("doc", 1, :file => selfdir + "docs.json")
     verify_splade_embedding
   end
@@ -205,7 +205,7 @@ def test_splade_multivector_embedding
         sd(selfdir + 'app_splade_multivector_embedder/schemas/doc.sd').
         components_dir(selfdir + 'app_splade_embedder/models').
         indexing_cluster('default').indexing_chain('indexing'))
-    start
+    start_vespa
     feed_and_wait_for_docs("doc", 1, :file => selfdir + "multivector-docs.json")
     verify_splade_multivector_embedding
   end
@@ -429,6 +429,10 @@ def verify_splade_multivector_embedding
     assert(relevance > 0, "#{relevance} is 0, which is not expected.")
   end
 
+  def start_vespa
+    start(300) # Wait longer than default, download of models sometimes takes > 3 minutes
+  end
+
   def teardown
     stop
   end