From 8e11c37297c188b4db734cc51efaae51efc6fa18 Mon Sep 17 00:00:00 2001 From: cezary-witkowski Date: Fri, 3 Jan 2025 13:26:46 +0100 Subject: [PATCH 1/6] [MNT-24604] Bump IE/SS to 2.0.14-A.1 --- dev/docker-compose.yml | 2 +- distribution/src/main/resources/VERSIONS.md | 4 ++-- tests/environment/.env | 2 +- tests/environment/docker-compose-pipeline-all-amps.yml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dev/docker-compose.yml b/dev/docker-compose.yml index 8bd03c6044..efd0d35e13 100644 --- a/dev/docker-compose.yml +++ b/dev/docker-compose.yml @@ -54,7 +54,7 @@ services: - 5432:5432 solr6: - image: quay.io/alfresco/insight-engine:2.0.13 + image: quay.io/alfresco/insight-engine:2.0.14-A.1 environment: #Solr needs to know how to register itself with Alfresco SOLR_ALFRESCO_HOST: "host.docker.internal" diff --git a/distribution/src/main/resources/VERSIONS.md b/distribution/src/main/resources/VERSIONS.md index b9307ceecf..a607237c5d 100644 --- a/distribution/src/main/resources/VERSIONS.md +++ b/distribution/src/main/resources/VERSIONS.md @@ -10,8 +10,8 @@ This file lists the recommended components for this Service Pack. Use it along w | Alfresco Content Services | @project.version@ | | Alfresco Enterprise Repository ± | @dependency.alfresco-enterprise-repo.version@ | | Alfresco Share | @dependency.alfresco-enterprise-share.version@ | -| Alfresco Search Services | 2.0.13 | -| Alfresco Insight Engine | 2.0.13 | +| Alfresco Search Services | 2.0.14-A.1 | +| Alfresco Insight Engine | 2.0.14-A.1 | | Alfresco Desktop Sync Service | @alfresco.desktop-sync.version@ | | Alfresco Transform Service | @dependency.alfresco-transform-service.version@ | | Alfresco Transform Core | @dependency.alfresco-transform-core.version@ | diff --git a/tests/environment/.env b/tests/environment/.env index ccff87d3d0..1cafdf459a 100644 --- a/tests/environment/.env +++ b/tests/environment/.env @@ -1,5 +1,5 @@ ALFRESCO_TAG=latest -SOLR6_TAG=2.0.13 +SOLR6_TAG=2.0.14-A.1 POSTGRES_TAG=15.4 MYSQL_TAG=8.0.30 MARIADB_TAG=10.6 diff --git a/tests/environment/docker-compose-pipeline-all-amps.yml b/tests/environment/docker-compose-pipeline-all-amps.yml index b559a87531..09b09deba1 100644 --- a/tests/environment/docker-compose-pipeline-all-amps.yml +++ b/tests/environment/docker-compose-pipeline-all-amps.yml @@ -127,7 +127,7 @@ services: - 5432:5432 solr6: - image: alfresco/alfresco-search-services:2.0.13 + image: alfresco/alfresco-search-services:2.0.14-A.1 mem_limit: 3g environment: #Solr needs to know how to register itself with Alfresco From 2eb6f829238ef1375b4ea1c91f4be148a514e709 Mon Sep 17 00:00:00 2001 From: cezary-witkowski Date: Tue, 7 Jan 2025 11:26:41 +0100 Subject: [PATCH 2/6] [MNT-24604] Cross testing --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 05e108abf0..579b1a60b8 100644 --- a/pom.xml +++ b/pom.xml @@ -10,12 +10,12 @@ org.alfresco alfresco-enterprise-repo ../alfresco-enterprise-repo/pom.xml - 25.1.0.18 + 25.1.0.19-SNAPSHOT - 25.1.0.18 - 25.1.0.17 + 25.1.0.19-SNAPSHOT + 25.1.0.18-SNAPSHOT 3.0.2 From 33a64a0106eea3d4641f0e4f0b01a09566e54507 Mon Sep 17 00:00:00 2001 From: cezary-witkowski Date: Tue, 7 Jan 2025 11:41:37 +0100 Subject: [PATCH 3/6] [MNT-24604] Cross testing --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a3f3aa554e..f57b6403d5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,7 +34,7 @@ env: TAS_SCRIPTS: ../alfresco-community-repo/packaging/tests/scripts ALF_LICENCE_S3_PATH: s3://acs-license/acs/alf25-allenabled.lic ALF_LICENCE_LOCAL_PATH: /tmp/licence.lic - PYTHON_VERSION: 3.7.15 + PYTHON_VERSION: 3.8.12 DTAS_VERSION: v1.5.5 jobs: From 2fac6c65ade9e0a8139987039ba620f4c486cb61 Mon Sep 17 00:00:00 2001 From: cezary-witkowski Date: Tue, 7 Jan 2025 15:59:59 +0100 Subject: [PATCH 4/6] [MNT-24604] Use local variable --- scripts/ci/build_functions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ci/build_functions.sh b/scripts/ci/build_functions.sh index ad072ccb81..4a0454c64d 100644 --- a/scripts/ci/build_functions.sh +++ b/scripts/ci/build_functions.sh @@ -76,7 +76,7 @@ function remoteBranchExists() { local REMOTE_REPO="${1}" local BRANCH="${2}" - git ls-remote --exit-code --heads "https://${GIT_USERNAME}:${GIT_PASSWORD}@${REMOTE_REPO}" "${BRANCH_NAME}" &>/dev/null + git ls-remote --exit-code --heads "https://${GIT_USERNAME}:${GIT_PASSWORD}@${REMOTE_REPO}" "${BRANCH}" &>/dev/null } function identifyUpstreamSourceBranch() { From 646393fb5ffbc4bc721dfe898eef723435387861 Mon Sep 17 00:00:00 2001 From: cezary-witkowski Date: Tue, 7 Jan 2025 16:59:25 +0100 Subject: [PATCH 5/6] [MNT-24604] Debug failing job --- .github/workflows/ci.yml | 2 ++ scripts/ci/build_functions.sh | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f57b6403d5..2758ee337a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -70,6 +70,8 @@ jobs: steps: - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.1 - uses: actions/checkout@v4 + with: + persist-credentials: false - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.1 - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.1 - uses: Alfresco/alfresco-build-tools/.github/actions/github-download-file@v7.1.1 diff --git a/scripts/ci/build_functions.sh b/scripts/ci/build_functions.sh index 4a0454c64d..e053c99dde 100644 --- a/scripts/ci/build_functions.sh +++ b/scripts/ci/build_functions.sh @@ -76,7 +76,7 @@ function remoteBranchExists() { local REMOTE_REPO="${1}" local BRANCH="${2}" - git ls-remote --exit-code --heads "https://${GIT_USERNAME}:${GIT_PASSWORD}@${REMOTE_REPO}" "${BRANCH}" &>/dev/null + git ls-remote --exit-code --heads "https://${GIT_USERNAME}:${GIT_PASSWORD}@${REMOTE_REPO}" "${BRANCH}" } function identifyUpstreamSourceBranch() { From 6864c2193d06e214f704901b46036dad61c66b17 Mon Sep 17 00:00:00 2001 From: cezary-witkowski Date: Wed, 8 Jan 2025 08:53:21 +0100 Subject: [PATCH 6/6] [MNT-24605] Revert debug change --- scripts/ci/build_functions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ci/build_functions.sh b/scripts/ci/build_functions.sh index e053c99dde..ad072ccb81 100644 --- a/scripts/ci/build_functions.sh +++ b/scripts/ci/build_functions.sh @@ -76,7 +76,7 @@ function remoteBranchExists() { local REMOTE_REPO="${1}" local BRANCH="${2}" - git ls-remote --exit-code --heads "https://${GIT_USERNAME}:${GIT_PASSWORD}@${REMOTE_REPO}" "${BRANCH}" + git ls-remote --exit-code --heads "https://${GIT_USERNAME}:${GIT_PASSWORD}@${REMOTE_REPO}" "${BRANCH_NAME}" &>/dev/null } function identifyUpstreamSourceBranch() {