Skip to content

Commit 1bcb95d

Browse files
gionngionn
authored
OPSEXP-3107 Support bumping versions in roles defaults (#1129)
1 parent e291718 commit 1bcb95d

File tree

11 files changed

+73
-15
lines changed

11 files changed

+73
-15
lines changed

.github/updatecli_amps.tpl renamed to .github/updatecli/updatecli_amps.tpl

File renamed without changes.

.github/updatecli_amps_values.yml renamed to .github/updatecli/updatecli_amps_values.yml

File renamed without changes.

.github/updatecli_maven.tpl renamed to .github/updatecli/updatecli_maven.tpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@ sources:
3636

3737
targets:
3838
{{- range $key, $artifact := .artifacts }}
39-
{{- if all $artifact.updatecli_matrix_component_key $.ansible_version_file $artifact.artifact_version_key }}
39+
{{- if all $artifact.updatecli_matrix_component_key (or $artifact.ansible_version_file $.ansible_version_file) $artifact.artifact_version_key }}
4040
yml_{{ $key }}:
4141
name: {{ $key }} yml
4242
kind: yaml
4343
sourceid: src_{{ $key }}
4444
spec:
45-
file: "{{ $.ansible_version_file }}"
45+
file: "{{ $artifact.ansible_version_file | default $.ansible_version_file }}"
4646
key: "{{ $artifact.artifact_version_key }}"
4747
{{- end }}
4848
{{- end }}

‎.github/updatecli/updatecli_maven_roles_values.yml‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
updatecli_matrix_version: current
2+
artifacts:
3+
alfresco-repository:
4+
artifact_name_file: roles/repository/defaults/main.yml
5+
artifact_name_key: $.repository_acs_artifact_name
6+
artifact_version_key: $.repository_acs_version
7+
ansible_version_file: roles/repository/defaults/main.yml
8+
updatecli_matrix_component_key: acs
9+
alfresco-audit-storage:
10+
artifact_name_file: roles/audit_storage/defaults/main.yml
11+
artifact_name_key: $.audit_storage_download_artifact_name
12+
artifact_version_key: $.audit_storage_version
13+
ansible_version_file: roles/audit_storage/defaults/main.yml
14+
updatecli_matrix_component_key: audit-storage
15+
alfresco-search-enterprise:
16+
artifact_name_file: roles/search_enterprise/defaults/main.yml
17+
artifact_name_key: $.search_enterprise_artifact_name
18+
artifact_version_key: $.search_enterprise_version
19+
ansible_version_file: roles/search_enterprise/defaults/main.yml
20+
updatecli_matrix_component_key: search-enterprise
21+
alfresco-search-services:
22+
artifact_name_file: roles/search/defaults/main.yml
23+
artifact_name_key: $.search_flavor
24+
artifact_version_key: $.search_version
25+
ansible_version_file: roles/search/defaults/main.yml
26+
updatecli_matrix_component_key: search
27+
alfresco-sync-service:
28+
artifact_name_file: roles/sync/defaults/main.yml
29+
artifact_name_key: $.sync_artifact_name
30+
artifact_version_key: $.sync_version
31+
ansible_version_file: roles/sync/defaults/main.yml
32+
updatecli_matrix_component_key: sync
33+
artifact_group_id: org.alfresco.services.sync
34+
alfresco-transform-core-aio:
35+
artifact_name_file: roles/transformers/defaults/main.yml
36+
artifact_name_key: $.transformers_aio_artifact_name
37+
artifact_version_key: $.transformers_aio_version
38+
ansible_version_file: roles/transformers/defaults/main.yml
39+
updatecli_matrix_component_key: tengine-aio
40+
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
45+
updatecli_matrix_component_key: trouter
46+
alfresco-shared-file-store-controller:
47+
artifact_name_file: roles/sfs/defaults/main.yml
48+
artifact_name_key: $.sfs_artifact_name
49+
artifact_version_key: $.sfs_version
50+
ansible_version_file: roles/sfs/defaults/main.yml
51+
updatecli_matrix_component_key: sfs

.github/updatecli_maven_23_values.yml renamed to .github/updatecli/updatecli_maven_v23_values.yml

File renamed without changes.

.github/updatecli_maven_73_values.yml renamed to .github/updatecli/updatecli_maven_v73_values.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ updatecli_matrix_version: 7.3.N
22
updatecli_amps_release_branch: "release/7.3.N"
33
ansible_version_file: vars/acs73.yml
44
artifacts:
5-
alfresco-audit-storage-app:
5+
alfresco-audit-storage:
66
updatecli_matrix_component_key: false # disabled because unsupported

.github/updatecli_maven_74_values.yml renamed to .github/updatecli/updatecli_maven_v74_values.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ updatecli_matrix_version: 7.4.N
22
updatecli_amps_release_branch: "release/7.4.N"
33
ansible_version_file: vars/acs74.yml
44
artifacts:
5-
alfresco-audit-storage-app:
5+
alfresco-audit-storage:
66
updatecli_matrix_component_key: false # disabled because unsupported

.github/updatecli_maven_values.yml renamed to .github/updatecli/updatecli_maven_values.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ artifacts:
1717
# artifact_name_key: $.adw_artifact_id
1818
# artifact_version_key: $.acs_play_adw_version
1919
# updatecli_matrix_component_key: adw
20-
alfresco-audit-storage-app:
20+
alfresco-audit-storage:
2121
artifact_name_file: playbooks/group_vars/audit_storage.yml
2222
artifact_name_key: $.acs_play_audit_storage_artifact_name
2323
artifact_version_key: $.acs_play_audit_storage_version

‎.github/workflows/bumpVersions.yml‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,7 @@ on:
66
push:
77
paths:
88
- .github/workflows/bumpVersions.yml
9-
- .github/updatecli_maven.tpl
10-
- .github/updatecli_maven_values.yml
11-
- .github/updatecli_amps.tpl
12-
- .github/updatecli_amps_values.yml
9+
- .github/updatecli/**
1310
workflow_dispatch:
1411
inputs:
1512
alfresco-updatecli-ref:
@@ -45,17 +42,25 @@ jobs:
4542
ref: ${{ inputs.alfresco-updatecli-ref || 'master' }}
4643
path: alfresco-updatecli
4744

45+
- name: Updatecli scm cache
46+
uses: actions/cache@v4
47+
with:
48+
path: /tmp/updatecli/github
49+
key: updatecli-v1-${{ hashFiles('.github/updatecli/updatecli_amps.tpl') }}
50+
restore-keys: |
51+
updatecli-v1-
52+
4853
- name: Updatecli apply
4954
shell: bash
5055
run: |
5156
set -x
52-
for version_file in .github/updatecli_maven_*_values.yml; do
53-
updatecli apply --config .github/updatecli_maven.tpl \
57+
for version_file in .github/updatecli/updatecli_maven_*_values.yml; do
58+
updatecli apply --config .github/updatecli/updatecli_maven.tpl \
5459
-v alfresco-updatecli/deployments/values/supported-matrix.yaml \
55-
-v .github/updatecli_maven_values.yml \
60+
-v .github/updatecli/updatecli_maven_values.yml \
5661
-v $version_file
57-
updatecli apply --config .github/updatecli_amps.tpl \
58-
-v .github/updatecli_amps_values.yml \
62+
updatecli apply --config .github/updatecli/updatecli_amps.tpl \
63+
-v .github/updatecli/updatecli_amps_values.yml \
5964
-v $version_file
6065
done
6166
env:

‎playbooks/acs.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -657,6 +657,7 @@
657657
name: "../roles/sync"
658658
vars:
659659
java_version: "{{ acs_play_java_version }}" # noqa: var-naming[no-role-prefix]
660+
sync_artifact_name: "{{ acs_play_sync_artifact_name }}"
660661
sync_version: "{{ acs_play_sync_version }}"
661662
sync_zip_url: "{{ acs_play_sync_zip_url }}"
662663
sync_zip_checksum: "{{ acs_play_sync_zip_checksum }}"

0 commit comments

Comments
 (0)