From 32040d382207d5f43f1f6df6891132c7990a302c Mon Sep 17 00:00:00 2001 From: pmacius Date: Tue, 26 Nov 2024 17:18:08 +0100 Subject: [PATCH 1/6] OPSEXP-2943 Add audit storage dtas tests --- helm/alfresco-content-services/README.md | 4 +++- helm/alfresco-content-services/values.yaml | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/helm/alfresco-content-services/README.md b/helm/alfresco-content-services/README.md index aed09fe3f..84234df5e 100644 --- a/helm/alfresco-content-services/README.md +++ b/helm/alfresco-content-services/README.md @@ -222,6 +222,8 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b | database.url | string | `nil` | External Postgresql jdbc url ex: `jdbc:postgresql://oldfashioned-mule-postgresql-acs:5432/alfresco` | | database.user | string | `nil` | External Postgresql database user | | dtas.additionalArgs[0] | string | `"--tb=short"` | | +| dtas.config.assertions.aas.audit_host | string | `"http://acs-alfresco-audit-storage:8081"` | | +| dtas.config.assertions.aas.search_audit_host | string | `"http://elasticsearch-aas-master:9200"` | | | dtas.config.assertions.acs.edition | string | `"Enterprise"` | | | dtas.config.assertions.acs.identity | bool | `false` | | | dtas.config.assertions.acs.modules[0].id | string | `"org.alfresco.integrations.google.docs"` | | @@ -238,7 +240,7 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b | dtas.enabled | bool | `false` | Enables the deployment test suite which can run via `helm test` (currently available for Enterprise only) | | dtas.image.pullPolicy | string | `"IfNotPresent"` | | | dtas.image.repository | string | `"quay.io/alfresco/alfresco-deployment-test-automation-scripts"` | | -| dtas.image.tag | string | `"v1.5.5"` | | +| dtas.image.tag | string | `"pr-163"` | | | elasticsearch-audit.clusterHealthCheckParams | string | `"wait_for_status=yellow&timeout=1s"` | | | elasticsearch-audit.clusterName | string | `"elasticsearch-aas"` | | | elasticsearch-audit.enabled | bool | `true` | Enables the embedded elasticsearch cluster for alfresco-audit-storage | diff --git a/helm/alfresco-content-services/values.yaml b/helm/alfresco-content-services/values.yaml index 45634a988..bfc2ffe70 100644 --- a/helm/alfresco-content-services/values.yaml +++ b/helm/alfresco-content-services/values.yaml @@ -637,7 +637,7 @@ dtas: enabled: false image: repository: quay.io/alfresco/alfresco-deployment-test-automation-scripts - tag: v1.5.5 + tag: pr-163 pullPolicy: IfNotPresent additionalArgs: - --tb=short @@ -660,6 +660,9 @@ dtas: installed: true adw: base_path: "/workspace" + aas: + audit_host: http://acs-alfresco-audit-storage:8081 + search_audit_host: http://elasticsearch-aas-master:9200 keda: # -- The list of components that will be scaled by KEDA (chart names) components: [] From dff258506f597b53a0bf5b0f006614ac4bda90ee Mon Sep 17 00:00:00 2001 From: pmacius Date: Wed, 27 Nov 2024 09:33:42 +0100 Subject: [PATCH 2/6] run to use new image From 3cf1bd482f9583c211773279b8521b8db9636d66 Mon Sep 17 00:00:00 2001 From: pmacius Date: Wed, 27 Nov 2024 10:25:26 +0100 Subject: [PATCH 3/6] test --- helm/alfresco-content-services/README.md | 2 +- helm/alfresco-content-services/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/helm/alfresco-content-services/README.md b/helm/alfresco-content-services/README.md index 84234df5e..c91122c0a 100644 --- a/helm/alfresco-content-services/README.md +++ b/helm/alfresco-content-services/README.md @@ -240,7 +240,7 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b | dtas.enabled | bool | `false` | Enables the deployment test suite which can run via `helm test` (currently available for Enterprise only) | | dtas.image.pullPolicy | string | `"IfNotPresent"` | | | dtas.image.repository | string | `"quay.io/alfresco/alfresco-deployment-test-automation-scripts"` | | -| dtas.image.tag | string | `"pr-163"` | | +| dtas.image.tag | string | `"v1.5.5"` | | | elasticsearch-audit.clusterHealthCheckParams | string | `"wait_for_status=yellow&timeout=1s"` | | | elasticsearch-audit.clusterName | string | `"elasticsearch-aas"` | | | elasticsearch-audit.enabled | bool | `true` | Enables the embedded elasticsearch cluster for alfresco-audit-storage | diff --git a/helm/alfresco-content-services/values.yaml b/helm/alfresco-content-services/values.yaml index bfc2ffe70..ca90713ef 100644 --- a/helm/alfresco-content-services/values.yaml +++ b/helm/alfresco-content-services/values.yaml @@ -637,7 +637,7 @@ dtas: enabled: false image: repository: quay.io/alfresco/alfresco-deployment-test-automation-scripts - tag: pr-163 + tag: v1.5.5 pullPolicy: IfNotPresent additionalArgs: - --tb=short From c3def733f639c97f7771633977c7a89ad583ced8 Mon Sep 17 00:00:00 2001 From: pmacius Date: Wed, 27 Nov 2024 10:26:36 +0100 Subject: [PATCH 4/6] test --- helm/alfresco-content-services/README.md | 2 +- helm/alfresco-content-services/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/helm/alfresco-content-services/README.md b/helm/alfresco-content-services/README.md index c91122c0a..84234df5e 100644 --- a/helm/alfresco-content-services/README.md +++ b/helm/alfresco-content-services/README.md @@ -240,7 +240,7 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b | dtas.enabled | bool | `false` | Enables the deployment test suite which can run via `helm test` (currently available for Enterprise only) | | dtas.image.pullPolicy | string | `"IfNotPresent"` | | | dtas.image.repository | string | `"quay.io/alfresco/alfresco-deployment-test-automation-scripts"` | | -| dtas.image.tag | string | `"v1.5.5"` | | +| dtas.image.tag | string | `"pr-163"` | | | elasticsearch-audit.clusterHealthCheckParams | string | `"wait_for_status=yellow&timeout=1s"` | | | elasticsearch-audit.clusterName | string | `"elasticsearch-aas"` | | | elasticsearch-audit.enabled | bool | `true` | Enables the embedded elasticsearch cluster for alfresco-audit-storage | diff --git a/helm/alfresco-content-services/values.yaml b/helm/alfresco-content-services/values.yaml index ca90713ef..bfc2ffe70 100644 --- a/helm/alfresco-content-services/values.yaml +++ b/helm/alfresco-content-services/values.yaml @@ -637,7 +637,7 @@ dtas: enabled: false image: repository: quay.io/alfresco/alfresco-deployment-test-automation-scripts - tag: v1.5.5 + tag: pr-163 pullPolicy: IfNotPresent additionalArgs: - --tb=short From e658b0ef04c53a2ed21c72f40097f31d20085dad Mon Sep 17 00:00:00 2001 From: pmacius Date: Thu, 28 Nov 2024 09:38:27 +0100 Subject: [PATCH 5/6] test --- helm/alfresco-content-services/README.md | 2 +- helm/alfresco-content-services/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/helm/alfresco-content-services/README.md b/helm/alfresco-content-services/README.md index 84234df5e..394726943 100644 --- a/helm/alfresco-content-services/README.md +++ b/helm/alfresco-content-services/README.md @@ -223,7 +223,7 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b | database.user | string | `nil` | External Postgresql database user | | dtas.additionalArgs[0] | string | `"--tb=short"` | | | dtas.config.assertions.aas.audit_host | string | `"http://acs-alfresco-audit-storage:8081"` | | -| dtas.config.assertions.aas.search_audit_host | string | `"http://elasticsearch-aas-master:9200"` | | +| dtas.config.assertions.aas.elasticsearch_host | string | `"http://elasticsearch-aas-master:9200"` | | | dtas.config.assertions.acs.edition | string | `"Enterprise"` | | | dtas.config.assertions.acs.identity | bool | `false` | | | dtas.config.assertions.acs.modules[0].id | string | `"org.alfresco.integrations.google.docs"` | | diff --git a/helm/alfresco-content-services/values.yaml b/helm/alfresco-content-services/values.yaml index bfc2ffe70..6304c1e0e 100644 --- a/helm/alfresco-content-services/values.yaml +++ b/helm/alfresco-content-services/values.yaml @@ -662,7 +662,7 @@ dtas: base_path: "/workspace" aas: audit_host: http://acs-alfresco-audit-storage:8081 - search_audit_host: http://elasticsearch-aas-master:9200 + elasticsearch_host: http://elasticsearch-aas-master:9200 keda: # -- The list of components that will be scaled by KEDA (chart names) components: [] From 899e2e2b91f7fa371ab705424ce25c6044900c78 Mon Sep 17 00:00:00 2001 From: pmacius Date: Fri, 29 Nov 2024 10:46:22 +0100 Subject: [PATCH 6/6] add main version --- helm/alfresco-content-services/README.md | 2 +- helm/alfresco-content-services/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/helm/alfresco-content-services/README.md b/helm/alfresco-content-services/README.md index 394726943..d7f69ef92 100644 --- a/helm/alfresco-content-services/README.md +++ b/helm/alfresco-content-services/README.md @@ -240,7 +240,7 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b | dtas.enabled | bool | `false` | Enables the deployment test suite which can run via `helm test` (currently available for Enterprise only) | | dtas.image.pullPolicy | string | `"IfNotPresent"` | | | dtas.image.repository | string | `"quay.io/alfresco/alfresco-deployment-test-automation-scripts"` | | -| dtas.image.tag | string | `"pr-163"` | | +| dtas.image.tag | string | `"v1.6.0"` | | | elasticsearch-audit.clusterHealthCheckParams | string | `"wait_for_status=yellow&timeout=1s"` | | | elasticsearch-audit.clusterName | string | `"elasticsearch-aas"` | | | elasticsearch-audit.enabled | bool | `true` | Enables the embedded elasticsearch cluster for alfresco-audit-storage | diff --git a/helm/alfresco-content-services/values.yaml b/helm/alfresco-content-services/values.yaml index 6304c1e0e..6f8bb2a5d 100644 --- a/helm/alfresco-content-services/values.yaml +++ b/helm/alfresco-content-services/values.yaml @@ -637,7 +637,7 @@ dtas: enabled: false image: repository: quay.io/alfresco/alfresco-deployment-test-automation-scripts - tag: pr-163 + tag: v1.6.0 pullPolicy: IfNotPresent additionalArgs: - --tb=short