Skip to content

Commit 3fe7e60

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

File tree

43 files changed

+294
-161
lines changed

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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 4 additions & 4 deletions
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
Lines changed: 1 addition & 6 deletions
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"
Lines changed: 8 additions & 0 deletions
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

Lines changed: 5 additions & 0 deletions
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

Lines changed: 5 additions & 3 deletions
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

Lines changed: 14 additions & 17 deletions
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

Lines changed: 3 additions & 1 deletion
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 2 additions & 2 deletions
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

0 commit comments

Comments
 (0)