From d7f3f351ec73ad09dedc52716e414339f4865835 Mon Sep 17 00:00:00 2001 From: Yannik Hampe Date: Fri, 8 Mar 2024 12:43:29 +0100 Subject: [PATCH] proof of concept: use git lfs to store customer files --- .gitlab-ci.yml | 2 ++ .gitmodules | 8 ++++++++ .../redaction/v1/server/RedactionAcceptanceTest.java | 4 ++-- .../src/test/resources/files/basf | 1 + .../src/test/resources/files/syngenta | 1 + 5 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 .gitmodules create mode 160000 redaction-service-v1/redaction-service-server-v1/src/test/resources/files/basf create mode 160000 redaction-service-v1/redaction-service-server-v1/src/test/resources/files/syngenta diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 47ad3fcc..2955afc9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,7 @@ variables: SONAR_PROJECT_KEY: 'RED_redaction-service' + GIT_SUBMODULE_STRATEGY: recursive + GIT_SUBMODULE_FORCE_HTTPS: "true" include: - project: 'gitlab/gitlab' ref: 'main' diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..e850a5df --- /dev/null +++ b/.gitmodules @@ -0,0 +1,8 @@ +[submodule "redaction-service-v1/redaction-service-server-v1/src/test/resources/files/syngenta"] + path = redaction-service-v1/redaction-service-server-v1/src/test/resources/files/syngenta + url = ssh://git@git.knecon.com:22222/fforesight/documents/syngenta.git + update = merge +[submodule "redaction-service-v1/redaction-service-server-v1/src/test/resources/files/basf"] + path = redaction-service-v1/redaction-service-server-v1/src/test/resources/files/basf + url = ssh://git@git.knecon.com:22222/fforesight/documents/basf.git + update = merge diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionAcceptanceTest.java b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionAcceptanceTest.java index abb738de..43f83f24 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionAcceptanceTest.java +++ b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionAcceptanceTest.java @@ -126,7 +126,7 @@ public class RedactionAcceptanceTest extends AbstractRedactionIntegrationTest { @Test public void acceptanceTests() throws IOException { - AnalyzeRequest request = uploadFileToStorage("files/new/SYNGENTA_EFSA_sanitisation_GFL_v1_moreSections.pdf"); + AnalyzeRequest request = uploadFileToStorage("files/syngenta/CustomerFiles/SYNGENTA_EFSA_sanitisation_GFL_v1_moreSections.pdf"); System.out.println("Start Full integration test"); analyzeDocumentStructure(LayoutParsingType.REDACT_MANAGER, request); System.out.println("Finished structure analysis"); @@ -190,7 +190,7 @@ public class RedactionAcceptanceTest extends AbstractRedactionIntegrationTest { @Test public void noEndlessLoopsTest() { - AnalyzeRequest request = uploadFileToStorage("files/new/SYNGENTA_EFSA_sanitisation_GFL_v1_moreSections.pdf"); + AnalyzeRequest request = uploadFileToStorage("files/syngenta/CustomerFiles/SYNGENTA_EFSA_sanitisation_GFL_v1_moreSections.pdf"); System.out.println("Start Full integration test"); analyzeDocumentStructure(LayoutParsingType.REDACT_MANAGER, request); System.out.println("Finished structure analysis"); diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/basf b/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/basf new file mode 160000 index 00000000..fd99b2ed --- /dev/null +++ b/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/basf @@ -0,0 +1 @@ +Subproject commit fd99b2ed29dcb11d8beb16bdedc7a393f73d1ae0 diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/syngenta b/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/syngenta new file mode 160000 index 00000000..d76c2fe2 --- /dev/null +++ b/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/syngenta @@ -0,0 +1 @@ +Subproject commit d76c2fe273c27e3beea0b94e56f8821b1f715985