From 15268907828973dff468044d0c2ef058c4a16572 Mon Sep 17 00:00:00 2001 From: Giovanni Toraldo Date: Mon, 22 Jan 2024 09:36:09 +0100 Subject: [PATCH 01/16] Lower docker compose enterprise timeout --- .github/workflows/docker-compose-enterprise.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docker-compose-enterprise.yml b/.github/workflows/docker-compose-enterprise.yml index 1ade05a81..b6ad4dbee 100644 --- a/.github/workflows/docker-compose-enterprise.yml +++ b/.github/workflows/docker-compose-enterprise.yml @@ -41,6 +41,7 @@ jobs: fail-fast: true matrix: ${{ fromJSON(needs.build_vars.outputs.matrix_json) }} runs-on: ubuntu-latest + timeout-minutes: 5 if: >- github.event_name == 'push' || ( From e51ccd3adcca22e1dc52a5a3299823f49a0b1b01 Mon Sep 17 00:00:00 2001 From: Giovanni Toraldo Date: Mon, 22 Jan 2024 09:45:17 +0100 Subject: [PATCH 02/16] move timeout to longer step --- .github/workflows/docker-compose-enterprise.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-compose-enterprise.yml b/.github/workflows/docker-compose-enterprise.yml index b6ad4dbee..1b027dde3 100644 --- a/.github/workflows/docker-compose-enterprise.yml +++ b/.github/workflows/docker-compose-enterprise.yml @@ -41,7 +41,6 @@ jobs: fail-fast: true matrix: ${{ fromJSON(needs.build_vars.outputs.matrix_json) }} runs-on: ubuntu-latest - timeout-minutes: 5 if: >- github.event_name == 'push' || ( @@ -51,6 +50,7 @@ jobs: steps: - uses: >- Alfresco/alfresco-build-tools/.github/actions/dbp-charts/verify-compose@v5.12.0 + timeout-minutes: 5 with: compose_file_path: docker-compose/${{ matrix.compose_file }} quay_username: ${{ secrets.QUAY_USERNAME }} From 8ccf1cfc7d8e1261cc8388fbc0d960679ebfb6cc Mon Sep 17 00:00:00 2001 From: Giovanni Toraldo Date: Mon, 22 Jan 2024 09:45:59 +0100 Subject: [PATCH 03/16] print logs on failure --- .github/workflows/docker-compose-enterprise.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/docker-compose-enterprise.yml b/.github/workflows/docker-compose-enterprise.yml index 1b027dde3..342dbe75a 100644 --- a/.github/workflows/docker-compose-enterprise.yml +++ b/.github/workflows/docker-compose-enterprise.yml @@ -55,3 +55,7 @@ jobs: compose_file_path: docker-compose/${{ matrix.compose_file }} quay_username: ${{ secrets.QUAY_USERNAME }} quay_password: ${{ secrets.QUAY_PASSWORD }} + - name: Debug alfresco on failure + if: failure() || cancelled() + run: | + docker-compose logs alfresco From a9c17be407aecd0b03ae0e3291562b18ffb99290 Mon Sep 17 00:00:00 2001 From: Giovanni Toraldo Date: Mon, 22 Jan 2024 10:35:26 +0100 Subject: [PATCH 04/16] test debug step --- .github/workflows/docker-compose-enterprise.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-compose-enterprise.yml b/.github/workflows/docker-compose-enterprise.yml index 342dbe75a..28f9e7431 100644 --- a/.github/workflows/docker-compose-enterprise.yml +++ b/.github/workflows/docker-compose-enterprise.yml @@ -56,6 +56,7 @@ jobs: quay_username: ${{ secrets.QUAY_USERNAME }} quay_password: ${{ secrets.QUAY_PASSWORD }} - name: Debug alfresco on failure - if: failure() || cancelled() + #if: failure() || cancelled() + working-directory: docker-compose run: | - docker-compose logs alfresco + docker-compose -f ${{ matrix.compose_file }} logs alfresco From 7f5038da1998e8e85bf4b6f07d5a97c4d9984787 Mon Sep 17 00:00:00 2001 From: Giovanni Toraldo Date: Mon, 22 Jan 2024 10:49:23 +0100 Subject: [PATCH 05/16] logs only when necessary --- .github/workflows/docker-compose-enterprise.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-compose-enterprise.yml b/.github/workflows/docker-compose-enterprise.yml index 28f9e7431..c0616d11e 100644 --- a/.github/workflows/docker-compose-enterprise.yml +++ b/.github/workflows/docker-compose-enterprise.yml @@ -56,7 +56,7 @@ jobs: quay_username: ${{ secrets.QUAY_USERNAME }} quay_password: ${{ secrets.QUAY_PASSWORD }} - name: Debug alfresco on failure - #if: failure() || cancelled() + if: failure() || cancelled() working-directory: docker-compose run: | docker-compose -f ${{ matrix.compose_file }} logs alfresco From eaa1cb5244fb201973332f16b168182db5f13c2c Mon Sep 17 00:00:00 2001 From: Giovanni Toraldo Date: Mon, 22 Jan 2024 11:07:20 +0100 Subject: [PATCH 06/16] run always so we know what good logs are --- .github/workflows/docker-compose-enterprise.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-compose-enterprise.yml b/.github/workflows/docker-compose-enterprise.yml index c0616d11e..5f7881d22 100644 --- a/.github/workflows/docker-compose-enterprise.yml +++ b/.github/workflows/docker-compose-enterprise.yml @@ -56,7 +56,7 @@ jobs: quay_username: ${{ secrets.QUAY_USERNAME }} quay_password: ${{ secrets.QUAY_PASSWORD }} - name: Debug alfresco on failure - if: failure() || cancelled() + if: always() working-directory: docker-compose run: | docker-compose -f ${{ matrix.compose_file }} logs alfresco From 266b2fbb98bee789270e6f909da68b9de5e260f1 Mon Sep 17 00:00:00 2001 From: Giovanni Toraldo Date: Mon, 22 Jan 2024 11:08:43 +0100 Subject: [PATCH 07/16] logs solr6 --- .github/workflows/docker-compose-enterprise.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docker-compose-enterprise.yml b/.github/workflows/docker-compose-enterprise.yml index 5f7881d22..f5d93b697 100644 --- a/.github/workflows/docker-compose-enterprise.yml +++ b/.github/workflows/docker-compose-enterprise.yml @@ -60,3 +60,4 @@ jobs: working-directory: docker-compose run: | docker-compose -f ${{ matrix.compose_file }} logs alfresco + docker-compose -f ${{ matrix.compose_file }} logs solr6 From 0a736535f693f81cbe9c925abd43be8dc4d6dbf8 Mon Sep 17 00:00:00 2001 From: Giovanni Toraldo Date: Mon, 22 Jan 2024 11:11:10 +0100 Subject: [PATCH 08/16] add concurrency --- .github/workflows/docker-compose-enterprise.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/docker-compose-enterprise.yml b/.github/workflows/docker-compose-enterprise.yml index f5d93b697..18c929ca8 100644 --- a/.github/workflows/docker-compose-enterprise.yml +++ b/.github/workflows/docker-compose-enterprise.yml @@ -17,6 +17,10 @@ on: - master - release/** +concurrency: + group: compose-ent-${{ github.head_ref || github.ref_name }} + cancel-in-progress: true + jobs: build_vars: runs-on: ubuntu-latest From d6f444f88faed3ff0138a62a3e7b73cbf7b7bc9e Mon Sep 17 00:00:00 2001 From: Giovanni Toraldo Date: Mon, 22 Jan 2024 11:18:53 +0100 Subject: [PATCH 09/16] keep logs separated --- .github/workflows/docker-compose-enterprise.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker-compose-enterprise.yml b/.github/workflows/docker-compose-enterprise.yml index 18c929ca8..4fc9b5b78 100644 --- a/.github/workflows/docker-compose-enterprise.yml +++ b/.github/workflows/docker-compose-enterprise.yml @@ -59,9 +59,15 @@ jobs: compose_file_path: docker-compose/${{ matrix.compose_file }} quay_username: ${{ secrets.QUAY_USERNAME }} quay_password: ${{ secrets.QUAY_PASSWORD }} - - name: Debug alfresco on failure + + - name: Show alfresco logs if: always() working-directory: docker-compose run: | docker-compose -f ${{ matrix.compose_file }} logs alfresco + + - name: Show solr logs + if: always() + working-directory: docker-compose + run: | docker-compose -f ${{ matrix.compose_file }} logs solr6 From 4760c127039a8315ac0f676fae5d4eb45e504798 Mon Sep 17 00:00:00 2001 From: Giovanni Toraldo Date: Mon, 22 Jan 2024 11:55:37 +0100 Subject: [PATCH 10/16] accomodate for a few retries --- .github/workflows/docker-compose-enterprise.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-compose-enterprise.yml b/.github/workflows/docker-compose-enterprise.yml index 4fc9b5b78..916246d90 100644 --- a/.github/workflows/docker-compose-enterprise.yml +++ b/.github/workflows/docker-compose-enterprise.yml @@ -54,7 +54,7 @@ jobs: steps: - uses: >- Alfresco/alfresco-build-tools/.github/actions/dbp-charts/verify-compose@v5.12.0 - timeout-minutes: 5 + timeout-minutes: 10 with: compose_file_path: docker-compose/${{ matrix.compose_file }} quay_username: ${{ secrets.QUAY_USERNAME }} From c7b08d40dcfa33bd7b922ad21dd759e1033e7933 Mon Sep 17 00:00:00 2001 From: Giovanni Toraldo Date: Mon, 22 Jan 2024 11:59:05 +0100 Subject: [PATCH 11/16] add docker ps --- .github/workflows/docker-compose-enterprise.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/docker-compose-enterprise.yml b/.github/workflows/docker-compose-enterprise.yml index 916246d90..866108247 100644 --- a/.github/workflows/docker-compose-enterprise.yml +++ b/.github/workflows/docker-compose-enterprise.yml @@ -60,6 +60,12 @@ jobs: quay_username: ${{ secrets.QUAY_USERNAME }} quay_password: ${{ secrets.QUAY_PASSWORD }} + - name: Show docker ps + if: always() + working-directory: docker-compose + run: | + docker-compose -f ${{ matrix.compose_file }} ps + - name: Show alfresco logs if: always() working-directory: docker-compose From 3eeca37b658f218a7df353a16ee0c8c9343c8621 Mon Sep 17 00:00:00 2001 From: Giovanni Toraldo Date: Mon, 22 Jan 2024 12:31:59 +0100 Subject: [PATCH 12/16] Avoid OOM on older compose versions --- docker-compose/7.0.N-docker-compose.yml | 9 +++++++++ docker-compose/7.1.N-docker-compose.yml | 9 +++++++++ docker-compose/7.2.N-docker-compose.yml | 9 +++++++++ 3 files changed, 27 insertions(+) diff --git a/docker-compose/7.0.N-docker-compose.yml b/docker-compose/7.0.N-docker-compose.yml index 3fa7f3a67..d64d3d024 100644 --- a/docker-compose/7.0.N-docker-compose.yml +++ b/docker-compose/7.0.N-docker-compose.yml @@ -15,6 +15,9 @@ # # Using version 2 as 3 does not support resource constraint options # (cpu_*, mem_* limits) for non swarm mode in Compose +# +# Java processes requires setting -XX:MaxRAM= due to cgroupv2 changes in recent Linux kernels +# https://hub.alfresco.com/t5/alfresco-content-services-blog/acs-containers-and-cgroup-v2-in-acs-up-to-7-2/ba-p/318039 version: "2" services: alfresco: @@ -55,6 +58,7 @@ services: -Ddsync.service.uris=http://localhost:9090/alfresco -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80 + -XX:MaxRAM=1700m transform-router: mem_limit: 512m image: quay.io/alfresco/alfresco-transform-router:1.4.1 @@ -62,6 +66,7 @@ services: JAVA_OPTS: >- -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80 + -XX:MaxRAM=512m ACTIVEMQ_URL: nio://activemq:61616 CORE_AIO_URL: http://transform-core-aio:8090 FILE_STORE_URL: >- @@ -77,6 +82,7 @@ services: JAVA_OPTS: >- -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80 + -XX:MaxRAM=1536m ACTIVEMQ_URL: "nio://activemq:61616" FILE_STORE_URL: >- http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file @@ -91,6 +97,7 @@ services: JAVA_OPTS: >- -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80 + -XX:MaxRAM=512m scheduler.content.age.millis: 86400000 scheduler.cleanup.interval: 86400000 ports: @@ -106,6 +113,7 @@ services: JAVA_OPTS: >- -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80 + -XX:MaxRAM=1g -Dalfresco.host=localhost -Dalfresco.port=8080 -Dalfresco.context=alfresco @@ -177,6 +185,7 @@ services: -Ddw.server.applicationConnectors[0].type=http -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80 + -XX:MaxRAM=1g ports: - "9090:9090" volumes: diff --git a/docker-compose/7.1.N-docker-compose.yml b/docker-compose/7.1.N-docker-compose.yml index 07837b935..617628acd 100644 --- a/docker-compose/7.1.N-docker-compose.yml +++ b/docker-compose/7.1.N-docker-compose.yml @@ -15,6 +15,9 @@ # # Using version 2 as 3 does not support resource constraint options # (cpu_*, mem_* limits) for non swarm mode in Compose +# +# Java processes requires setting -XX:MaxRAM= due to cgroupv2 changes in recent Linux kernels +# https://hub.alfresco.com/t5/alfresco-content-services-blog/acs-containers-and-cgroup-v2-in-acs-up-to-7-2/ba-p/318039 version: "2" services: alfresco: @@ -55,6 +58,7 @@ services: -Ddsync.service.uris=http://localhost:9090/alfresco -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80 + -XX:MaxRAM=1900m transform-router: mem_limit: 512m image: quay.io/alfresco/alfresco-transform-router:2.1.1 @@ -62,6 +66,7 @@ services: JAVA_OPTS: >- -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80 + -XX:MaxRAM=512m ACTIVEMQ_URL: nio://activemq:61616 CORE_AIO_URL: http://transform-core-aio:8090 FILE_STORE_URL: >- @@ -77,6 +82,7 @@ services: JAVA_OPTS: >- -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80 + -XX:MaxRAM=1536m ACTIVEMQ_URL: nio://activemq:61616 FILE_STORE_URL: >- http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file @@ -91,6 +97,7 @@ services: JAVA_OPTS: >- -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80 + -XX:MaxRAM=512m scheduler.content.age.millis: 86400000 scheduler.cleanup.interval: 86400000 ports: @@ -106,6 +113,7 @@ services: JAVA_OPTS: >- -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80 + -XX:MaxRAM=1g -Dalfresco.host=localhost -Dalfresco.port=8080 -Dalfresco.context=alfresco @@ -178,6 +186,7 @@ services: -Ddw.server.applicationConnectors[0].type=http -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80 + -XX:MaxRAM=1g ports: - "9090:9090" volumes: diff --git a/docker-compose/7.2.N-docker-compose.yml b/docker-compose/7.2.N-docker-compose.yml index 057533373..3cc5d32f3 100644 --- a/docker-compose/7.2.N-docker-compose.yml +++ b/docker-compose/7.2.N-docker-compose.yml @@ -15,6 +15,9 @@ # # Using version 2 as 3 does not support resource constraint options # (cpu_*, mem_* limits) for non swarm mode in Compose +# +# Java processes requires setting -XX:MaxRAM= due to cgroupv2 changes in recent Linux kernels +# https://hub.alfresco.com/t5/alfresco-content-services-blog/acs-containers-and-cgroup-v2-in-acs-up-to-7-2/ba-p/318039 version: "2" services: alfresco: @@ -56,6 +59,7 @@ services: -Ddsync.service.uris=http://localhost:9090/alfresco -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80 + -XX:MaxRAM=1900m transform-router: mem_limit: 512m image: quay.io/alfresco/alfresco-transform-router:2.1.1 @@ -63,6 +67,7 @@ services: JAVA_OPTS: >- -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80 + -XX:MaxRAM=512m ACTIVEMQ_URL: nio://activemq:61616 CORE_AIO_URL: http://transform-core-aio:8090 FILE_STORE_URL: >- @@ -78,6 +83,7 @@ services: JAVA_OPTS: >- -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80 + -XX:MaxRAM=1536m ACTIVEMQ_URL: nio://activemq:61616 FILE_STORE_URL: >- http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file @@ -92,6 +98,7 @@ services: JAVA_OPTS: >- -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80 + -XX:MaxRAM=512m scheduler.content.age.millis: 86400000 scheduler.cleanup.interval: 86400000 ports: @@ -107,6 +114,7 @@ services: JAVA_OPTS: >- -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80 + -XX:MaxRAM=1g -Dalfresco.host=localhost -Dalfresco.port=8080 -Dalfresco.context=alfresco @@ -191,6 +199,7 @@ services: -Ddw.server.applicationConnectors[0].type=http -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80 + -XX:MaxRAM=1g ports: - "9090:9090" volumes: From 999f1f78d16d442736bbe8c6fa26027c357777da Mon Sep 17 00:00:00 2001 From: Giovanni Toraldo Date: Mon, 22 Jan 2024 12:36:15 +0100 Subject: [PATCH 13/16] test new build-tools branch --- .github/workflows/docker-compose-enterprise.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-compose-enterprise.yml b/.github/workflows/docker-compose-enterprise.yml index 866108247..3585f8f47 100644 --- a/.github/workflows/docker-compose-enterprise.yml +++ b/.github/workflows/docker-compose-enterprise.yml @@ -53,7 +53,7 @@ jobs: ) steps: - uses: >- - Alfresco/alfresco-build-tools/.github/actions/dbp-charts/verify-compose@v5.12.0 + Alfresco/alfresco-build-tools/.github/actions/dbp-charts/verify-compose@debug-verify-compose timeout-minutes: 10 with: compose_file_path: docker-compose/${{ matrix.compose_file }} From c0352f99774eb67724ab2ddcf1dc6d8eba439b83 Mon Sep 17 00:00:00 2001 From: Giovanni Toraldo Date: Mon, 22 Jan 2024 12:48:30 +0100 Subject: [PATCH 14/16] add name to main step --- .github/workflows/docker-compose-enterprise.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker-compose-enterprise.yml b/.github/workflows/docker-compose-enterprise.yml index 3585f8f47..65dc800e7 100644 --- a/.github/workflows/docker-compose-enterprise.yml +++ b/.github/workflows/docker-compose-enterprise.yml @@ -52,7 +52,8 @@ jobs: && github.event.pull_request.head.user.login == 'Alfresco' ) steps: - - uses: >- + - name: Verify docker-compose + uses: >- Alfresco/alfresco-build-tools/.github/actions/dbp-charts/verify-compose@debug-verify-compose timeout-minutes: 10 with: From b70f6b633f270853b981bb9b5f772aa97784f81f Mon Sep 17 00:00:00 2001 From: Giovanni Toraldo Date: Mon, 22 Jan 2024 14:30:29 +0100 Subject: [PATCH 15/16] bump build-tools --- .github/workflows/bumpVersions.yml | 8 ++++---- .github/workflows/docker-compose-community.yml | 2 +- .github/workflows/docker-compose-enterprise.yml | 2 +- .github/workflows/helm-community.yml | 2 +- .github/workflows/helm-enterprise.yml | 2 +- .github/workflows/helm-release.yml | 2 +- .github/workflows/helm-static-checks.yml | 8 ++++---- .github/workflows/pre-commit-compose.yml | 2 +- .github/workflows/pre-commit-helm.yml | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/bumpVersions.yml b/.github/workflows/bumpVersions.yml index 815bfe5a2..140e584a8 100644 --- a/.github/workflows/bumpVersions.yml +++ b/.github/workflows/bumpVersions.yml @@ -52,9 +52,9 @@ jobs: env: GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} - - uses: Alfresco/alfresco-build-tools/.github/actions/setup-helm-docs@v5.12.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/setup-helm-docs@v5.13.0 - name: Regenerate helm docs if necessary - uses: Alfresco/alfresco-build-tools/.github/actions/pre-commit@v5.12.0 + uses: Alfresco/alfresco-build-tools/.github/actions/pre-commit@v5.13.0 with: pre-commit-args: helm-docs || true skip_checkout: "true" @@ -107,9 +107,9 @@ jobs: QUAY_PASSWORD: ${{ secrets.QUAY_PASSWORD }} UPDATECLI_GITHUB_TOKEN: ${{ secrets.BOT_GITHUB_TOKEN }} - - uses: Alfresco/alfresco-build-tools/.github/actions/setup-helm-docs@v5.12.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/setup-helm-docs@v5.13.0 - name: Regenerate helm docs if necessary - uses: Alfresco/alfresco-build-tools/.github/actions/pre-commit@v5.12.0 + uses: Alfresco/alfresco-build-tools/.github/actions/pre-commit@v5.13.0 with: pre-commit-args: helm-docs || true skip_checkout: "true" diff --git a/.github/workflows/docker-compose-community.yml b/.github/workflows/docker-compose-community.yml index 8c20b6dfe..11487df0c 100644 --- a/.github/workflows/docker-compose-community.yml +++ b/.github/workflows/docker-compose-community.yml @@ -22,6 +22,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: >- - Alfresco/alfresco-build-tools/.github/actions/dbp-charts/verify-compose@v5.12.0 + Alfresco/alfresco-build-tools/.github/actions/dbp-charts/verify-compose@v5.13.0 with: compose_file_path: docker-compose/community-docker-compose.yml diff --git a/.github/workflows/docker-compose-enterprise.yml b/.github/workflows/docker-compose-enterprise.yml index 65dc800e7..fb1907352 100644 --- a/.github/workflows/docker-compose-enterprise.yml +++ b/.github/workflows/docker-compose-enterprise.yml @@ -54,7 +54,7 @@ jobs: steps: - name: Verify docker-compose uses: >- - Alfresco/alfresco-build-tools/.github/actions/dbp-charts/verify-compose@debug-verify-compose + Alfresco/alfresco-build-tools/.github/actions/dbp-charts/verify-compose@v5.13.0 timeout-minutes: 10 with: compose_file_path: docker-compose/${{ matrix.compose_file }} diff --git a/.github/workflows/helm-community.yml b/.github/workflows/helm-community.yml index 4235edcaa..9e053eed2 100644 --- a/.github/workflows/helm-community.yml +++ b/.github/workflows/helm-community.yml @@ -37,7 +37,7 @@ jobs: password: ${{ secrets.DOCKER_PASSWORD }} - name: Setup cluster - uses: Alfresco/alfresco-build-tools/.github/actions/setup-kind@v5.12.0 + uses: Alfresco/alfresco-build-tools/.github/actions/setup-kind@v5.13.0 with: ingress-nginx-ref: controller-v1.8.2 diff --git a/.github/workflows/helm-enterprise.yml b/.github/workflows/helm-enterprise.yml index bab6024fd..7a441b4aa 100644 --- a/.github/workflows/helm-enterprise.yml +++ b/.github/workflows/helm-enterprise.yml @@ -87,7 +87,7 @@ jobs: password: ${{ secrets.QUAY_PASSWORD }} - name: Setup cluster - uses: Alfresco/alfresco-build-tools/.github/actions/setup-kind@v5.12.0 + uses: Alfresco/alfresco-build-tools/.github/actions/setup-kind@v5.13.0 with: ingress-nginx-ref: controller-v1.8.2 diff --git a/.github/workflows/helm-release.yml b/.github/workflows/helm-release.yml index bcb817001..719ee6c5f 100644 --- a/.github/workflows/helm-release.yml +++ b/.github/workflows/helm-release.yml @@ -45,7 +45,7 @@ jobs: ! grep -e "-alpha" -e "-SNAPSHOT" helm/${{ matrix.charts }}/Chart.yaml - name: Publish chart uses: >- - Alfresco/alfresco-build-tools/.github/actions/dbp-charts/publish-chart@v5.12.0 + Alfresco/alfresco-build-tools/.github/actions/dbp-charts/publish-chart@v5.13.0 with: chart_name: ${{ matrix.charts }} github_token: ${{ secrets.BOT_GITHUB_TOKEN }} diff --git a/.github/workflows/helm-static-checks.yml b/.github/workflows/helm-static-checks.yml index eecb3573e..448066dd9 100644 --- a/.github/workflows/helm-static-checks.yml +++ b/.github/workflows/helm-static-checks.yml @@ -39,11 +39,11 @@ jobs: - name: Checkout uses: actions/checkout@v4 - uses: >- - Alfresco/alfresco-build-tools/.github/actions/helm-build-chart@v5.12.0 + Alfresco/alfresco-build-tools/.github/actions/helm-build-chart@v5.13.0 with: chart-dir: helm/${{ matrix.charts.name }} - uses: >- - Alfresco/alfresco-build-tools/.github/actions/helm-plugin@v5.12.0 + Alfresco/alfresco-build-tools/.github/actions/helm-plugin@v5.13.0 with: plugin_url: https://github.com/helm-unittest/helm-unittest - run: | @@ -58,11 +58,11 @@ jobs: - name: Checkout uses: actions/checkout@v4 - uses: >- - Alfresco/alfresco-build-tools/.github/actions/helm-build-chart@v5.12.0 + Alfresco/alfresco-build-tools/.github/actions/helm-build-chart@v5.13.0 with: chart-dir: helm/${{ matrix.charts.name }} - uses: >- - Alfresco/alfresco-build-tools/.github/actions/helm-template-yamllint@v5.12.0 + Alfresco/alfresco-build-tools/.github/actions/helm-template-yamllint@v5.13.0 with: chart-dir: helm/${{ matrix.charts.name }} helm-options: --values tests/values/test_values.yaml diff --git a/.github/workflows/pre-commit-compose.yml b/.github/workflows/pre-commit-compose.yml index 9a1dd2d95..c73465317 100644 --- a/.github/workflows/pre-commit-compose.yml +++ b/.github/workflows/pre-commit-compose.yml @@ -24,4 +24,4 @@ jobs: name: Run pre-commit runs-on: ubuntu-latest steps: - - uses: Alfresco/alfresco-build-tools/.github/actions/pre-commit@v5.12.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/pre-commit@v5.13.0 diff --git a/.github/workflows/pre-commit-helm.yml b/.github/workflows/pre-commit-helm.yml index 492a16a28..5c177c7c9 100644 --- a/.github/workflows/pre-commit-helm.yml +++ b/.github/workflows/pre-commit-helm.yml @@ -28,7 +28,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: Alfresco/alfresco-build-tools/.github/actions/setup-helm-docs@v5.12.0 + - uses: Alfresco/alfresco-build-tools/.github/actions/setup-helm-docs@v5.13.0 - name: Add dependency chart repos run: | helm repo add alfresco-helm-charts https://alfresco.github.io/alfresco-helm-charts From 1d4fa2c6ca20af20f144e40329297063f592e432 Mon Sep 17 00:00:00 2001 From: Giovanni Toraldo <71768+gionn@users.noreply.github.com> Date: Tue, 23 Jan 2024 11:18:37 +0100 Subject: [PATCH 16/16] cleanup --- .../workflows/docker-compose-enterprise.yml | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/.github/workflows/docker-compose-enterprise.yml b/.github/workflows/docker-compose-enterprise.yml index fb1907352..1170bc4aa 100644 --- a/.github/workflows/docker-compose-enterprise.yml +++ b/.github/workflows/docker-compose-enterprise.yml @@ -60,21 +60,3 @@ jobs: compose_file_path: docker-compose/${{ matrix.compose_file }} quay_username: ${{ secrets.QUAY_USERNAME }} quay_password: ${{ secrets.QUAY_PASSWORD }} - - - name: Show docker ps - if: always() - working-directory: docker-compose - run: | - docker-compose -f ${{ matrix.compose_file }} ps - - - name: Show alfresco logs - if: always() - working-directory: docker-compose - run: | - docker-compose -f ${{ matrix.compose_file }} logs alfresco - - - name: Show solr logs - if: always() - working-directory: docker-compose - run: | - docker-compose -f ${{ matrix.compose_file }} logs solr6