OPSEXP-2739: bump Alfresco components and third parties (#901)

Co-authored-by: alxgomz <[email protected]>
Alfresco · Jul 11, 2024 · f4e001b · f4e001b
1 parent cc52c77
commit f4e001b
Show file tree

Hide file tree

Showing 21 changed files with 67 additions and 58 deletions.
diff --git a/.github/workflows/precommit.yml b/.github/workflows/precommit.yml
@@ -5,6 +5,7 @@ on:
   push:
     branches:
       - master
+  workflow_dispatch:
 
 jobs:
   pre-commit:

diff --git a/.github/workflows/updatecli.yml b/.github/workflows/updatecli.yml
@@ -39,7 +39,7 @@ jobs:
           token: ${{ secrets.BOT_GITHUB_TOKEN }}
 
       - name: Install Updatecli
-        uses: updatecli/updatecli-action@9a37c7e35598d7b37d8e7568b40ed9538112be01 # v2.57.0
+        uses: updatecli/updatecli-action@eb158f6fd9e425b940a6750d6318f98e050ac390  # v2.61.0
 
       - name: Run Updatecli in ${{ env.UPDATECLI_MODE }} mode
         run: >-

diff --git a/7.1.N-extra-vars.yml b/7.1.N-extra-vars.yml
@@ -53,9 +53,9 @@ dependencies_version:
   postgresql_connector: 42.6.1
   postgres_major_version: 13
   activemq: 5.16.7
-  java: 11.0.15
-  java_build: 10
-  tomcat: 9.0.86
+  java: 11.0.23
+  java_build: 9
+  tomcat: 9.0.91
   libreoffice: 7.0.6.2
   pdf_renderer: 1.1
   imagemagick: 7.1.0-16-ci-7
diff --git a/7.2.N-extra-vars.yml b/7.2.N-extra-vars.yml
@@ -2,7 +2,7 @@ acs:
   artifact_name: alfresco-content-services-distribution
   edition: Enterprise
   repository: "{{ nexus_repository.enterprise_releases }}"
-  version: 7.2.2
+  version: 7.2.2.1
 amps:
   aos_module:
     repository: "{{ nexus_repository.releases }}/aos-module/alfresco-aos-module"
@@ -27,7 +27,7 @@ search_enterprise:
 search:
   artifact_name: alfresco-search-services
   repository: "{{ nexus_repository.releases }}"
-  version: 2.0.10
+  version: 2.0.11
 transform:
   artifact_name: alfresco-transform-core-aio
   repository: "{{ nexus_repository.releases }}"
@@ -51,9 +51,9 @@ dependencies_version:
   postgresql_connector: 42.6.1
   postgres_major_version: 13
   activemq: 5.16.7
-  java: 11.0.15
-  java_build: 10
-  tomcat: 9.0.86
+  java: 11.0.23
+  java_build: 9
+  tomcat: 9.0.91
   libreoffice: 7.2.5.1
   pdf_renderer: 1.1
   imagemagick: 7.1.0-16-ci-7
diff --git a/7.3.N-extra-vars.yml b/7.3.N-extra-vars.yml
@@ -2,7 +2,7 @@ acs:
   artifact_name: alfresco-content-services-distribution
   edition: Enterprise
   repository: "{{ nexus_repository.enterprise_releases }}"
-  version: 7.3.2
+  version: 7.3.2.1
 amps:
   aos_module:
     repository: "{{ nexus_repository.releases }}/aos-module/alfresco-aos-module"
@@ -27,7 +27,7 @@ search_enterprise:
 search:
   artifact_name: alfresco-search-services
   repository: "{{ nexus_repository.releases }}"
-  version: 2.0.10
+  version: 2.0.11
 transform:
   artifact_name: alfresco-transform-core-aio
   repository: "{{ nexus_repository.releases }}"
@@ -51,9 +51,9 @@ dependencies_version:
   postgresql_connector: 42.6.1
   postgres_major_version: 13
   activemq: 5.17.6
-  java: 11.0.15
-  java_build: 10
-  tomcat: 9.0.86
+  java: 11.0.23
+  java_build: 9
+  tomcat: 9.0.91
   libreoffice: 7.2.5.1
   pdf_renderer: 1.1
   imagemagick: 7.1.0-16-ci-7
diff --git a/7.4.N-extra-vars.yml b/7.4.N-extra-vars.yml
@@ -2,7 +2,7 @@ acs:
   artifact_name: alfresco-content-services-distribution
   edition: Enterprise
   repository: "{{ nexus_repository.enterprise_releases }}"
-  version: 7.4.2
+  version: 7.4.2.1
 amps:
   aos_module:
     repository: "{{ nexus_repository.releases }}/aos-module/alfresco-aos-module"
@@ -30,19 +30,19 @@ search_enterprise:
 search:
   artifact_name: alfresco-search-services
   repository: "{{ nexus_repository.releases }}"
-  version: 2.0.10
+  version: 2.0.11
 transform:
   artifact_name: alfresco-transform-core-aio
   repository: "{{ nexus_repository.releases }}"
-  version: 5.1.2
+  version: 5.1.3
 trouter:
   artifact_name: alfresco-transform-router
   repository: "{{ nexus_repository.enterprise_releases }}"
-  version: 4.1.2
+  version: 4.1.3
 sfs:
   artifact_name: alfresco-shared-file-store-controller
   repository: "{{ nexus_repository.enterprise_releases }}"
-  version: 4.1.2
+  version: 4.1.3
 adw:
   artifact_name: alfresco-digital-workspace
   repository: "{{ nexus_repository.enterprise_releases }}"
@@ -59,9 +59,9 @@ dependencies_version:
   postgresql_connector: 42.6.1
   postgres_major_version: 14
   activemq: 5.17.6
-  java: 17.0.3
-  java_build: 7
-  tomcat: 9.0.86
+  java: 17.0.11
+  java_build: 9
+  tomcat: 9.0.91
   libreoffice: 7.2.5.1
   pdf_renderer: 1.1
   imagemagick: 7.1.0-16-ci-7
diff --git a/README.md b/README.md
@@ -198,8 +198,7 @@ Follow this quick checklist:
 * run [enterprise-extended](https://github.com/Alfresco/alfresco-ansible-deployment/actions/workflows/enterprise-extended.yml) and make sure it is green
 * ensure that the [versions table in the main readme](docs/overview.md#versioning) has been updated
 * ensure that docker images and AMI id for the root molecule tests are
-  reflecting any eventual minor OS release (e.g. [default
-  suite](../molecule/default/))
+  reflecting any minor OS release (e.g. [default suite](../molecule/default/))
 
 ### Tag and release
 

diff --git a/community-extra-vars.yml b/community-extra-vars.yml
@@ -10,15 +10,15 @@ api_explorer:
 transform:
   artifact_name: alfresco-transform-core-aio
   repository: "{{ nexus_repository.releases }}"
-  version: 5.1.2
+  version: 5.1.3
 acc:
   artifact_name: alfresco-control-center
   repository: "{{ nexus_repository.releases }}"
   version: 8.4.1
 search:
   artifact_name: alfresco-search-services
   repository: "{{ nexus_repository.releases }}"
-  version: 2.0.10
+  version: 2.0.11
 amps:
   aos_module:
     repository: "{{ nexus_repository.releases }}/aos-module/alfresco-aos-module"

diff --git a/docs/overview.md b/docs/overview.md
@@ -76,24 +76,24 @@ distributions.
 
 The table below shows the version of the components deployed by the playbook for ACS 7.x onward.
 
-| Component           | 23.2 Enterprise & Community | 7.4 Enterprise | 7.3 Enterprise | 7.2 Enterprise | 7.1 Enterprise |
+| Component           | 23.2 Enterprise (Community) | 7.4 Enterprise | 7.3 Enterprise | 7.2 Enterprise | 7.1 Enterprise |
 |---------------------|-----------------------------|----------------|----------------|----------------|----------------|
-| OpenJDK             | 17.0.9                      | 17.0.3         | 17.0.3         | 11.0.15        | 11.0.15        |
-| Apache Tomcat       | 10.1.20                     | 9.0.86         | 9.0.86         | 9.0.86         | 9.0.86         |
+| OpenJDK             | 17.0.11                     | 17.0.11        | 11.0.23        | 11.0.23        | 11.0.23        |
+| Apache Tomcat       | 10.1.25                     | 9.0.91         | 9.0.91         | 9.0.91         | 9.0.91         |
 | PostgreSQL          | 15.x                        | 14.x           | 14.x           | 13.x           | 13.x           |
 | Apache ActiveMQ     | 5.18.4                      | 5.17.6         | 5.17.6         | 5.16.7         | 5.16.7         |
-| Repository          | 23.2.1                      | 7.4.2          | 7.3.2          | 7.2.2          | 7.1.1.10       |
-| Share               | 23.2.1                      | 7.4.2          | 7.3.2          | 7.2.2          | 7.1.1.10       |
-| Search Services     | 2.0.10                      | 2.0.10         | 2.0.10         | 2.0.10         | 2.0.2.2        |
-| Search Enterprise   | 4.0.1 (Enterprise only)     | 3.3.3          | 3.2.1          | 3.1.1.1        | 3.1.1.1        |
-| All-In-One T-Engine | 5.1.2                       | 5.1.2          | 3.1.2          | 3.1.2          | 3.1.2          |
+| Repository          | 23.2.2 (23.2.1)             | 7.4.2.1        | 7.3.2.1        | 7.2.2.1        | 7.1.1.10       |
+| Share               | 23.2.2 (23.2.1)             | 7.4.2.1        | 7.3.2.1        | 7.2.2.1        | 7.1.1.10       |
+| Search Services     | 2.0.11                      | 2.0.11         | 2.0.11         | 2.0.11         | 2.0.2.2        |
+| Search Enterprise   | 4.0.1 (n/a)                 | 3.3.3          | 3.2.1          | 3.1.1.1        | 3.1.1.1        |
+| All-In-One T-Engine | 5.1.3                       | 5.1.3          | 3.1.2          | 3.1.2          | 3.1.2          |
 | AOS                 | 3.0.0                       | 1.6.2          | 1.5.0          | 1.4.1          | 1.4.1          |
 | Google Docs         | 4.0.0                       | 3.4.2          | 3.3.1          | 3.2.2          | 3.2.1          |
-| Digital Workspace   | 4.4.1 (Enterprise only)     | 4.0.0          | 3.1.0          | 3.0.0          | 2.6.1          |
+| Digital Workspace   | 4.4.1 (n/a)                 | 4.0.0          | 3.1.0          | 3.0.0          | 2.6.1          |
 | Control Center      | 8.4.1                       | 8.0.0          | n/a            | n/a            | n/a            |
-| Transform Router    | 4.1.2 (Enterprise only)     | 4.1.2          | 2.1.2          | 2.1.2          | 2.1.2          |
-| Shared File Store   | 4.1.2 (Enterprise only)     | 4.1.2          | 2.1.2          | 2.1.2          | 2.1.2          |
-| Sync Service        | 5.0.0 (Enterprise only)     | 3.11.1         | 3.11.1         | 3.11.1         | 3.11.1         |
+| Transform Router    | 4.1.3 (n/a)                 | 4.1.2          | 2.1.2          | 2.1.2          | 2.1.2          |
+| Shared File Store   | 4.1.3 (n/a)                 | 4.1.2          | 2.1.2          | 2.1.2          | 2.1.2          |
+| Sync Service        | 5.0.0 (n/a)                 | 3.11.3         | 3.11.3         | 3.11.3         | 3.11.3         |
 
 > 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))
 > Support for ACS 6.2 has been deprecated since November 2022, but you can still use the latest playbook that supported it ([v2.2.0](https://github.com/Alfresco/alfresco-ansible-deployment/releases/tag/v2.2.0))
diff --git a/group_vars/all.yml b/group_vars/all.yml
@@ -25,7 +25,7 @@ acs:
   artifact_name: alfresco-content-services-distribution
   edition: Enterprise
   repository: "{{ nexus_repository.enterprise_releases }}"
-  version: 23.2.1
+  version: 23.2.2
 amps:
   aos_module:
     repository: "{{ nexus_repository.releases }}/aos-module/alfresco-aos-module"
@@ -53,19 +53,19 @@ search_enterprise:
 search:
   artifact_name: alfresco-search-services
   repository: "{{ nexus_repository.releases }}"
-  version: 2.0.10
+  version: 2.0.11
 transform:
   artifact_name: alfresco-transform-core-aio
   repository: "{{ nexus_repository.releases }}"
-  version: 5.1.2
+  version: 5.1.3
 trouter:
   artifact_name: alfresco-transform-router
   repository: "{{ nexus_repository.enterprise_releases }}"
-  version: 4.1.2
+  version: 4.1.3
 sfs:
   artifact_name: alfresco-shared-file-store-controller
   repository: "{{ nexus_repository.enterprise_releases }}"
-  version: 4.1.2
+  version: 4.1.3
 adw:
   artifact_name: alfresco-digital-workspace
   repository: "{{ nexus_repository.enterprise_releases }}"
@@ -184,9 +184,9 @@ dependencies_version:
   postgresql_connector: 42.6.1
   postgres_major_version: 15
   activemq: 5.18.4
-  java: 17.0.9
+  java: 17.0.11
   java_build: 9
-  tomcat: 10.1.20
+  tomcat: 10.1.25
   libreoffice: 7.2.5.1
   pdf_renderer: 1.1
   imagemagick: 7.1.0-16-ci-7

diff --git a/molecule/default/vars-rocky9.yml b/molecule/default/vars-rocky9.yml
@@ -1,4 +1,4 @@
-MOLECULE_IT_IMAGE_ID: ami-0d071a78283fb19c3 # Rocky-9-EC2-Base-9.4-20240509.0.x86_64
+MOLECULE_IT_IMAGE_ID: ami-0230bf6b41b114fef # Rocky-9-EC2-Base-9.4-20240509.0.x86_64
 MOLECULE_IT_EXTRA_VARS: tests/test-extra-vars.yml
 MOLECULE_IT_TEST_CONFIG: tests/test-config.json
 MOLECULE_IT_PLATFORM: rocky9
diff --git a/molecule/default/vars-ubuntu-community.yml b/molecule/default/vars-ubuntu-community.yml
@@ -1,4 +1,4 @@
-MOLECULE_IT_IMAGE_ID: ami-0168439b76a4d4129 # ubuntu-minimal/images/hvm-ssd/ubuntu-jammy-22.04-amd64-minimal-20240515
+MOLECULE_IT_IMAGE_ID: ami-023de9d2acab166f2 # ubuntu-minimal/images/hvm-ssd/ubuntu-jammy-22.04-amd64-minimal-20240701
 MOLECULE_IT_EXTRA_VARS: community-extra-vars.yml
 MOLECULE_IT_TEST_CONFIG: tests/test-config-community.json
 MOLECULE_IT_PLATFORM: ubuntu-community
diff --git a/molecule/default/vars-ubuntu18.yml b/molecule/default/vars-ubuntu18.yml
@@ -1,4 +1,4 @@
-MOLECULE_IT_IMAGE_ID: ami-08bd6fc5c8daf3309 # ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-20230517
+MOLECULE_IT_IMAGE_ID: ami-02076d50a3b3930d0 # ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server
 MOLECULE_IT_EXTRA_VARS: 7.1.N-extra-vars.yml
 MOLECULE_IT_TEST_CONFIG: tests/test-config-7.1.json
 MOLECULE_IT_PLATFORM: ubuntu18
diff --git a/molecule/default/vars-ubuntu20-72.yml b/molecule/default/vars-ubuntu20-72.yml
@@ -1,4 +1,4 @@
-MOLECULE_IT_IMAGE_ID: ami-0136ddddd07f0584f # ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20230517
+MOLECULE_IT_IMAGE_ID: ami-0887c7673564b061c # ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20240704
 MOLECULE_IT_EXTRA_VARS: 7.2.N-extra-vars.yml
 MOLECULE_IT_TEST_CONFIG: tests/test-config-7.2.json
 MOLECULE_IT_PLATFORM: ubuntu20-72
diff --git a/molecule/default/vars-ubuntu20-73.yml b/molecule/default/vars-ubuntu20-73.yml
@@ -1,4 +1,4 @@
-MOLECULE_IT_IMAGE_ID: ami-081ff4b9aa4e81a08
+MOLECULE_IT_IMAGE_ID: ami-0887c7673564b061c # ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20240704
 MOLECULE_IT_EXTRA_VARS: 7.3.N-extra-vars.yml
 MOLECULE_IT_TEST_CONFIG: tests/test-config-7.3.json
 MOLECULE_IT_PLATFORM: ubuntu20-73
diff --git a/molecule/multimachine/vars.yml b/molecule/multimachine/vars.yml
@@ -1,4 +1,4 @@
-MOLECULE_IT_IMAGE_ID: ami-05bda15429aee9fb5 # RHEL-9.4.0_HVM-20240423-x86_64-62-Hourly2-GP3
+MOLECULE_IT_IMAGE_ID: ami-07d4917b6f95f5c2a # RHEL-9.4.0_HVM-20240605-x86_64-82-Hourly2-GP3
 MOLECULE_IT_EXTRA_VARS: tests/test-extra-vars.yml
 MOLECULE_IT_TEST_CONFIG: tests/test-config.json
 MOLECULE_IT_PLATFORM: multimachine
diff --git a/molecule/opensearch/vars.yml b/molecule/opensearch/vars.yml
@@ -1,3 +1,3 @@
-MOLECULE_IT_IMAGE_ID: ami-05bda15429aee9fb5 # RHEL-9.4.0_HVM-20240423-x86_64-62-Hourly2-GP3
+MOLECULE_IT_IMAGE_ID: ami-07d4917b6f95f5c2a # RHEL-9.4.0_HVM-20240605-x86_64-82-Hourly2-GP3
 MOLECULE_IT_TEST_CONFIG: tests/test-config-latest-nosync.json
 MOLECULE_IT_PLATFORM: opensearch
diff --git a/scripts/updatecli/updatecli_community.yml b/scripts/updatecli/updatecli_community.yml
@@ -1,5 +1,6 @@
 acs:
   version: "23.2"
+  edition: community
 
 acc:
   version: "8.4"

diff --git a/scripts/updatecli/updatecli_config.tpl b/scripts/updatecli/updatecli_config.tpl
@@ -1,15 +1,23 @@
 name: ACS update pipeline
 
 scms:
-  acsRepo:
+  acsEntRepo:
     kind: github
     spec:
       owner: Alfresco
       repository: acs-packaging
       branch: master
       token: {{ requiredEnv "UPDATECLI_GITHUB_TOKEN" }}
       username: {{ requiredEnv "UPDATECLI_GITHUB_USERNAME" }}
-  acsEntRepo:
+  acsComRepo:
+    kind: github
+    spec:
+      owner: Alfresco
+      repository: acs-community-packaging
+      branch: master
+      token: {{ requiredEnv "UPDATECLI_GITHUB_TOKEN" }}
+      username: {{ requiredEnv "UPDATECLI_GITHUB_USERNAME" }}
+  agsAmpRepo:
     kind: github
     spec:
       owner: Alfresco
@@ -103,7 +111,7 @@ sources:
   acs:
     name: ACS {{ .acs.version }}.x
     kind: gittag
-    scmid: acsRepo
+    scmid: {{ eq .acs.edition "community" | ternary "acsComRepo" "acsEntRepo" }}
     spec:
       versionFilter:
         kind: regex
@@ -132,7 +140,7 @@ sources:
   agsAmp:
     name: AGS AMP {{ .ags.version }}.x
     kind: gittag
-    scmid: acsEntRepo
+    scmid: agsAmpRepo
     spec:
       versionFilter:
         kind: regex

diff --git a/tests/test-config-latest-nosync.json b/tests/test-config-latest-nosync.json
@@ -8,7 +8,7 @@
     "assertions": {
       "acs": {
         "edition": "Enterprise",
-        "version": "23.2.0",
+        "version": "23.2.2",
         "identity": false,
         "modules": [
           {

diff --git a/tests/test-config.json b/tests/test-config.json
@@ -8,7 +8,7 @@
     "assertions": {
       "acs": {
         "edition": "Enterprise",
-        "version": "23.2.0",
+        "version": "23.2.2",
         "identity": false,
         "modules": [
           {
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,6 +5,7 @@ on: @@
       push:
         branches:
           - master
+      workflow_dispatch:
     jobs:
       pre-commit:
@@ Expand Down @@