From 5ee0eb89c7072662a2660cfcf0bc2e83156d1cc8 Mon Sep 17 00:00:00 2001 From: John Lambert Date: Sat, 14 Oct 2023 15:49:24 -0400 Subject: [PATCH] update k8s with most recent docker builds Break out slow E2E tests so fast E2E tests can be run in VSCode easily --- deploy/qa-ext-values.yaml | 6 ++--- deploy/qa-int-values.yaml | 6 ++--- deploy/values.yaml | 6 ++--- tests/Serval.E2ETests/ServalApiSlowTests.cs | 26 +++++++++++++++++++++ tests/Serval.E2ETests/ServalApiTests.cs | 12 ---------- 5 files changed, 35 insertions(+), 21 deletions(-) create mode 100644 tests/Serval.E2ETests/ServalApiSlowTests.cs diff --git a/deploy/qa-ext-values.yaml b/deploy/qa-ext-values.yaml index 90cc16ce..6c3270a4 100644 --- a/deploy/qa-ext-values.yaml +++ b/deploy/qa-ext-values.yaml @@ -5,9 +5,9 @@ namespace: serval auth0Domain: dev-sillsdev.auth0.com lokiTenent: serval-tenant lokiUrl: http://loki-distributed-gateway.loki.svc.cluster.local -servalImage: ghcr.io/sillsdev/serval:0.7.1 -machineImage: ghcr.io/sillsdev/machine:3.3.2 -ClearMLDockerImage: ghcr.io/sillsdev/machine.py:0.9.5 +servalImage: ghcr.io/sillsdev/serval:0.8.0 +machineImage: ghcr.io/sillsdev/machine:3.4.0 +ClearMLDockerImage: ghcr.io/sillsdev/machine.py:0.9.6.2 ClearMLQueue: lambert_24gb SharedFileLocation: s3://aqua-ml-data/ext-qa/ enableEcho: true \ No newline at end of file diff --git a/deploy/qa-int-values.yaml b/deploy/qa-int-values.yaml index 091494ee..692bd2f6 100644 --- a/deploy/qa-int-values.yaml +++ b/deploy/qa-int-values.yaml @@ -5,9 +5,9 @@ namespace: nlp auth0Domain: sil-appbuilder.auth0.com lokiTenent: nlp-tenant lokiUrl: http://loki-distributed-gateway.loki.svc.cluster.local -servalImage: ghcr.io/sillsdev/serval:0.7.1 -machineImage: ghcr.io/sillsdev/machine:3.3.2 -ClearMLDockerImage: ghcr.io/sillsdev/machine.py:0.9.5 +servalImage: ghcr.io/sillsdev/serval:0.8.0 +machineImage: ghcr.io/sillsdev/machine:3.4.0 +ClearMLDockerImage: ghcr.io/sillsdev/machine.py:0.9.6.2 ClearMLQueue: lambert_24gb SharedFileLocation: s3://aqua-ml-data/int-qa/ enableEcho: true \ No newline at end of file diff --git a/deploy/values.yaml b/deploy/values.yaml index 14f328b5..f8175f59 100644 --- a/deploy/values.yaml +++ b/deploy/values.yaml @@ -5,9 +5,9 @@ namespace: serval auth0Domain: languagetechnology.auth0.com lokiTenent: nlp-tenant lokiUrl: http://loki-distributed-gateway.loki.svc.cluster.local -servalImage: ghcr.io/sillsdev/serval:0.7.1 -machineImage: ghcr.io/sillsdev/machine:3.3.2 -ClearMLDockerImage: ghcr.io/sillsdev/machine.py:0.9.5 +servalImage: ghcr.io/sillsdev/serval:0.8.0 +machineImage: ghcr.io/sillsdev/machine:3.4.0 +ClearMLDockerImage: ghcr.io/sillsdev/machine.py:0.9.6.2 ClearMLQueue: production SharedFileLocation: s3://aqua-ml-data/production/ enableEcho: true \ No newline at end of file diff --git a/tests/Serval.E2ETests/ServalApiSlowTests.cs b/tests/Serval.E2ETests/ServalApiSlowTests.cs new file mode 100644 index 00000000..11babee2 --- /dev/null +++ b/tests/Serval.E2ETests/ServalApiSlowTests.cs @@ -0,0 +1,26 @@ +namespace Serval.E2ETests; + +[TestFixture] +[Category("E2E")] +[Category("slow")] +public class ServalApiSlowTests +{ + private ServalClientHelper? _helperClient; + + [SetUp] + public void SetUp() + { + _helperClient = new ServalClientHelper("https://machine.sil.org", ignoreSSLErrors: true); + } + + [Test] + public async Task GetSmtWholeBible() + { + await _helperClient!.ClearEngines(); + string engineId = await _helperClient.CreateNewEngine("SmtTransfer", "es", "en", "SMT2"); + await _helperClient.AddTextCorpusToEngine(engineId, new string[] { "bible.txt" }, "es", "en", false); + await _helperClient.BuildEngine(engineId); + TranslationResult tResult = await _helperClient.translationEnginesClient.TranslateAsync(engineId, "Espíritu"); + Assert.AreEqual(tResult.Translation, "Spirit"); + } +} diff --git a/tests/Serval.E2ETests/ServalApiTests.cs b/tests/Serval.E2ETests/ServalApiTests.cs index 06b1f1c1..1a6bf62d 100644 --- a/tests/Serval.E2ETests/ServalApiTests.cs +++ b/tests/Serval.E2ETests/ServalApiTests.cs @@ -54,18 +54,6 @@ public async Task GetSmtTranslation() Assert.AreEqual(tResult.Translation, "spirit"); } - [Test] - [Category("slow")] - public async Task GetSmtWholeBible() - { - await _helperClient!.ClearEngines(); - string engineId = await _helperClient.CreateNewEngine("SmtTransfer", "es", "en", "SMT2"); - await _helperClient.AddTextCorpusToEngine(engineId, new string[] { "bible.txt" }, "es", "en", false); - await _helperClient.BuildEngine(engineId); - TranslationResult tResult = await _helperClient.translationEnginesClient.TranslateAsync(engineId, "Espíritu"); - Assert.AreEqual(tResult.Translation, "Spirit"); - } - [Test] public async Task GetSmtAddSegment() {