Skip to content

Commit 3fe7e60

Browse files
gionngionn
authored
OPSEXP-2948 Prepare for v25 release (#1019)
1 parent 3caf17c commit 3fe7e60

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+294
-161
lines changed

‎.github/actions/setup-workspace/action.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ description: 'Do some clever stuff on the workspace before running tests'
33
runs:
44
using: "composite"
55
steps:
6-
- name: Use internal nexus repository when branch is a future release
7-
if: startsWith(github.ref_name, 'next/') || startsWith(github.head_ref, 'next/') || contains(github.event.pull_request.labels.*.name, 'ci-prerelease')
6+
- name: Switch to internal repository when current or base branch is a next release branch
7+
if: startsWith(github.ref_name, 'next/') || startsWith(github.head_ref, 'next/') || startsWith(github.base_ref, 'next/') || contains(github.event.pull_request.labels.*.name, 'ci-prerelease')
88
run: |
99
yq -i '.artifacts_repositories.enterprise.repository = "groups/internal"' playbooks/group_vars/all.yml
1010
echo "::warning title=pre-release branch::Nexus enterprise repository override enabled, using groups/internal as main repository"

‎.github/updatecli/updatecli_maven_roles_values.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ artifacts:
3838
ansible_version_file: roles/transformers/defaults/main.yml
3939
updatecli_matrix_component_key: tengine-aio
4040
alfresco-transform-router:
41-
artifact_name_file: roles/transformers/defaults/main.yml
42-
artifact_name_key: $.transformers_aio_artifact_name
43-
artifact_version_key: $.transformers_aio_version
44-
ansible_version_file: roles/transformers/defaults/main.yml
41+
artifact_name_file: roles/trouter/defaults/main.yml
42+
artifact_name_key: $.trouter_artifact_name
43+
artifact_version_key: $.trouter_version
44+
ansible_version_file: roles/trouter/defaults/main.yml
4545
updatecli_matrix_component_key: trouter
4646
alfresco-shared-file-store-controller:
4747
artifact_name_file: roles/sfs/defaults/main.yml

‎.github/updatecli/updatecli_maven_v23_values.yml

+1-6
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
updatecli_matrix_version: current
1+
updatecli_matrix_version: 23.N
22
updatecli_amps_release_branch: "release/23.N"
33
ansible_version_file: vars/acs23.yml
4-
artifacts:
5-
alfresco-googledrive-repo-community:
6-
updatecli_scm_id: acsComRepo
7-
updatecli_xml_target: "/project/properties/alfresco.googledrive.version"
8-
artifact_version_key: "$.acs_play_community_repository_amp_googledrive_repo_version"

‎.github/updatecli/updatecli_maven_v25_values.yml

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
updatecli_matrix_version: current
2+
updatecli_amps_release_branch: "release/25.1"
3+
ansible_version_file: vars/acs25.yml
4+
artifacts:
5+
alfresco-googledrive-repo-community:
6+
updatecli_scm_id: acsComRepo
7+
updatecli_xml_target: "/project/properties/alfresco.googledrive.version"
8+
artifact_version_key: "$.acs_play_community_repository_amp_googledrive_repo_version"

‎.github/updatecli/updatecli_maven_values.yml

+5
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,11 @@ artifacts:
2727
artifact_name_key: $.acs_play_repository_acs_artifact_name
2828
artifact_version_key: $.acs_play_repository_acs_version
2929
updatecli_matrix_component_key: acs
30+
alfresco-api-explorer:
31+
artifact_name_file: playbooks/group_vars/repository.yml
32+
artifact_name_key: $.acs_play_repository_api_explorer_artifact_name
33+
artifact_version_key: $.acs_play_repository_api_explorer_version
34+
updatecli_matrix_component_key: acs
3035
alfresco-search-enterprise:
3136
artifact_name_file: playbooks/group_vars/search_enterprise.yml
3237
artifact_name_key: $.acs_play_search_enterprise_artifact_name

‎.github/workflows/community.yml

+5-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ name: "community"
22

33
on:
44
pull_request:
5-
branches: [master]
5+
branches:
6+
- master
7+
- 'next/**'
68
paths-ignore:
79
- "docs/**"
810
- "*.md"
@@ -54,7 +56,7 @@ jobs:
5456
molecule_distro:
5557
- image: ubuntu:24.04
5658
- image: ubuntu:22.04
57-
- image: rockylinux/rockylinux:9.4
59+
- image: rockylinux/rockylinux:9.5
5860
role:
5961
- name: activemq
6062
- name: common
@@ -114,7 +116,7 @@ jobs:
114116
matrix:
115117
molecule_distro:
116118
- image: ubuntu:22.04
117-
- image: rockylinux/rockylinux:9.4
119+
- image: rockylinux/rockylinux:9.5
118120
scenario:
119121
- name: docker_community
120122
uses: ./.github/workflows/docker.yml

‎.github/workflows/enteprise.yml

+14-17
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ name: "enterprise"
22

33
on:
44
pull_request:
5-
branches: [master]
5+
branches:
6+
- master
7+
- 'next/**'
68
types: [labeled, opened, synchronize, reopened]
79
paths-ignore:
810
- "docs/**"
@@ -72,8 +74,8 @@ jobs:
7274
fail-fast: false
7375
matrix:
7476
molecule_distro:
75-
- image: ubuntu:22.04
76-
- image: rockylinux/rockylinux:9.4
77+
- image: ubuntu:24.04
78+
- image: rockylinux/rockylinux:9.5
7779
role:
7880
- name: adf_app
7981
- name: search_enterprise
@@ -132,8 +134,8 @@ jobs:
132134
fail-fast: false
133135
matrix:
134136
molecule_distro:
135-
- image: ubuntu:22.04
136-
- image: rockylinux/rockylinux:9.4
137+
- image: ubuntu:24.04
138+
- image: rockylinux/rockylinux:9.5
137139
scenario:
138140
- name: pki
139141
- name: elasticsearch
@@ -145,12 +147,7 @@ jobs:
145147
- scenario:
146148
name: docker_enterprise
147149
molecule_distro:
148-
image: rockylinux/rockylinux:9.4
149-
runner: ubuntu-24.04-arm
150-
- scenario:
151-
name: docker_enterprise
152-
molecule_distro:
153-
image: ubuntu:22.04
150+
image: rockylinux/rockylinux:9.5
154151
runner: ubuntu-24.04-arm
155152
- scenario:
156153
name: docker_enterprise
@@ -188,22 +185,22 @@ jobs:
188185
desc: EC2 ACS 7.3 (Ubuntu 22.04)
189186
- name: default
190187
vars: vars-rocky8.yml
191-
desc: EC2 ACS 7.4 (Rocky Linux 8.9)
188+
desc: EC2 ACS 7.4 (Rocky Linux 8.10)
192189
- name: default
193190
vars: vars-rhel8.yml
194-
desc: EC2 ACS 7.4 (RHEL 8.9)
191+
desc: EC2 ACS 7.4 (RHEL 8.10)
195192
- name: default
196193
vars: vars-ubuntu-community.yml
197-
desc: EC2 ACS 23.x Community (Ubuntu 24.04)
194+
desc: EC2 ACS 25.x Community (Ubuntu 24.04)
198195
- name: default
199196
vars: vars-rocky9.yml
200-
desc: EC2 ACS 23.x (Rocky Linux 9.4)
197+
desc: EC2 ACS 23.x (Rocky Linux 9.5)
201198
- name: multimachine
202199
vars: vars.yml
203-
desc: EC2 ACS 23.x clustered (RHEL 9.4)
200+
desc: EC2 ACS 25.x clustered (RHEL 9.5)
204201
- name: opensearch
205202
vars: vars.yml
206-
desc: EC2 ACS 23.x opensearch (RHEL 9.4)
203+
desc: EC2 ACS 25.x opensearch (RHEL 9.5)
207204
env:
208205
AWS_REGION: eu-west-1
209206
MOLECULE_IT_AWS_VPC_SUBNET_ID: subnet-6bdd4223

‎.github/workflows/kics.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ name: kics
22

33
on:
44
pull_request:
5-
branches: [master]
5+
branches:
6+
- master
7+
- 'next/**'
68
paths:
79
- 'playbooks/**'
810
- 'roles/**'

‎.secrets.baseline

+2-2
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@
144144
"filename": "playbooks/acs.yml",
145145
"hashed_secret": "0ca8f28152882e5edb182fc3f7d4ae10a5b10dc5",
146146
"is_verified": false,
147-
"line_number": 608
147+
"line_number": 612
148148
}
149149
],
150150
"roles/activemq/molecule/default/tests/test_activemq.py": [
@@ -188,5 +188,5 @@
188188
}
189189
]
190190
},
191-
"generated_at": "2025-03-13T09:39:39Z"
191+
"generated_at": "2025-03-17T11:58:32Z"
192192
}

‎molecule/default/vars-rocky9.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
MOLECULE_IT_IMAGE_ID: ami-0230bf6b41b114fef # Rocky-9-EC2-Base-9.4-20240523.0.x86_64
1+
MOLECULE_IT_IMAGE_ID: ami-0272534a8a639b9f1 # Rocky-9-EC2-Base-9.5-20241118.0.x86_64
22
MOLECULE_IT_EXTRA_VARS: acs_play_major_version=23
3-
MOLECULE_IT_TEST_CONFIG: tests/test-config.json
3+
MOLECULE_IT_TEST_CONFIG: tests/test-config-23.json
44
MOLECULE_IT_PLATFORM: rocky9

‎molecule/default/verify.yml

+3
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,9 @@
4949
- name: Print multiline pytest stdout as best as we can
5050
debug:
5151
msg: "{{ ansible_failed_result.stdout_lines }}"
52+
- name: Exit with failure
53+
ansible.builtin.fail:
54+
msg: "pytest failed"
5255

5356
- name: Verify adw plugins state
5457
hosts: adw

‎molecule/multimachine/vars.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
MOLECULE_IT_IMAGE_ID: ami-02e145cba2d8ae80e # RHEL-9.4.0_HVM-20250218-x86_64-0-Hourly2-GP3
2-
MOLECULE_IT_EXTRA_VARS: acs_play_major_version=23
2+
MOLECULE_IT_EXTRA_VARS: acs_play_major_version=25
33
MOLECULE_IT_TEST_CONFIG: tests/test-config.json
44
MOLECULE_IT_PLATFORM: multimachine

‎molecule/pki/verify.yml

+19-13
Original file line numberDiff line numberDiff line change
@@ -44,27 +44,33 @@
4444
- name: Populate services facts
4545
ansible.builtin.service_facts:
4646

47-
- name: Check in logs a client did connect
48-
ansible.builtin.slurp:
49-
src: /var/log/alfresco/{{ item.file }}.log
50-
register: ats_log
47+
- name: Check ATS Router logs for client access signal
5148
become: true
52-
until:
53-
- item.pattern in ats_log.content | b64decode
49+
ansible.builtin.slurp:
50+
src: /var/log/alfresco/ats-atr.log
51+
register: ats_router_log
52+
until: >-
53+
"GET Transform Config version" in ats_router_log.content | b64decode
5454
retries: 10
5555
delay: 3
56-
loop:
57-
- file: ats-atr
58-
pattern: GET Transform Config version
59-
edition: Enterprise
60-
- file: ats-shared-fs
61-
pattern: TLS virtual host
62-
edition: Enterprise
56+
no_log: true
57+
58+
- name: Check Shared File Store logs for client access signal
59+
become: true
60+
ansible.builtin.slurp:
61+
src: /var/log/alfresco/ats-shared-fs.log
62+
register: ats_fs_log
63+
until: >-
64+
"TLS virtual host" in ats_fs_log.content | b64decode
65+
retries: 3
66+
delay: 1
67+
no_log: true
6368

6469
- name: Copy cert as PEM
6570
ansible.builtin.copy:
6671
src: /tmp/{{ inventory_hostname }}.crt
6772
dest: /tmp
73+
6874
- name: Check certificates requires auth
6975
ansible.builtin.uri:
7076
url: https://localhost:8090

‎playbooks/acs.yml

+4
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,7 @@
209209
transformers_aio_version: "{{ acs_play_transformers_aio_version }}"
210210
transformers_aio_archive_url: "{{ acs_play_transformers_aio_archive_url }}"
211211
transformers_aio_archive_checksum: "{{ acs_play_transformers_aio_archive_checksum }}"
212+
transformers_truststore_type: "{{ acs_play_default_truststore_type }}"
212213
post_tasks:
213214
- name: Update installation status file with Transformers
214215
become: true
@@ -350,6 +351,7 @@
350351
repository_amp_downloads: "{{ acs_play_repository_amp_downloads }}"
351352
repository_extra_war_downloads: "{{ acs_play_repository_extra_war_downloads }}"
352353
repository_extra_amp_downloads: "{{ acs_play_repository_extra_amp_downloads }}"
354+
repository_truststore_type: "{{ acs_play_default_truststore_type }}"
353355
post_tasks:
354356
- name: Initialize evaluation of currently installed amps
355357
ansible.builtin.set_fact:
@@ -437,6 +439,7 @@
437439
trouter_archive_checksum: "{{ acs_play_trouter_archive_checksum }}"
438440
trouter_archive_username: "{{ nexus_user }}"
439441
trouter_archive_password: "{{ nexus_password }}"
442+
trouter_ats_truststore_type: "{{ acs_play_default_truststore_type }}"
440443
when: acs_is_enterprise
441444
post_tasks:
442445
- name: Update installation status file with Trouter
@@ -487,6 +490,7 @@
487490
sfs_archive_username: "{{ nexus_user }}"
488491
sfs_archive_password: "{{ nexus_password }}"
489492
sfs_ats_keystore: "{{ acs_play_sfs_keystore | default({}) }}"
493+
sfs_ats_truststore_type: "{{ acs_play_default_truststore_type }}"
490494
when: acs_is_enterprise
491495
post_tasks:
492496
- name: Update installation status file with SFS

‎playbooks/group_vars/all.yml

+5-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# For more information please have a look at the
44
# [security_doc](https://github.com/Alfresco/alfresco-ansible-deployment/blob/master/docs/SECURITY.md#specify-trustworthy-applications)
55
acs_play_known_urls: []
6-
acs_play_major_version: 23
6+
acs_play_major_version: 25
77

88
artifacts_repositories:
99
enterprise:
@@ -24,8 +24,10 @@ nexus_repository:
2424
development_releases: >-
2525
{{ artifacts_repositories.enterprise.base_url }}/{{ artifacts_repositories.development.repository }}/{{ artifacts_repositories.enterprise.group_id }}
2626
27-
default_java_version: 17.0.14+7
28-
acs_play_java_core: "{{ default_java_version.split('+')[0] }}"
27+
acs_play_java_core: "{{ acs_play_java_version.split('+')[0] }}"
28+
acs_play_java_major: "{{ acs_play_java_core.split('.')[0] }}"
29+
acs_play_default_truststore_type: "{% if acs_play_java_major | int >= 21 %}pkcs12{% else %}JCEKS{% endif %}"
30+
2931
acs_play_repository_acs_edition: Enterprise
3032

3133
acs_play_skip_upgrade_checks: false

‎roles/audit_storage/defaults/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
# defaults file for audit_storage
3-
audit_storage_version: "1.0.0"
3+
audit_storage_version: 1.1.0
44
audit_storage_zip_url: https://nexus.alfresco.com/nexus/repository/enterprise-releases/org/alfresco/alfresco-audit-storage-distribution/{{ audit_storage_version }}/alfresco-audit-storage-distribution-{{ audit_storage_version }}.zip
55
audit_storage_zip_checksum: sha1:{{ audit_storage_zip_url }}.sha1
66

‎roles/java/tasks/main.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
# tasks file for roles/java
3-
- name: Download openjdk archive
3+
- name: Download openjdk archive for version {{ java_version }}
44
ansible.builtin.get_url:
55
url: "{{ java_url }}"
66
dest: "{{ download_location }}/{{ java_tar_file }}"
@@ -11,7 +11,7 @@
1111
- name: Install OpenJDK
1212
become: true
1313
block:
14-
- name: Extract OpenJDK archive
14+
- name: Extract OpenJDK archive {{ java_tar_file }}
1515
ansible.builtin.unarchive:
1616
src: "{{ download_location }}/{{ java_tar_file }}"
1717
dest: "{{ java_home | dirname }}"

‎roles/repository/defaults/main.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ repository_acs_is_enterprise: true
2222
repository_acs_artifact_name: alfresco-content-services-distribution
2323
repository_acs_repository: https://artifacts.alfresco.com/nexus/content/groups/private/org/alfresco
2424

25-
repository_acs_version: 23.4.1
25+
repository_acs_version: 25.1.0
2626
repository_acs_archive_url: "{{ repository_acs_repository }}/{{ repository_acs_artifact_name }}/{{ repository_acs_version }}/{{ repository_acs_artifact_name }}-{{ repository_acs_version }}.zip"
2727
repository_acs_archive_checksum: "sha1:{{ repository_acs_archive_url }}.sha1"
2828
repository_acs_nexus_username: "{{ repository_nexus_username }}"
@@ -35,7 +35,7 @@ repository_api_explorer_enabled: true
3535
repository_api_explorer_artifact_name: api-explorer
3636
repository_api_explorer_repository: https://artifacts.alfresco.com/nexus/content/groups/public/org/alfresco
3737

38-
repository_api_explorer_version: 23.4.0
38+
repository_api_explorer_version: 25.1.0
3939
repository_api_explorer_archive_url: "{{ repository_api_explorer_repository }}/{{ repository_api_explorer_artifact_name }}/{{ repository_api_explorer_version }}/{{ repository_api_explorer_artifact_name }}-{{ repository_api_explorer_version }}.war"
4040
repository_api_explorer_archive_checksum: "sha1:{{ repository_api_explorer_archive_url }}.sha1"
4141
repository_api_explorer_nexus_username: "{{ repository_nexus_username }}"
@@ -139,3 +139,5 @@ repository_amp_downloads: []
139139

140140
# Additional list of amp downloads. Same structure as repository_amp_downloads
141141
repository_extra_amp_downloads: []
142+
143+
repository_truststore_type: JCEKS

‎roles/repository/templates/alfresco-global.properties.j2

+2
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ encryption.keystore.backup.type=JCEKS
3333
{% endif %}
3434

3535
encryption.ssl.truststore.location={{ java_truststore | default(java_home + '/lib/security/cacerts') }}
36+
encryption.ssl.truststore.type={{ repository_truststore_type }}
37+
3638
{% if repository_default_keystore %}
3739
encryption.ssl.keystore.location={{ repository_default_keystore.path }}
3840
httpclient.config.transform.mTLSEnabled=true

‎roles/search/defaults/main.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ search_repository:
55
port: 80
66
port_ssl: 443
77

8-
search_flavor: alfresco-search-services # set to alfresco-insight-engine for IE
9-
search_version: 2.0.14
8+
search_flavor: alfresco-search-services # set to alfresco-insight-engine for IE
9+
search_version: 2.0.15
1010
search_artifact_repository: https://artifacts.alfresco.com/nexus/content/groups/public/org/alfresco
1111
search_zip_url: "{{ search_artifact_repository }}/{{ search_flavor }}/{{ search_version }}/{{ search_flavor }}-{{ search_version }}.zip"
1212
search_zip_checksum: "sha1:{{ search_zip_url }}.sha1"
13-
search_environment: # This will add extra vars at the end of the solr.in.sh file
13+
search_environment: # This will add extra vars at the end of the solr.in.sh file
1414
SOLR_JAVA_MEM: "-Xms1g -Xmx1g"
1515
search_cores:
1616
- alfresco

‎roles/search_enterprise/defaults/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ search_enterprise_reindex_options: ''
77
search_enterprise_artifact_name: alfresco-elasticsearch-connector-distribution
88
search_enterprise_repository: https://artifacts.alfresco.com/nexus/content/groups/private/org/alfresco
99

10-
search_enterprise_version: 4.2.0
10+
search_enterprise_version: 5.0.0
1111
search_enterprise_zip_url: "{{ search_enterprise_repository }}/{{ search_enterprise_artifact_name }}/{{ search_enterprise_version }}/{{ search_enterprise_artifact_name }}-{{ search_enterprise_version }}.zip"
1212
search_enterprise_zip_checksum: "sha1:{{ search_enterprise_zip_url }}.sha1"
1313

0 commit comments

Comments
 (0)