From b9e30fd5d5b5b4911610fdf0b43bf7ea4cd3986d Mon Sep 17 00:00:00 2001 From: Giovanni Toraldo Date: Thu, 16 Nov 2023 11:11:16 +0100 Subject: [PATCH 01/22] Test large runners --- .github/workflows/helm-community.yml | 2 +- .github/workflows/helm-enterprise.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/helm-community.yml b/.github/workflows/helm-community.yml index 6481d9516..591201194 100644 --- a/.github/workflows/helm-community.yml +++ b/.github/workflows/helm-community.yml @@ -20,7 +20,7 @@ concurrency: cancel-in-progress: true jobs: community_charts: - runs-on: [self-hosted] + runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/helm-enterprise.yml b/.github/workflows/helm-enterprise.yml index 02e03a610..8eb40ce09 100644 --- a/.github/workflows/helm-enterprise.yml +++ b/.github/workflows/helm-enterprise.yml @@ -57,7 +57,7 @@ jobs: echo "json=$CHARTS" >> $GITHUB_OUTPUT helm_integration: - runs-on: [self-hosted] + runs-on: alfrescoPub-ubuntu2204-16G-4CPU needs: - build_vars name: Helm ${{ matrix.name }} ${{ matrix.values }} From 17bae2ce2980a26f7a1febf288d69d450c6f27e5 Mon Sep 17 00:00:00 2001 From: Giovanni Toraldo Date: Thu, 16 Nov 2023 14:22:59 +0100 Subject: [PATCH 02/22] set on larger runners --- .github/workflows/helm-enterprise.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/helm-enterprise.yml b/.github/workflows/helm-enterprise.yml index 8eb40ce09..ab9fd2850 100644 --- a/.github/workflows/helm-enterprise.yml +++ b/.github/workflows/helm-enterprise.yml @@ -57,7 +57,7 @@ jobs: echo "json=$CHARTS" >> $GITHUB_OUTPUT helm_integration: - runs-on: alfrescoPub-ubuntu2204-16G-4CPU + runs-on: alfrescoPub-ubuntu2204-32G-8CPU needs: - build_vars name: Helm ${{ matrix.name }} ${{ matrix.values }} From 4c1994eb9ab626007dd57fecede9e3c3072931b1 Mon Sep 17 00:00:00 2001 From: Giovanni Toraldo Date: Thu, 16 Nov 2023 15:07:17 +0100 Subject: [PATCH 03/22] add fallback timeout --- .github/workflows/helm-enterprise.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/helm-enterprise.yml b/.github/workflows/helm-enterprise.yml index ab9fd2850..35bd96665 100644 --- a/.github/workflows/helm-enterprise.yml +++ b/.github/workflows/helm-enterprise.yml @@ -58,6 +58,7 @@ jobs: helm_integration: runs-on: alfrescoPub-ubuntu2204-32G-8CPU + timeout-minutes: 20 needs: - build_vars name: Helm ${{ matrix.name }} ${{ matrix.values }} From 9afe67cc0ca5cb80355674c7eb3d0155e3829a0d Mon Sep 17 00:00:00 2001 From: Giovanni Toraldo Date: Thu, 16 Nov 2023 15:07:30 +0100 Subject: [PATCH 04/22] increase memory for oomkilled pods --- test/enterprise-integration-test-values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/enterprise-integration-test-values.yaml b/test/enterprise-integration-test-values.yaml index 64c28eae3..a92bb1c12 100644 --- a/test/enterprise-integration-test-values.yaml +++ b/test/enterprise-integration-test-values.yaml @@ -6,7 +6,7 @@ alfresco-repository: memory: "1024Mi" limits: cpu: "2" - memory: "1560Mi" + memory: "1800Mi" replicaCount: 2 persistence: accessModes: @@ -79,7 +79,7 @@ alfresco-transform-service: memory: "256Mi" limits: cpu: "2" - memory: "512Mi" + memory: "600Mi" replicaCount: 1 transformmisc: livenessProbe: From 5e5f6e1867e825e19f5ec7f5724308587c85d8b5 Mon Sep 17 00:00:00 2001 From: Giovanni Toraldo Date: Thu, 16 Nov 2023 15:30:25 +0100 Subject: [PATCH 05/22] more repo ram --- test/enterprise-integration-test-values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/enterprise-integration-test-values.yaml b/test/enterprise-integration-test-values.yaml index a92bb1c12..cc6872605 100644 --- a/test/enterprise-integration-test-values.yaml +++ b/test/enterprise-integration-test-values.yaml @@ -6,7 +6,7 @@ alfresco-repository: memory: "1024Mi" limits: cpu: "2" - memory: "1800Mi" + memory: "2048Mi" replicaCount: 2 persistence: accessModes: From 05615e9c285f202dabd78a9482b6f5e3def3c442 Mon Sep 17 00:00:00 2001 From: Giovanni Toraldo Date: Thu, 16 Nov 2023 15:43:22 +0100 Subject: [PATCH 06/22] MOAR RAM --- test/enterprise-integration-test-values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/enterprise-integration-test-values.yaml b/test/enterprise-integration-test-values.yaml index cc6872605..284f188b2 100644 --- a/test/enterprise-integration-test-values.yaml +++ b/test/enterprise-integration-test-values.yaml @@ -6,7 +6,7 @@ alfresco-repository: memory: "1024Mi" limits: cpu: "2" - memory: "2048Mi" + memory: "2500Mi" replicaCount: 2 persistence: accessModes: From 22b8af609aa1304bd90f672d6237c3d87744d071 Mon Sep 17 00:00:00 2001 From: Giovanni Toraldo Date: Thu, 16 Nov 2023 16:15:48 +0100 Subject: [PATCH 07/22] lower MaxRAMPercentage to 70 --- test/enterprise-integration-test-values.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/enterprise-integration-test-values.yaml b/test/enterprise-integration-test-values.yaml index 284f188b2..43d882eab 100644 --- a/test/enterprise-integration-test-values.yaml +++ b/test/enterprise-integration-test-values.yaml @@ -13,6 +13,9 @@ alfresco-repository: - ReadWriteOnce startupProbe: failureThreshold: 20 + environment: + JAVA_OPTS: >- + -XX:MaxRAMPercentage=70 share: resources: requests: From ad2b46462d684ee40b8396dea8ea40d889fff0f5 Mon Sep 17 00:00:00 2001 From: Giovanni Toraldo Date: Thu, 16 Nov 2023 16:38:46 +0100 Subject: [PATCH 08/22] MaxRAMPercentage=50 --- test/enterprise-integration-test-values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/enterprise-integration-test-values.yaml b/test/enterprise-integration-test-values.yaml index 43d882eab..034855aad 100644 --- a/test/enterprise-integration-test-values.yaml +++ b/test/enterprise-integration-test-values.yaml @@ -15,7 +15,7 @@ alfresco-repository: failureThreshold: 20 environment: JAVA_OPTS: >- - -XX:MaxRAMPercentage=70 + -XX:MaxRAMPercentage=50 share: resources: requests: From 3020710ab427be51a46b1b96141190f67f04d108 Mon Sep 17 00:00:00 2001 From: Giovanni Toraldo Date: Thu, 16 Nov 2023 16:39:05 +0100 Subject: [PATCH 09/22] 3 Gi heap --- test/enterprise-integration-test-values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/enterprise-integration-test-values.yaml b/test/enterprise-integration-test-values.yaml index 034855aad..cd763cbbe 100644 --- a/test/enterprise-integration-test-values.yaml +++ b/test/enterprise-integration-test-values.yaml @@ -6,7 +6,7 @@ alfresco-repository: memory: "1024Mi" limits: cpu: "2" - memory: "2500Mi" + memory: "3Gi" replicaCount: 2 persistence: accessModes: From c1bf3a73bd41d48825209fb6883fa8f7b16aae56 Mon Sep 17 00:00:00 2001 From: Giovanni Toraldo Date: Thu, 16 Nov 2023 16:47:20 +0100 Subject: [PATCH 10/22] latest kind --- .github/workflows/helm-enterprise.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/helm-enterprise.yml b/.github/workflows/helm-enterprise.yml index 35bd96665..603c2cbb0 100644 --- a/.github/workflows/helm-enterprise.yml +++ b/.github/workflows/helm-enterprise.yml @@ -90,8 +90,8 @@ jobs: uses: Alfresco/alfresco-build-tools/.github/actions/setup-kind@v3.8.0 with: ingress-nginx-ref: controller-v1.8.2 - kind-version: v0.19.0 - kind-node-image: kindest/node:v1.27.1@sha256:b7d12ed662b873bd8510879c1846e87c7e676a79fefc93e17b2a52989d3ff42b + #kind-version: v0.19.0 + #kind-node-image: kindest/node:v1.27.1@sha256:b7d12ed662b873bd8510879c1846e87c7e676a79fefc93e17b2a52989d3ff42b - name: Set nginx ingress config run: | From b275652b929ccc8657eb6619c431fd73581d6aba Mon Sep 17 00:00:00 2001 From: Giovanni Toraldo Date: Thu, 16 Nov 2023 16:58:57 +0100 Subject: [PATCH 11/22] try with MaxRAM --- test/enterprise-integration-test-values.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test/enterprise-integration-test-values.yaml b/test/enterprise-integration-test-values.yaml index cd763cbbe..03ca7ca02 100644 --- a/test/enterprise-integration-test-values.yaml +++ b/test/enterprise-integration-test-values.yaml @@ -6,7 +6,7 @@ alfresco-repository: memory: "1024Mi" limits: cpu: "2" - memory: "3Gi" + memory: "2Gi" replicaCount: 2 persistence: accessModes: @@ -15,7 +15,8 @@ alfresco-repository: failureThreshold: 20 environment: JAVA_OPTS: >- - -XX:MaxRAMPercentage=50 + -XX:MaxRAMPercentage=80 + -XX:MaxRAM=2147483648 share: resources: requests: From b74598ebfa11ea2c25a3105c845332f67c5bee4f Mon Sep 17 00:00:00 2001 From: Giovanni Toraldo Date: Thu, 16 Nov 2023 17:07:06 +0100 Subject: [PATCH 12/22] logs alfresco repository --- .github/workflows/helm-enterprise.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/helm-enterprise.yml b/.github/workflows/helm-enterprise.yml index 603c2cbb0..ece7cc860 100644 --- a/.github/workflows/helm-enterprise.yml +++ b/.github/workflows/helm-enterprise.yml @@ -121,6 +121,7 @@ jobs: helm ls --all-namespaces kubectl get all --all-namespaces kubectl describe pod + kubectl logs -l app=alfresco-repository - uses: nick-fields/retry@v2 id: newman From 78904f572546c586c93778e5c607c9313c558ac2 Mon Sep 17 00:00:00 2001 From: Giovanni Toraldo Date: Thu, 16 Nov 2023 17:19:13 +0100 Subject: [PATCH 13/22] set maxram for share too --- test/enterprise-integration-test-values.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/enterprise-integration-test-values.yaml b/test/enterprise-integration-test-values.yaml index 03ca7ca02..f5924868e 100644 --- a/test/enterprise-integration-test-values.yaml +++ b/test/enterprise-integration-test-values.yaml @@ -31,6 +31,10 @@ share: livenessProbe: initialDelaySeconds: 60 timeoutSeconds: 45 + environment: + CATALINA_OPTS: >- + -XX:MaxRAMPercentage=80 + -XX:MaxRAM=536870912 alfresco-search: resources: requests: From 9f1298cfe8d73edf609016da9a11dc097efab8eb Mon Sep 17 00:00:00 2001 From: Giovanni Toraldo Date: Thu, 16 Nov 2023 17:31:10 +0100 Subject: [PATCH 14/22] set maxram to transforms --- test/enterprise-integration-test-values.yaml | 24 ++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/test/enterprise-integration-test-values.yaml b/test/enterprise-integration-test-values.yaml index f5924868e..491af773a 100644 --- a/test/enterprise-integration-test-values.yaml +++ b/test/enterprise-integration-test-values.yaml @@ -56,6 +56,10 @@ alfresco-transform-service: cpu: "2" memory: "512Mi" replicaCount: 1 + environment: + JAVA_OPTS: >- + -XX:MaxRAMPercentage=80 + -XX:MaxRAM=536870912 imagemagick: livenessProbe: initialDelaySeconds: 30 @@ -67,6 +71,10 @@ alfresco-transform-service: cpu: "2" memory: "512Mi" replicaCount: 1 + environment: + JAVA_OPTS: >- + -XX:MaxRAMPercentage=80 + -XX:MaxRAM=536870912 libreoffice: livenessProbe: initialDelaySeconds: 30 @@ -78,6 +86,10 @@ alfresco-transform-service: cpu: "2" memory: "1024Mi" replicaCount: 1 + environment: + JAVA_OPTS: >- + -XX:MaxRAMPercentage=80 + -XX:MaxRAM=1073741824 tika: livenessProbe: initialDelaySeconds: 30 @@ -89,6 +101,10 @@ alfresco-transform-service: cpu: "2" memory: "600Mi" replicaCount: 1 + environment: + JAVA_OPTS: >- + -XX:MaxRAMPercentage=80 + -XX:MaxRAM=629145600 transformmisc: livenessProbe: initialDelaySeconds: 30 @@ -101,6 +117,10 @@ alfresco-transform-service: limits: cpu: "2" memory: "512Mi" + environment: + JAVA_OPTS: >- + -XX:MaxRAMPercentage=80 + -XX:MaxRAM=536870912 replicaCount: 1 transformrouter: replicaCount: 1 @@ -108,6 +128,10 @@ alfresco-transform-service: limits: cpu: "2" memory: "800Mi" + environment: + JAVA_OPTS: >- + -XX:MaxRAMPercentage=80 + -XX:MaxRAM=838860800 readinessProbe: initialDelaySeconds: 40 timeoutSeconds: 20 From 9735c7f3ba4e6afd775b669192873de8115d0213 Mon Sep 17 00:00:00 2001 From: Giovanni Toraldo Date: Fri, 17 Nov 2023 12:21:56 +0100 Subject: [PATCH 15/22] add conditional workaround --- .github/workflows/helm-enterprise.yml | 14 +++++-- test/cgroup-v2-workaround-values.yaml | 42 ++++++++++++++++++++ test/enterprise-integration-test-values.yaml | 32 --------------- 3 files changed, 53 insertions(+), 35 deletions(-) create mode 100644 test/cgroup-v2-workaround-values.yaml diff --git a/.github/workflows/helm-enterprise.yml b/.github/workflows/helm-enterprise.yml index ece7cc860..7fbb38ebb 100644 --- a/.github/workflows/helm-enterprise.yml +++ b/.github/workflows/helm-enterprise.yml @@ -90,8 +90,6 @@ jobs: uses: Alfresco/alfresco-build-tools/.github/actions/setup-kind@v3.8.0 with: ingress-nginx-ref: controller-v1.8.2 - #kind-version: v0.19.0 - #kind-node-image: kindest/node:v1.27.1@sha256:b7d12ed662b873bd8510879c1846e87c7e676a79fefc93e17b2a52989d3ff42b - name: Set nginx ingress config run: | @@ -104,6 +102,15 @@ jobs: --from-file=.dockerconfigjson=$HOME/.docker/config.json \ --type=kubernetes.io/dockerconfigjson + - name: Check if cgroup v2 workaround is needed + id: extra-values + run: | + acs_version=$(echo ${{ matrix.values }} | cut -d'.' -f1,2) + is_affected=$(echo "$acs_version <= 7.2" | bc -l) + if [ "$is_affected" -eq 1 ]; then + echo "helm_install_params=--values test/cgroup-v2-workaround-values.yaml" >> "$GITHUB_OUTPUT" + fi + - name: Helm install run: | helm dep up ./helm/alfresco-content-services @@ -113,7 +120,8 @@ jobs: --set global.alfrescoRegistryPullSecrets=regcred \ --wait --timeout 15m0s \ --values helm/${{ matrix.name }}/${{ matrix.values }} \ - --values test/enterprise-integration-test-values.yaml + --values test/enterprise-integration-test-values.yaml \ + ${{ steps.extra-values.outputs.helm_install_params }} - name: Spit cluster status after install if: always() diff --git a/test/cgroup-v2-workaround-values.yaml b/test/cgroup-v2-workaround-values.yaml new file mode 100644 index 000000000..9e9583bfe --- /dev/null +++ b/test/cgroup-v2-workaround-values.yaml @@ -0,0 +1,42 @@ +--- +alfresco-repository: + environment: + JAVA_OPTS: >- + -XX:MaxRAMPercentage=80 + -XX:MaxRAM=2147483648 +share: + environment: + CATALINA_OPTS: >- + -XX:MaxRAMPercentage=80 + -XX:MaxRAM=536870912 +alfresco-transform-service: + pdfrenderer: + environment: + JAVA_OPTS: >- + -XX:MaxRAMPercentage=80 + -XX:MaxRAM=536870912 + imagemagick: + environment: + JAVA_OPTS: >- + -XX:MaxRAMPercentage=80 + -XX:MaxRAM=536870912 + libreoffice: + environment: + JAVA_OPTS: >- + -XX:MaxRAMPercentage=80 + -XX:MaxRAM=1073741824 + tika: + environment: + JAVA_OPTS: >- + -XX:MaxRAMPercentage=80 + -XX:MaxRAM=629145600 + transformmisc: + environment: + JAVA_OPTS: >- + -XX:MaxRAMPercentage=80 + -XX:MaxRAM=536870912 + transformrouter: + environment: + JAVA_OPTS: >- + -XX:MaxRAMPercentage=80 + -XX:MaxRAM=838860800 diff --git a/test/enterprise-integration-test-values.yaml b/test/enterprise-integration-test-values.yaml index 491af773a..591fa28df 100644 --- a/test/enterprise-integration-test-values.yaml +++ b/test/enterprise-integration-test-values.yaml @@ -13,10 +13,6 @@ alfresco-repository: - ReadWriteOnce startupProbe: failureThreshold: 20 - environment: - JAVA_OPTS: >- - -XX:MaxRAMPercentage=80 - -XX:MaxRAM=2147483648 share: resources: requests: @@ -31,10 +27,6 @@ share: livenessProbe: initialDelaySeconds: 60 timeoutSeconds: 45 - environment: - CATALINA_OPTS: >- - -XX:MaxRAMPercentage=80 - -XX:MaxRAM=536870912 alfresco-search: resources: requests: @@ -56,10 +48,6 @@ alfresco-transform-service: cpu: "2" memory: "512Mi" replicaCount: 1 - environment: - JAVA_OPTS: >- - -XX:MaxRAMPercentage=80 - -XX:MaxRAM=536870912 imagemagick: livenessProbe: initialDelaySeconds: 30 @@ -71,10 +59,6 @@ alfresco-transform-service: cpu: "2" memory: "512Mi" replicaCount: 1 - environment: - JAVA_OPTS: >- - -XX:MaxRAMPercentage=80 - -XX:MaxRAM=536870912 libreoffice: livenessProbe: initialDelaySeconds: 30 @@ -86,10 +70,6 @@ alfresco-transform-service: cpu: "2" memory: "1024Mi" replicaCount: 1 - environment: - JAVA_OPTS: >- - -XX:MaxRAMPercentage=80 - -XX:MaxRAM=1073741824 tika: livenessProbe: initialDelaySeconds: 30 @@ -101,10 +81,6 @@ alfresco-transform-service: cpu: "2" memory: "600Mi" replicaCount: 1 - environment: - JAVA_OPTS: >- - -XX:MaxRAMPercentage=80 - -XX:MaxRAM=629145600 transformmisc: livenessProbe: initialDelaySeconds: 30 @@ -117,10 +93,6 @@ alfresco-transform-service: limits: cpu: "2" memory: "512Mi" - environment: - JAVA_OPTS: >- - -XX:MaxRAMPercentage=80 - -XX:MaxRAM=536870912 replicaCount: 1 transformrouter: replicaCount: 1 @@ -128,10 +100,6 @@ alfresco-transform-service: limits: cpu: "2" memory: "800Mi" - environment: - JAVA_OPTS: >- - -XX:MaxRAMPercentage=80 - -XX:MaxRAM=838860800 readinessProbe: initialDelaySeconds: 40 timeoutSeconds: 20 From ef4cef80cf43de6c2c9b1c47a1d1be253e18269c Mon Sep 17 00:00:00 2001 From: Giovanni Toraldo Date: Fri, 17 Nov 2023 12:34:37 +0100 Subject: [PATCH 16/22] strip execution time --- .github/workflows/helm-community.yml | 3 ++- .github/workflows/helm-enterprise.yml | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/helm-community.yml b/.github/workflows/helm-community.yml index 591201194..e8cd8bff0 100644 --- a/.github/workflows/helm-community.yml +++ b/.github/workflows/helm-community.yml @@ -21,6 +21,7 @@ concurrency: jobs: community_charts: runs-on: ubuntu-latest + timeout-minutes: 10 steps: - uses: actions/checkout@v4 @@ -61,7 +62,7 @@ jobs: --set global.search.sharedSecret="$(openssl rand -hex 24)" \ --set global.known_urls=http://localhost \ --set global.alfrescoRegistryPullSecrets=regcred \ - --wait --timeout 15m0s --values \ + --wait --timeout 5m0s --values \ test/community-integration-test-values.yaml - name: Spit cluster status diff --git a/.github/workflows/helm-enterprise.yml b/.github/workflows/helm-enterprise.yml index 7fbb38ebb..ade561560 100644 --- a/.github/workflows/helm-enterprise.yml +++ b/.github/workflows/helm-enterprise.yml @@ -58,7 +58,7 @@ jobs: helm_integration: runs-on: alfrescoPub-ubuntu2204-32G-8CPU - timeout-minutes: 20 + timeout-minutes: 10 needs: - build_vars name: Helm ${{ matrix.name }} ${{ matrix.values }} @@ -118,7 +118,7 @@ jobs: --set global.search.sharedSecret="$(openssl rand -hex 24)" \ --set global.known_urls=http://localhost \ --set global.alfrescoRegistryPullSecrets=regcred \ - --wait --timeout 15m0s \ + --wait --timeout 5m0s \ --values helm/${{ matrix.name }}/${{ matrix.values }} \ --values test/enterprise-integration-test-values.yaml \ ${{ steps.extra-values.outputs.helm_install_params }} @@ -136,7 +136,7 @@ jobs: with: timeout_minutes: 1 retry_wait_seconds: 30 - max_attempts: 5 + max_attempts: 3 command: >- docker run --network=host -v $(pwd)/test/postman:/etc/postman From 4a80731f892b35ef3147f842048dc969ea3d405e Mon Sep 17 00:00:00 2001 From: Giovanni Toraldo Date: Fri, 17 Nov 2023 12:36:57 +0100 Subject: [PATCH 17/22] bump community to latest kind --- .github/workflows/helm-community.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/helm-community.yml b/.github/workflows/helm-community.yml index e8cd8bff0..4e94319b9 100644 --- a/.github/workflows/helm-community.yml +++ b/.github/workflows/helm-community.yml @@ -40,8 +40,6 @@ jobs: uses: Alfresco/alfresco-build-tools/.github/actions/setup-kind@v3.8.0 with: ingress-nginx-ref: controller-v1.8.2 - kind-version: v0.19.0 - kind-node-image: kindest/node:v1.27.1@sha256:b7d12ed662b873bd8510879c1846e87c7e676a79fefc93e17b2a52989d3ff42b - name: Set nginx ingress config run: | From 2fb83704aa5d553dcd9a120dc21a9a8e4207935b Mon Sep 17 00:00:00 2001 From: Giovanni Toraldo Date: Fri, 17 Nov 2023 12:49:59 +0100 Subject: [PATCH 18/22] test smaller large runner --- .github/workflows/helm-enterprise.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/helm-enterprise.yml b/.github/workflows/helm-enterprise.yml index ade561560..ad0e11ca7 100644 --- a/.github/workflows/helm-enterprise.yml +++ b/.github/workflows/helm-enterprise.yml @@ -57,7 +57,7 @@ jobs: echo "json=$CHARTS" >> $GITHUB_OUTPUT helm_integration: - runs-on: alfrescoPub-ubuntu2204-32G-8CPU + runs-on: alfrescoPub-ubuntu2204-16G-4CPU timeout-minutes: 10 needs: - build_vars From 678d1cc65c38cbbc5fa92b3a621868844e6e7f32 Mon Sep 17 00:00:00 2001 From: Giovanni Toraldo Date: Fri, 17 Nov 2023 13:01:19 +0100 Subject: [PATCH 19/22] more retries with less wait --- .github/workflows/helm-enterprise.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/helm-enterprise.yml b/.github/workflows/helm-enterprise.yml index ad0e11ca7..277987fd2 100644 --- a/.github/workflows/helm-enterprise.yml +++ b/.github/workflows/helm-enterprise.yml @@ -135,8 +135,8 @@ jobs: id: newman with: timeout_minutes: 1 - retry_wait_seconds: 30 - max_attempts: 3 + retry_wait_seconds: 20 + max_attempts: 5 command: >- docker run --network=host -v $(pwd)/test/postman:/etc/postman From a52b8cf9af94b750c1112ac85fee8154988dec35 Mon Sep 17 00:00:00 2001 From: Giovanni Toraldo Date: Fri, 17 Nov 2023 14:04:11 +0100 Subject: [PATCH 20/22] restore previous tika memory --- test/cgroup-v2-workaround-values.yaml | 2 +- test/enterprise-integration-test-values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/cgroup-v2-workaround-values.yaml b/test/cgroup-v2-workaround-values.yaml index 9e9583bfe..afe4ec694 100644 --- a/test/cgroup-v2-workaround-values.yaml +++ b/test/cgroup-v2-workaround-values.yaml @@ -29,7 +29,7 @@ alfresco-transform-service: environment: JAVA_OPTS: >- -XX:MaxRAMPercentage=80 - -XX:MaxRAM=629145600 + -XX:MaxRAM=536870912 transformmisc: environment: JAVA_OPTS: >- diff --git a/test/enterprise-integration-test-values.yaml b/test/enterprise-integration-test-values.yaml index 591fa28df..52cf27dcb 100644 --- a/test/enterprise-integration-test-values.yaml +++ b/test/enterprise-integration-test-values.yaml @@ -79,7 +79,7 @@ alfresco-transform-service: memory: "256Mi" limits: cpu: "2" - memory: "600Mi" + memory: "512Mi" replicaCount: 1 transformmisc: livenessProbe: From e5e3e91cb0c462cb37f7d4f3ddc7b0cb55b6bc18 Mon Sep 17 00:00:00 2001 From: Giovanni Toraldo Date: Fri, 17 Nov 2023 14:04:56 +0100 Subject: [PATCH 21/22] remove debug log --- .github/workflows/helm-enterprise.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/helm-enterprise.yml b/.github/workflows/helm-enterprise.yml index 277987fd2..8591d2269 100644 --- a/.github/workflows/helm-enterprise.yml +++ b/.github/workflows/helm-enterprise.yml @@ -129,7 +129,6 @@ jobs: helm ls --all-namespaces kubectl get all --all-namespaces kubectl describe pod - kubectl logs -l app=alfresco-repository - uses: nick-fields/retry@v2 id: newman From c8c33f97c2b1ce916c756e047f16cef7893ccf5a Mon Sep 17 00:00:00 2001 From: Giovanni Toraldo Date: Fri, 17 Nov 2023 15:54:57 +0100 Subject: [PATCH 22/22] timeout to 6 minutes --- .github/workflows/helm-enterprise.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/helm-enterprise.yml b/.github/workflows/helm-enterprise.yml index 8591d2269..87cea0dfc 100644 --- a/.github/workflows/helm-enterprise.yml +++ b/.github/workflows/helm-enterprise.yml @@ -118,7 +118,7 @@ jobs: --set global.search.sharedSecret="$(openssl rand -hex 24)" \ --set global.known_urls=http://localhost \ --set global.alfrescoRegistryPullSecrets=regcred \ - --wait --timeout 5m0s \ + --wait --timeout 6m0s \ --values helm/${{ matrix.name }}/${{ matrix.values }} \ --values test/enterprise-integration-test-values.yaml \ ${{ steps.extra-values.outputs.helm_install_params }}