.gitlab-ci.yml

@@ -49,7 +49,7 @@ Helm Template:
     entrypoint: ["/bin/sh", "-c"]
   script:
     - echo "Templating for Answerfile Container Upload"
-    - helm template . 
+    - helm template . -f testanswers/answers-startup.yml
 
 Kubescore:
   stage: lint

Chart.lock

@@ -1,6 +0,0 @@
-dependencies:
-- name: mailpit
-  repository: https://jouve.github.io/charts
-  version: 0.18.1
-digest: sha256:b98d7b2240c5db92c98e7a05079ef2c0d8522a847cdf4a4cdd25d6c0e02e5f30
-generated: "2024-07-01T15:47:17.121913226+02:00"

Chart.yaml

@@ -1,7 +1,7 @@
 name: testsuite
 apiVersion: v2
-version: 4.0.1-0
-appVersion: 4.0.0-110
+version: 4.0.0-104
+appVersion: 4.0.0-96
 description: The one and only gin-testsuite
 home: https://knecon.com
 icon: https://instantli.com/wp-content/uploads/2018/11/testsuite.png
@@ -12,9 +12,4 @@ maintainers:
     email: lena.maldacker@knecon.com
   - name: Rosario Allegro
     email: rosario.allegro@knecon.com
-dependencies:
-  - name: mailpit
-    version: ~0.18.1
-    repository: https://jouve.github.io/charts
-    condition: mailpit.enabled
 engine: gotpl

templates/testsuite-pod.yaml

@@ -48,6 +48,8 @@ spec:
           value: {{ .Values.basic.runVersion | quote }}
         - name: RUN_CONTROLLER
           value: {{ .Values.basic.runController | quote }}
+        - name: GATEWAY_PORT
+          value: {{ .Values.basic.gatewayPort | quote }}
         - name: RUN_DEBUG_MODE
           value: {{ .Values.basic.runDebugMode | quote }}
         - name: REALM_1
@@ -108,10 +110,6 @@ spec:
           value: {{ .Values.test.config.loadtest.rps | quote }}
         - name: LOADTEST_DURATION
           value: {{ .Values.test.config.loadtest.duration | quote }}
-        - name: DEBUG_FILE
-          value: {{ .Values.test.config.debug.file | quote }}
-        - name: DEBUG_DOSSIER
-          value: {{ .Values.test.config.debug.dossier | quote }}
         - name: INFRA_USER
           value: {{ .Values.test.config.infratest.user | quote }}
         - name: INFRA_PASSWORD
@@ -153,12 +151,14 @@ spec:
           value: {{ .Values.test.config.stats | quote }}
         - name: ENABLE_METRICS
           value: {{ .Values.test.metrics.enabled | quote }}
+        - name: UI_HOST
+          value: "ui-service-v1"
         - name: UI_PORT
           value: {{ .Values.basic.uiPort | quote }}
         - name: UI_HOST
           value: {{ .Values.basic.uiHost | quote }}
         - name: RUN_LOCALLY
-          value: {{ .Values.basic.runLocally | quote }}
+          value: {{ .Values.basic.runLocally | quote }}  
         resources:
           limits:
             cpu: "2000m"
@@ -178,4 +178,4 @@ spec:
             defaultMode: 0400
             secretName: ssh-keys-dvc
       {{- end }}
-{{- end }}
+{{- end }}

templates/testsuite-ui-pod.yaml

@@ -2,7 +2,7 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: testsuite
+  name: testsuite-ui
 spec:
   backoffLimit: 0
   completions: 1
@@ -25,135 +25,6 @@ spec:
       - name: testsuite
         image: "{{ .Values.global.imageRegistry }}/red/testsuite-ui:{{  .Values.global.testsuite_ui.version }}"
         imagePullPolicy: {{ .Values.global.imagePullPolicy }}
-        env:
-        - name: GATEWAY_HOST
-          value: "persistence-service-v1"
-        - name: GATEWAY_PORT
-          value: {{ .Values.basic.gatewayPort | quote }}
-        - name: AUTH_HOST
-          {{- if .Values.basic.keycloakDynamicUrl }}
-          value: "keycloak"
-          {{- else }}
-          value: {{ .Values.basic.keycloakURL | quote }}
-          {{- end }}
-        - name: AUTH_PORT
-          value: {{ .Values.basic.keycloakPort | quote }}
-        - name: TEST_DOC_COUNT
-          value: "19"
-        - name: RUN_LOCALLY
-          value: {{ .Values.basic.runLocally | quote }}
-        - name: RUN_VERSION
-          value: {{ .Values.basic.runVersion | quote }}
-        - name: RUN_CONTROLLER
-          value: {{ .Values.basic.runController | quote }}
-        - name: RUN_DEBUG_MODE
-          value: {{ .Values.basic.runDebugMode | quote }}
-        - name: REALM_1
-          value: {{ .Values.basic.realms.first.realm | quote }}
-        - name: REALM_EMAIL_1
-          value: {{ .Values.basic.realms.first.email | quote }}
-        - name: REALM_PASSWORD_1
-          {{- if .Values.basic.realms.first.existingSecret }}
-          valueFrom:
-            secretKeyRef:
-              name: {{ .Values.basic.realms.first.existingSecret.secretName }}
-              key: {{ .Values.basic.realms.first.existingSecret.secretKey }}
-          {{- else }}
-          value: {{ .Values.basic.realms.first.password | quote }}
-          {{- end }}
-        - name: REALM_2
-          value: {{ .Values.basic.realms.second.realm | quote }}
-        - name: REALM_EMAIL_2
-          value: {{ .Values.basic.realms.second.email | quote }}
-        - name: REALM_PASSWORD_2
-          {{- if .Values.basic.realms.second.existingSecret }}
-          valueFrom:
-            secretKeyRef:
-              name: {{ .Values.basic.realms.second.existingSecret.secretName }}
-              key: {{ .Values.basic.realms.second.existingSecret.secretKey }}
-          {{- else }}
-          value: {{ .Values.basic.realms.second.password | quote }}
-          {{- end }}
-        - name: NEXTCLOUD_USERNAME
-          value: {{ .Values.nextcloud.username | quote }}
-        - name: NEXTCLOUD_PASSWORD
-          value: {{ .Values.nextcloud.password | quote }}
-        - name: NEXTCLOUD_URL
-          value: {{ .Values.nextcloud.url | quote }}
-        - name: NEXUS_USER
-          value: {{ .Values.nexus.user | quote }}
-        - name: NEXUS_PW
-          value: {{ .Values.nexus.pw | quote }}
-        - name: NEXUS_ADDRESS
-          value: {{ .Values.nexus.address | quote }}
-        - name: NEXUS_REPOSITORY
-          value: {{ .Values.nexus.repository | quote }}
-        - name: NEXUS_GROUP
-          value: {{ .Values.nexus.group | quote }}
-        - name: CONTENT_PROCESSING_TIMEOUT
-          value: "10"
-        - name: WARMUP_WAIT_TIME
-          value: {{ .Values.test.config.warmup_wait_time | quote }}
-        - name: DISCOVERY_RETRIES
-          value: {{ .Values.test.config.discovery.retries | quote }}
-        - name: DISCOVERY_TIMEOUT
-          value: {{ .Values.test.config.discovery.timeout | quote }}
-        - name: LOADTEST_USERS
-          value: {{ .Values.test.config.loadtest.users | quote }}
-        - name: LOADTEST_REQUESTS
-          value: {{ .Values.test.config.loadtest.requests | quote }}
-        - name: LOADTEST_RPS
-          value: {{ .Values.test.config.loadtest.rps | quote }}
-        - name: LOADTEST_DURATION
-          value: {{ .Values.test.config.loadtest.duration | quote }}
-        - name: INFRA_USER
-          value: {{ .Values.test.config.infratest.user | quote }}
-        - name: INFRA_PASSWORD
-          {{- if .Values.test.config.infratest.existingSecret }}
-          valueFrom:
-            secretKeyRef:
-              name: {{ .Values.test.config.infratest.existingSecret.secretName }}
-              key: {{ .Values.test.config.infratest.existingSecret.secretKey }}
-          {{- else }}
-          value: {{ .Values.test.config.infratest.password | quote }}
-          {{- end }}
-        - name: INFRA_USERS
-          value: {{ .Values.test.config.infratest.users | quote }}
-        - name: INFRA_ITERATIONS
-          value: {{ .Values.test.config.infratest.iteratons | quote }}
-        - name: INFRA_DURATION_IN_MIN
-          value: {{ .Values.test.config.infratest.duration | quote }}
-        - name: RUN_CLEANUP_AFTER_PERF
-          value: {{ .Values.test.config.performancetest.run_cleanup | quote }}
-        - name: SLEEP_BEFORE_CHECKING_200_FILES_MINUTES
-          value: {{ .Values.test.config.performancetest.wait_time_200_files | quote }}
-        - name: CHECK_TIMEOUT_200_FILES_MINUTES
-          value: {{ .Values.test.config.performancetest.processing_timeout_200_files | quote }}
-        - name: SIGNATURE
-          value: {{ .Values.signature | quote }}
-        - name: SIGNATURE_PW
-          value: {{ .Values.signaturePW | quote }}
-        - name: DVC_ADDRESS
-          value: {{ .Values.dvc.address | quote }}
-        - name: DVC_HOST
-          value: {{ .Values.dvc.host | quote }}
-        - name: DVC_USER
-          value: {{ .Values.dvc.user | quote }}
-        - name: RUN_BURN_MINUTES
-          value: "10"
-        - name: PARSE_BURN_OUTPUT
-          value: "false"
-        - name: STABLE_STATS
-          value: {{ .Values.test.config.stats | quote }}
-        - name: ENABLE_METRICS
-          value: {{ .Values.test.metrics.enabled | quote }}
-        - name: UI_PORT
-          value: {{ .Values.basic.uiPort | quote }}
-        - name: UI_HOST
-          value: {{ .Values.basic.uiHost | quote }}
-        - name: RUN_LOCALLY
-          value: {{ .Values.basic.runLocally | quote }}
-
         resources:
           limits:
             cpu: "2000m"

testanswers/answers-license.yml

@@ -0,0 +1,18 @@
+---
+  basic:
+    runVersion: license_test
+    runController: license_test
+    gatewayPort: 8080
+    keycloakDynamicUrl: true
+    keycloakPort: 443
+    disablePostgres: false
+    runDebugMode: false
+  test:
+    metrics:
+      enabled: false
+    config:
+      content_processing_timeout: '10'
+      warmup_wait_time: '0'
+      discovery:
+        retries: '20'
+        timeout: '20'

testanswers/answers-ui.yml

@@ -0,0 +1,20 @@
+---
+  basic:
+    namespace:
+      server: redaction
+    realms:
+      first:
+        realm: 'redaction'
+        email: 'admin@example.com'
+        password: 'JY9FGedkjL4APfg3qku8CuvwP9R3j5!'
+    gatewayPort: 8080
+    uiPort: 8080
+    uiHost: 'ui-service-v1'
+    keycloakDynamicUrl: true
+    runLocally: false
+  nexus:
+    nexus_user: ''
+    nexus_pw: ''
+    nexus_address: 'https://nexus.knecon.com/'
+    nexus_repository: 'qa-testdata'
+    nexus_group: '/ui'

testanswers/redactmanager/answers-acceptance.yml

@@ -23,7 +23,7 @@
     password: 'Gc2lwTqkTzuRjfdpCiBr3gLHmlXtpb5cPVGokvaJF7g'
     url: 'https://cloud.knecon.com/remote.php/webdav'
   dvc:
-    address: "https://qa:glpat-N49LyscqRkzM-X42Wsca@gitlab.knecon.com/redactmanager/qa/testsuite.git"
+    address: "https://qa:glpat-ykugxhDzKX3hn9rFemHh@gitlab.knecon.com/redactmanager/qa/testsuite.git"
     host: "vector.knecon.com"
     user: "automated-ocr"
     sshKey: |

testanswers/redactmanager/answers-base.yml

@@ -23,7 +23,7 @@
     password: 'Gc2lwTqkTzuRjfdpCiBr3gLHmlXtpb5cPVGokvaJF7g'
     url: 'https://cloud.knecon.com/remote.php/webdav'
   dvc:
-    address: "https://qa:glpat-N49LyscqRkzM-X42Wsca@gitlab.knecon.com/redactmanager/qa/testsuite.git"
+    address: "https://qa:glpat-ykugxhDzKX3hn9rFemHh@gitlab.knecon.com/redactmanager/qa/testsuite.git"
     host: "vector.knecon.com"
     user: "automated-ocr"
     sshKey: |

testanswers/redactmanager/answers-debug.yml

@@ -12,7 +12,7 @@
         email: 'admin@example.com'
         password: 'JY9FGedkjL4APfg3qku8CuvwP9R3j5!'
     runVersion: debug
-    runController: debug
+    runController: security-v2
     gatewayPort: 8080
     keycloakDynamicUrl: true
     keycloakPort: 443
@@ -23,7 +23,7 @@
     password: 'Gc2lwTqkTzuRjfdpCiBr3gLHmlXtpb5cPVGokvaJF7g'
     url: 'https://cloud.knecon.com/remote.php/webdav'
   dvc:
-    address: "https://qa:glpat-N49LyscqRkzM-X42Wsca@gitlab.knecon.com/redactmanager/qa/testsuite.git"
+    address: "https://qa:glpat-ykugxhDzKX3hn9rFemHh@gitlab.knecon.com/redactmanager/qa/testsuite.git"
     host: "vector.knecon.com"
     user: "automated-ocr"
     sshKey: |
@@ -81,6 +81,3 @@
         duration: '10'
       smoketest:
         warmupWaitTime: '30'
-      debug:
-        file: 'huge/Rules_File_500MB.pdf'
-        dossier: 'performance_project_huge'

testanswers/redactmanager/answers-failing.yml

@@ -23,7 +23,7 @@
     password: 'Gc2lwTqkTzuRjfdpCiBr3gLHmlXtpb5cPVGokvaJF7g'
     url: 'https://cloud.knecon.com/remote.php/webdav'
   dvc:
-    address: "https://qa:glpat-N49LyscqRkzM-X42Wsca@gitlab.knecon.com/redactmanager/qa/testsuite.git"
+    address: "https://qa:glpat-ykugxhDzKX3hn9rFemHh@gitlab.knecon.com/redactmanager/qa/testsuite.git"
     host: "vector.knecon.com"
     user: "automated-ocr"
     sshKey: |

testanswers/redactmanager/answers-function.yml

@@ -23,7 +23,7 @@
     password: 'Gc2lwTqkTzuRjfdpCiBr3gLHmlXtpb5cPVGokvaJF7g'
     url: 'https://cloud.knecon.com/remote.php/webdav'
   dvc:
-    address: "https://qa:glpat-N49LyscqRkzM-X42Wsca@gitlab.knecon.com/redactmanager/qa/testsuite.git"
+    address: "https://qa:glpat-ykugxhDzKX3hn9rFemHh@gitlab.knecon.com/redactmanager/qa/testsuite.git"
     host: "vector.knecon.com"
     user: "automated-ocr"
     sshKey: |

testanswers/redactmanager/answers-infra1.yml

@@ -21,7 +21,7 @@
     password: 'Gc2lwTqkTzuRjfdpCiBr3gLHmlXtpb5cPVGokvaJF7g'
     url: 'https://cloud.knecon.com/remote.php/webdav'
   dvc:
-    address: "https://qa:glpat-N49LyscqRkzM-X42Wsca@gitlab.knecon.com/redactmanager/qa/testsuite.git"
+    address: "https://qa:glpat-ykugxhDzKX3hn9rFemHh@gitlab.knecon.com/redactmanager/qa/testsuite.git"
     host: "vector.knecon.com"
     user: "automated-ocr"
     sshKey: |

testanswers/redactmanager/answers-infra2.yml

@@ -23,7 +23,7 @@
     password: 'Gc2lwTqkTzuRjfdpCiBr3gLHmlXtpb5cPVGokvaJF7g'
     url: 'https://cloud.knecon.com/remote.php/webdav'
   dvc:
-    address: "https://qa:glpat-N49LyscqRkzM-X42Wsca@gitlab.knecon.com/redactmanager/qa/testsuite.git"
+    address: "https://qa:glpat-ykugxhDzKX3hn9rFemHh@gitlab.knecon.com/redactmanager/qa/testsuite.git"
     host: "vector.knecon.com"
     user: "automated-ocr"
     sshKey: |

testanswers/redactmanager/answers-load.yml

@@ -19,7 +19,7 @@
     password: 'Gc2lwTqkTzuRjfdpCiBr3gLHmlXtpb5cPVGokvaJF7g'
     url: 'https://cloud.knecon.com/remote.php/webdav'
   dvc:
-    address: "https://qa:glpat-N49LyscqRkzM-X42Wsca@gitlab.knecon.com/redactmanager/qa/testsuite.git"
+    address: "https://qa:glpat-ykugxhDzKX3hn9rFemHh@gitlab.knecon.com/redactmanager/qa/testsuite.git"
     host: "vector.knecon.com"
     user: "automated-ocr"
     sshKey: |

testanswers/redactmanager/answers-openshift.yml

@@ -20,7 +20,7 @@
     disablePostgres: false
     runDebugMode: false
   dvc:
-    address: "https://qa:glpat-N49LyscqRkzM-X42Wsca@gitlab.knecon.com/redactmanager/qa/testsuite.git"
+    address: "https://qa:glpat-ykugxhDzKX3hn9rFemHh@gitlab.knecon.com/redactmanager/qa/testsuite.git"
     host: "vector.knecon.com"
     user: "automated-ocr"
     sshKey: |

testanswers/redactmanager/answers-performance-aks.yml

@@ -22,7 +22,7 @@
     disablePostgres: false
     runDebugMode: true
   dvc:
-    address: "https://qa:glpat-N49LyscqRkzM-X42Wsca@gitlab.knecon.com/redactmanager/qa/testsuite.git"
+    address: "https://qa:glpat-ykugxhDzKX3hn9rFemHh@gitlab.knecon.com/redactmanager/qa/testsuite.git"
     host: "vector.knecon.com"
     user: "automated-ocr"
     sshKey: |

testanswers/redactmanager/answers-performance.yml

@@ -27,7 +27,7 @@
         run_cleanup: true
 
   dvc:
-    address: "https://qa:glpat-N49LyscqRkzM-X42Wsca@gitlab.knecon.com/redactmanager/qa/testsuite.git"
+    address: "https://qa:glpat-ykugxhDzKX3hn9rFemHh@gitlab.knecon.com/redactmanager/qa/testsuite.git"
     host: "vector.knecon.com"
     user: "automated-ocr"
     sshKey: |

testanswers/redactmanager/answers-scm.yml

@@ -14,7 +14,7 @@
     password: 'Gc2lwTqkTzuRjfdpCiBr3gLHmlXtpb5cPVGokvaJF7g!'
     url: 'https://cloud.knecon.com/remote.php/webdav'
   dvc:
-    address: "https://qa:glpat-N49LyscqRkzM-X42Wsca@gitlab.knecon.com/redactmanager/qa/testsuite.git"
+    address: "https://qa:glpat-ykugxhDzKX3hn9rFemHh@gitlab.knecon.com/redactmanager/qa/testsuite.git"
     host: "vector.knecon.com"
     user: "automated-ocr"
     sshKey: |

testanswers/redactmanager/answers-security.yml

@@ -23,7 +23,7 @@
     password: 'Gc2lwTqkTzuRjfdpCiBr3gLHmlXtpb5cPVGokvaJF7g'
     url: 'https://cloud.knecon.com/remote.php/webdav'
   dvc:
-    address: "https://qa:glpat-N49LyscqRkzM-X42Wsca@gitlab.knecon.com/redactmanager/qa/testsuite.git"
+    address: "https://qa:glpat-ykugxhDzKX3hn9rFemHh@gitlab.knecon.com/redactmanager/qa/testsuite.git"
     host: "vector.knecon.com"
     user: "automated-ocr"
     sshKey: |

testanswers/redactmanager/answers-smoke.yml

@@ -23,7 +23,7 @@
     password: 'Gc2lwTqkTzuRjfdpCiBr3gLHmlXtpb5cPVGokvaJF7g'
     url: 'https://cloud.knecon.com/remote.php/webdav'
   dvc:
-    address: "https://qa:glpat-N49LyscqRkzM-X42Wsca@gitlab.knecon.com/redactmanager/qa/testsuite.git"
+    address: "https://qa:glpat-ykugxhDzKX3hn9rFemHh@gitlab.knecon.com/redactmanager/qa/testsuite.git"
     host: "vector.knecon.com"
     user: "automated-ocr"
     sshKey: |

testanswers/redactmanager/answers-startup.yml

@@ -19,7 +19,7 @@
     password: 'Gc2lwTqkTzuRjfdpCiBr3gLHmlXtpb5cPVGokvaJF7g'
     url: 'https://cloud.knecon.com/remote.php/webdav'
   dvc:
-    address: "https://qa:glpat-N49LyscqRkzM-X42Wsca@gitlab.knecon.com/redactmanager/qa/testsuite.git"
+    address: "https://qa:glpat-ykugxhDzKX3hn9rFemHh@gitlab.knecon.com/redactmanager/qa/testsuite.git"
     host: "vector.knecon.com"
     user: "automated-ocr"
     sshKey: |

testanswers/redactmanager/answers-ui.yml

@@ -2,6 +2,7 @@
   global:
     testsuite_ui:
       enabled: true
+      version: 0.3.0
   basic:
     namespace:
       server: redaction
@@ -10,11 +11,13 @@
         realm: 'redaction'
         email: 'admin@example.com'
         password: 'JY9FGedkjL4APfg3qku8CuvwP9R3j5!'
+    gatewayPort: 8080
     uiPort: 8080
-    uiHost: 'ui-service'
+    uiExternAddress: 'https://ui-test.iqser.cloud/ui/'
+    keycloakDynamicUrl: true
   nexus:
     user: 'automated-tests'
     pw: '58&bSTwaSDzsMW4K'
     address: 'https://nexus.knecon.com/'
     repository: 'qa-testdata'
-    group: '/ui'
+    group: '/ui-test-file'

values.yaml

@@ -6,7 +6,7 @@
     imagePullPolicy: Always
     testsuite_ui:
       enabled: false
-      version: 0.8.0
+      version: 0.3.0
 
   basic:
     realms:
@@ -81,10 +81,4 @@
       performancetest:
         wait_time_200_files: '10'
         processing_timeout_200_files: '50'
-        run_cleanup: true
-      debug:
-        file: 'huge/Rules_File_500MB.pdf'
-        dossier: 'performance_project_huge'
-
-  mailpit:
-    enabled: false
+        run_cleanup: true