diff --git a/.github/updatecli/updatecli_amis_values.yml b/.github/updatecli/updatecli_amis_values.yml index 0fa1546f3..3cf275518 100644 --- a/.github/updatecli/updatecli_amis_values.yml +++ b/.github/updatecli/updatecli_amis_values.yml @@ -38,8 +38,8 @@ targets: file: molecule/default/vars-ubuntu-community.yml key: $.MOLECULE_IT_IMAGE_ID source: ub24 - molecule_default_ubuntu22_73: - file: molecule/default/vars-ubuntu22-73.yml + molecule_default_ubuntu22_74: + file: molecule/default/vars-ubuntu22-74.yml key: $.MOLECULE_IT_IMAGE_ID source: ub22 molecule_multimachine: diff --git a/.github/updatecli/updatecli_maven_v73_values.yml b/.github/updatecli/updatecli_maven_v73_values.yml deleted file mode 100644 index 2b7f287b4..000000000 --- a/.github/updatecli/updatecli_maven_v73_values.yml +++ /dev/null @@ -1,6 +0,0 @@ -updatecli_matrix_version: 7.3.N -updatecli_amps_release_branch: "release/7.3.2" -ansible_version_file: vars/acs73.yml -artifacts: - alfresco-audit-storage: - updatecli_matrix_component_key: false # disabled because unsupported diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 1d8e94e9e..f22cd1d13 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -24,6 +24,6 @@ jobs: uses: Alfresco/jekyll-build-tools/.github/workflows/jekyll-publish.yml@3552fc7b84bebc88545e7d78e64e2ff85388877a with: working-directory: docs - publish: ${{ github.event_name == 'push' && github.ref_name == 'master'}} + publish: ${{ github.event_name == 'push' && github.ref_name == 'master' }} validate-html: true - validate-html-args: --ignore-urls "/linux.die.net/" + validate-html-args: --ignore-urls "/linux.die.net/,https://www.vagrantup.com/downloads" diff --git a/.github/workflows/enteprise.yml b/.github/workflows/enteprise.yml index fae9fdd2a..4fa8d5369 100644 --- a/.github/workflows/enteprise.yml +++ b/.github/workflows/enteprise.yml @@ -185,8 +185,8 @@ jobs: matrix: molecule_scenario: - name: default - vars: vars-ubuntu22-73.yml - desc: EC2 ACS 7.3 (Ubuntu 22.04) + vars: vars-ubuntu22-74.yml + desc: EC2 ACS 7.4 (Ubuntu 22.04) - name: default vars: vars-rocky8.yml desc: EC2 ACS 7.4 (Rocky Linux 8.10) diff --git a/docs/deployment-guide.md b/docs/deployment-guide.md index a50067114..ace0695c5 100644 --- a/docs/deployment-guide.md +++ b/docs/deployment-guide.md @@ -452,7 +452,7 @@ The following systemd services are deployed and can be used to stop and start Al | Service Name | Purpose | |:------------------------------------------|:----------------------------------------------------------------------------------------| | `activemq.service` | ActiveMQ Service | -| `postgresql-.service` | Postgresql DB Service (where `` is 15 for ACS 23 and 14 for 7.4 and 7.3) | +| `postgresql-.service` | Postgresql DB Service (where `` is 15 for ACS 23 and 14 for 7.4) | | `nginx.service` | Nginx Service | | `alfresco-content.service` | Alfresco Content Service | | `alfresco-search.service` | Alfresco Search Service | @@ -1260,7 +1260,7 @@ This playbook will uninstall the sevices which belong to the specific hosts. Bel * alfresco-content.service * nginx.service * activemq.service - * postgresql-`version`.service (where `version` is 15 for ACS 23 and 14 for 7.3 & 7.4) + * postgresql-`version`.service (where `version` is 15 for ACS 23 and 14 for 7.4) 2. Remove the following packages: * ImageMagick diff --git a/docs/overview.md b/docs/overview.md index 301a8468b..ad188673f 100644 --- a/docs/overview.md +++ b/docs/overview.md @@ -90,25 +90,26 @@ distributions. The table below shows the version of the components deployed by the playbook for ACS 7.x onward. -| Component | 25.1 Enterprise (Community) | 23.4 Enterprise | 7.4 Enterprise | 7.3 Enterprise | -| ------------------- | --------------------------- | --------------- | -------------- | -------------- | -| OpenJDK | 17.0.15 | 17.0.15 | 17.0.15 | 17.0.15 | -| Apache Tomcat | 10.1.43 | 10.1.43 | 9.0.107 | 9.0.107 | -| PostgreSQL | 16.x | 15.x | 14.x | 14.x | -| Apache ActiveMQ | 5.18.7 | 5.18.7 | 5.17.7 | 5.17.7 | -| Repository | 25.2.0 | 23.5.0 | 7.4.2.4 | 7.3.2.3 | -| Share | 25.2.0 | 23.5.0 | 7.4.2.4 | 7.3.2.3 | -| Search Services | 2.0.16 | 2.0.16 | 2.0.16 | 2.0.16 | -| Search Enterprise | 5.1.1.1 (n/a) | 5.1.1.1 | 3.3.3 | 3.2.1 | -| All-In-One T-Engine | 5.2.1 | 5.2.1 | 5.2.1 | 5.2.1 | -| AOS | 3.3.0 | 3.3.0 | 1.6.3 | 1.5.0 | -| Google Docs | 4.1.0 | 4.1.0 | 3.4.2 | 3.4.2 | -| Digital Workspace | 7.1.0 (n/a) | 5.3.0 | 5.0.0 | 4.4.1 | -| Control Center | 10.1.0 | 9.3.0 | 8.0.0 | n/a | -| Transform Router | 4.2.1 (n/a) | 4.2.1 | 4.2.1 | 4.2.1 | -| Shared File Store | 4.2.1 (n/a) | 4.2.1 | 4.2.1 | 4.2.1 | -| Sync Service | 5.2.0 (n/a) | 5.1.0 | 3.11.3 | 3.11.3 | - +| Component | 25.1 Enterprise (Community) | 23.4 Enterprise | 7.4 Enterprise | +| ------------------- | --------------------------- | --------------- | -------------- | +| OpenJDK | 17.0.15 | 17.0.15 | 17.0.15 | +| Apache Tomcat | 10.1.43 | 10.1.43 | 9.0.107 | +| PostgreSQL | 16.x | 15.x | 14.x | +| Apache ActiveMQ | 5.18.7 | 5.18.7 | 5.17.7 | +| Repository | 25.2.0 | 23.5.0 | 7.4.2.4 | +| Share | 25.2.0 | 23.5.0 | 7.4.2.4 | +| Search Services | 2.0.16 | 2.0.16 | 2.0.16 | +| Search Enterprise | 5.1.1.1 (n/a) | 5.1.1.1 | 3.3.3 | +| All-In-One T-Engine | 5.2.1 | 5.2.1 | 5.2.1 | +| AOS | 3.3.0 | 3.3.0 | 1.6.3 | +| Google Docs | 4.1.0 | 4.1.0 | 3.4.2 | +| Digital Workspace | 7.1.0 (n/a) | 5.3.0 | 5.0.0 | +| Control Center | 10.1.0 | 9.3.0 | 8.0.0 | +| Transform Router | 4.2.1 (n/a) | 4.2.1 | 4.2.1 | +| Shared File Store | 4.2.1 (n/a) | 4.2.1 | 4.2.1 | +| Sync Service | 5.2.0 (n/a) | 5.1.0 | 3.11.3 | + +> Support for ACS 7.3 has been deprecated since October 2025, but you can still use the latest playbook that supported it ([v3.4.0](https://github.com/Alfresco/alfresco-ansible-deployment/releases/tag/v3.4.0)) > Support for ACS 7.2 has been deprecated since February 2025, but you can still use the latest playbook that supported it ([v2.12.0](https://github.com/Alfresco/alfresco-ansible-deployment/releases/tag/v2.12.0)) > Support for ACS 7.1 has been deprecated since November 2024, but you can still use the latest playbook that supported it ([v2.11.2](https://github.com/Alfresco/alfresco-ansible-deployment/releases/tag/v2.11.2)) > Support for ACS 7.0 has been deprecated since April 2024, but you can still use the latest playbook that supported it ([v2.6.0](https://github.com/Alfresco/alfresco-ansible-deployment/releases/tag/v2.6.0)) diff --git a/molecule/default/vars-ubuntu22-73.yml b/molecule/default/vars-ubuntu22-73.yml deleted file mode 100644 index 45d2e072a..000000000 --- a/molecule/default/vars-ubuntu22-73.yml +++ /dev/null @@ -1,4 +0,0 @@ -MOLECULE_IT_IMAGE_ID: ami-01ed326081451d2b1 # ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20251001 -MOLECULE_IT_EXTRA_VARS: acs_play_major_version=73 -MOLECULE_IT_TEST_CONFIG: tests/test-config-7.3.json -MOLECULE_IT_PLATFORM: ubuntu22-73 diff --git a/molecule/default/vars-ubuntu22-74.yml b/molecule/default/vars-ubuntu22-74.yml new file mode 100644 index 000000000..b02f94b9c --- /dev/null +++ b/molecule/default/vars-ubuntu22-74.yml @@ -0,0 +1,4 @@ +MOLECULE_IT_IMAGE_ID: ami-01ed326081451d2b1 # ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20251001 +MOLECULE_IT_EXTRA_VARS: acs_play_major_version=74 +MOLECULE_IT_TEST_CONFIG: tests/test-config-7.4.json +MOLECULE_IT_PLATFORM: ubuntu22-74 diff --git a/tests/test-config-7.3.json b/tests/test-config-7.3.json deleted file mode 100644 index d06582e92..000000000 --- a/tests/test-config-7.3.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "config": { - "host": "TEST_URL", - "username": "admin", - "password": "admin", - "search_retry_interval_seconds": "30" - }, - "assertions": { - "acs": { - "edition": "Enterprise", - "version": "7.3.2", - "identity": false, - "modules": [ - { - "id": "org.alfresco.integrations.google.docs", - "version": "3.4.2", - "installed": true - }, - { - "id": "alfresco-aos-module", - "version": "1.5.0", - "installed": true - }, - { - "id": "org_alfresco_device_sync_repo", - "version": "3.11.3", - "installed": true - } - ] - }, - "adw": { - "version": "2.9.0" - } - } - } diff --git a/vars/acs73.yml b/vars/acs73.yml deleted file mode 100644 index d2ab7fc68..000000000 --- a/vars/acs73.yml +++ /dev/null @@ -1,32 +0,0 @@ -supported_os: - RedHat: - versions: - - 8.10 - - 8.9 - - 8.8 - - 8.7 - Ubuntu: - versions: - - 22.04 -ats_mtls_capable: false -acs_play_activemq_version: 5.17.7 -acs_play_adw_version: 4.4.1 -acs_play_search_version: 2.0.16 -acs_play_java_version: "{{ acs_play_default_java_version }}" -acs_play_search_enterprise_version: 3.2.1 -acs_play_sfs_version: 4.2.1 -acs_play_sync_version: 3.11.3 -acs_play_tomcat_version: 9.0.107 -acs_play_trouter_version: 4.2.1 -acs_play_transformers_libreoffice_version: 7.2.5.1 -acs_play_transformers_pdf_version: 1.1 -acs_play_transformers_imagemagick_version: 7.1.0-16-ci-11 -acs_play_transformers_aio_version: 5.2.1 -acs_play_jdbc_pg_driver_version: "{{ default_jdbc_pg_driver_version }}" -acs_play_postgres_major_version: 14 -acs_play_repository_acs_version: 7.3.2.3 -acs_play_repository_api_explorer_version: 7.3.0 -acs_play_repository_amp_googledrive_repo_version: 3.4.2 -acs_play_repository_amp_googledrive_share_version: 3.4.2 -acs_play_repository_amp_device_sync_version: 3.11.3 -acs_play_repository_amp_aos_module_version: 1.5.0