Skip to content

Commit ae0221e

Browse files
pmaciuspmacius
authored
OPSEXP-2464 Remove support for 7.0 version (#822)
1 parent 7f55f53 commit ae0221e

File tree

8 files changed

+25
-141
lines changed

8 files changed

+25
-141
lines changed

‎.github/workflows/enteprise.yml

+3-6
Original file line numberDiff line numberDiff line change
@@ -123,12 +123,6 @@ jobs:
123123
fail-fast: false
124124
matrix:
125125
molecule_scenario:
126-
- name: default
127-
vars: vars-centos7.yml
128-
desc: EC2 ACS 7.0 (Centos7)
129-
- name: default
130-
vars: vars-rhel7.yml
131-
desc: EC2 ACS 7.0 (RHEL 7.9)
132126
- name: default
133127
vars: vars-ubuntu18.yml
134128
desc: EC2 ACS 7.1 (Ubuntu 18.04)
@@ -141,6 +135,9 @@ jobs:
141135
- name: default
142136
vars: vars-ubuntu20-73.yml
143137
desc: EC2 ACS 7.3 (Ubuntu 20.04)
138+
- name: default
139+
vars: vars-centos7.yml
140+
desc: EC2 ACS 7.3 (Centos7)
144141
- name: default
145142
vars: vars-rocky8.yml
146143
desc: EC2 ACS 7.4 (Rocky Linux 8.7)

‎7.0.N-extra-vars.yml

-67
This file was deleted.

‎docs/overview.md

+19-18
Original file line numberDiff line numberDiff line change
@@ -72,22 +72,23 @@ distributions.
7272
7373
The table below shows the version of the components deployed by the playbook for ACS 7.x onward.
7474

75-
| Component | 23.2 Enterprise (Community) | 7.4 Enterprise | 7.3 Enterprise | 7.2 Enterprise | 7.1 Enterprise | 7.0 Enterprise |
76-
|---------------------|-----------------------------|----------------|----------------|----------------|----------------|----------------|
77-
| OpenJDK | 17.0.9 | 17.0.3 | 17.0.3 | 11.0.15 | 11.0.15 | 11.0.15 |
78-
| Apache Tomcat | 10.1.19 | 9.0.86 | 9.0.86 | 9.0.86 | 9.0.86 | 9.0.86 |
79-
| PostgreSQL | 15.x | 14.x | 14.x | 13.x | 13.x | 13.x |
80-
| Apache ActiveMQ | 5.18.3 | 5.17.6 | 5.17.6 | 5.16.7 | 5.16.7 | 5.16.7 |
81-
| Repository | 23.2.1 | 7.4.1.6 | 7.3.1.2 | 7.2.1.13 | 7.1.1.10 | 7.0.1.4 |
82-
| Share | 23.2.1 | 7.4.1.6 | 7.3.1.2 | 7.2.1.13 | 7.1.1.10 | 7.0.1.4 |
83-
| Search Services | 2.0.9.1 | 2.0.9.1 | 2.0.9.1 | 2.0.9.1 | 2.0.2.2 | 2.0.1.1 |
84-
| Search Enterprise | 4.0.1 (n/a) | 3.3.2 | 3.2.1 | 3.1.1.1 | 3.1.1.1 | n/a |
85-
| All-In-One T-Engine | 5.1.0 | 4.0.1 | 3.1.2 | 3.1.2 | 3.1.2 | 2.3.10 |
86-
| AOS | 3.0.0 | 1.6.2 | 1.5.0 | 1.4.1 | 1.4.1 | 1.4.0 |
87-
| Google Docs | 4.0.0 | 3.4.2 | 3.3.1 | 3.2.2 | 3.2.1 | 3.2.1 |
88-
| Digital Workspace | 4.4.0 (n/a) | 4.0.0 | 3.1.0 | 3.0.0 | 2.6.1 | 2.1.0 |
89-
| Transform Router | 4.1.0 (n/a) | 3.0.1 | 2.1.2 | 2.1.2 | 2.1.2 | 1.3.2 |
90-
| Shared File Store | 4.1.0 (n/a) | 3.0.1 | 2.1.2 | 2.1.2 | 2.1.2 | 0.13.0 |
91-
| Sync Service | 4.0.1 (n/a) | 3.11.1 | 3.11.1 | 3.11.1 | 3.11.1 | 3.4.0 |
92-
75+
| Component | 23.2 Enterprise (Community) | 7.4 Enterprise | 7.3 Enterprise | 7.2 Enterprise | 7.1 Enterprise |
76+
|---------------------|-----------------------------|----------------|----------------|----------------|----------------|
77+
| OpenJDK | 17.0.9 | 17.0.3 | 17.0.3 | 11.0.15 | 11.0.15 |
78+
| Apache Tomcat | 10.1.19 | 9.0.86 | 9.0.86 | 9.0.86 | 9.0.86 |
79+
| PostgreSQL | 15.x | 14.x | 14.x | 13.x | 13.x |
80+
| Apache ActiveMQ | 5.18.3 | 5.17.6 | 5.17.6 | 5.16.7 | 5.16.7 |
81+
| Repository | 23.2.1 | 7.4.1.6 | 7.3.1.2 | 7.2.1.13 | 7.1.1.10 |
82+
| Share | 23.2.1 | 7.4.1.6 | 7.3.1.2 | 7.2.1.13 | 7.1.1.10 |
83+
| Search Services | 2.0.9.1 | 2.0.9.1 | 2.0.9.1 | 2.0.9.1 | 2.0.2.2 |
84+
| Search Enterprise | 4.0.1 (n/a) | 3.3.2 | 3.2.1 | 3.1.1.1 | 3.1.1.1 |
85+
| All-In-One T-Engine | 5.1.0 | 4.0.1 | 3.1.2 | 3.1.2 | 3.1.2 |
86+
| AOS | 3.0.0 | 1.6.2 | 1.5.0 | 1.4.1 | 1.4.1 |
87+
| Google Docs | 4.0.0 | 3.4.2 | 3.3.1 | 3.2.2 | 3.2.1 |
88+
| Digital Workspace | 4.4.0 (n/a) | 4.0.0 | 3.1.0 | 3.0.0 | 2.6.1 |
89+
| Transform Router | 4.1.0 (n/a) | 3.0.1 | 2.1.2 | 2.1.2 | 2.1.2 |
90+
| Shared File Store | 4.1.0 (n/a) | 3.0.1 | 2.1.2 | 2.1.2 | 2.1.2 |
91+
| Sync Service | 4.0.1 (n/a) | 3.11.1 | 3.11.1 | 3.11.1 | 3.11.1 |
92+
93+
> 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))
9394
> 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))

‎group_vars/all.yml

-4
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,6 @@ supported_os:
9191
- 8.5
9292
- 8.4
9393
- 8.2
94-
- 7.9
95-
- 7.7
96-
- 7.6
9794
Rocky:
9895
versions:
9996
- 9.3
@@ -106,7 +103,6 @@ supported_os:
106103
CentOS:
107104
versions:
108105
- 7.9
109-
- 7.7
110106
Ubuntu:
111107
versions:
112108
- 22.04

‎molecule/default/vars-centos7.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
MOLECULE_IT_IMAGE_ID: ami-0c1f3a8058fde8814 # CentOS-7-2111-20220825_1.x86_64-d9a3032a-921c-4c6d-b150-bde168105e42
2-
MOLECULE_IT_EXTRA_VARS: 7.0.N-extra-vars.yml
3-
MOLECULE_IT_TEST_CONFIG: tests/test-config-7.0.json
2+
MOLECULE_IT_EXTRA_VARS: 7.3.N-extra-vars.yml
3+
MOLECULE_IT_TEST_CONFIG: tests/test-config-7.3.json
44
MOLECULE_IT_PLATFORM: centos7

‎molecule/default/vars-rhel7.yml

-4
This file was deleted.

‎roles/repository/defaults/main.yml

+1-6
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,7 @@ cluster_keepoff: false
7878
tomcat_resource_cache_size: 20480
7979

8080
# make sure to only ever copy contents not dir
81-
keystore_src: >-
82-
{% if acs.version is version('7.0.0', 'ge') -%}
83-
{{ content_folder }}/keystore/metadata-keystore/
84-
{%- else -%}
85-
{{ content_folder }}/alf_data/keystore/
86-
{%- endif %}
81+
keystore_src: "{{ content_folder }}/keystore/metadata-keystore/"
8782
repo_keystore: {}
8883
repository_monitored_startup_timeout_seconds: 300
8984

‎tests/test-config-7.0.json

-34
This file was deleted.

0 commit comments

Comments
 (0)