From a31139a822ecba5335d69664ecd33f0c8b7f00b2 Mon Sep 17 00:00:00 2001 From: Giovanni Toraldo <71768+gionn@users.noreply.github.com> Date: Thu, 28 Nov 2024 17:33:04 +0100 Subject: [PATCH] OPSEXP-2941 Bump versions for Orion release (#998) --- .github/workflows/enteprise.yml | 3 - .github/workflows/enterprise-extended.yml | 6 +- .github/workflows/updatecli.yml | 1 - 7.1.N-extra-vars.yml | 61 ---------------- 7.2.N-extra-vars.yml | 2 +- 7.3.N-extra-vars.yml | 4 +- 7.4.N-extra-vars.yml | 10 +-- community-extra-vars.yml | 12 ++-- group_vars/all.yml | 24 +++---- molecule/identity/verify.yml | 7 +- scripts/updatecli/updatecli_acs23.yml | 12 ++-- scripts/updatecli/updatecli_acs71.yml | 35 --------- scripts/updatecli/updatecli_community.yml | 8 +-- tests/test-7.1-vars.yml | 88 ----------------------- tests/test-config-7.1.json | 35 --------- tests/test-config-community.json | 4 +- tests/test-config-latest-nosync.json | 4 +- tests/test-config.json | 10 +-- 18 files changed, 51 insertions(+), 275 deletions(-) delete mode 100644 7.1.N-extra-vars.yml delete mode 100644 scripts/updatecli/updatecli_acs71.yml delete mode 100644 tests/test-7.1-vars.yml delete mode 100644 tests/test-config-7.1.json diff --git a/.github/workflows/enteprise.yml b/.github/workflows/enteprise.yml index 3f6c90890..b0f614e46 100644 --- a/.github/workflows/enteprise.yml +++ b/.github/workflows/enteprise.yml @@ -154,9 +154,6 @@ jobs: fail-fast: false matrix: molecule_scenario: - - name: default - vars: vars-ubuntu20-73.yml - desc: EC2 ACS 7.3 (Ubuntu 20.04) - name: default vars: vars-rocky8.yml desc: EC2 ACS 7.4 (Rocky Linux 8.9) diff --git a/.github/workflows/enterprise-extended.yml b/.github/workflows/enterprise-extended.yml index 2d45951ac..d15e61db5 100644 --- a/.github/workflows/enterprise-extended.yml +++ b/.github/workflows/enterprise-extended.yml @@ -21,12 +21,12 @@ jobs: fail-fast: false matrix: molecule_scenario: - - name: default - vars: vars-ubuntu18.yml - desc: EC2 ACS 7.1 (Ubuntu 18.04) - name: default vars: vars-ubuntu20-72.yml desc: EC2 ACS 7.2 (Ubuntu 20.04) + - name: default + vars: vars-ubuntu20-73.yml + desc: EC2 ACS 7.3 (Ubuntu 20.04) env: AWS_REGION: eu-west-1 MOLECULE_IT_AWS_VPC_SUBNET_ID: subnet-6bdd4223 diff --git a/.github/workflows/updatecli.yml b/.github/workflows/updatecli.yml index c17b158bf..69495148a 100644 --- a/.github/workflows/updatecli.yml +++ b/.github/workflows/updatecli.yml @@ -32,7 +32,6 @@ jobs: - updatecli_acs74.yml - updatecli_acs73.yml - updatecli_acs72.yml - - updatecli_acs71.yml steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: diff --git a/7.1.N-extra-vars.yml b/7.1.N-extra-vars.yml deleted file mode 100644 index 1c0af40ca..000000000 --- a/7.1.N-extra-vars.yml +++ /dev/null @@ -1,61 +0,0 @@ ---- -acs: - artifact_name: alfresco-content-services-distribution - edition: Enterprise - repository: "{{ nexus_repository.enterprise_releases }}" - version: 7.1.1.10 -amps: - aos_module: - repository: "{{ nexus_repository.releases }}/aos-module/alfresco-aos-module" - version: 1.4.1 - device_sync: - repository: "{{ nexus_repository.enterprise_releases }}/services/sync/alfresco-device-sync-repo" - version: 3.11.3 - googledrive_repo: - repository: "{{ nexus_repository.enterprise_releases }}/integrations/alfresco-googledrive-repo-enterprise" - version: 3.2.2 - googledrive_share: - repository: "{{ nexus_repository.releases }}/integrations/alfresco-googledrive-share" - version: 3.2.2 -api_explorer: - artifact_name: api-explorer - repository: "{{ nexus_repository.releases }}" - version: 7.1.1 -search_enterprise: - artifact_name: alfresco-elasticsearch-connector-distribution - repository: "{{ nexus_repository.enterprise_releases }}" - version: 3.1.1.1 -search: - artifact_name: alfresco-search-services - repository: "{{ nexus_repository.releases }}" - version: 2.0.12 -transform: - artifact_name: alfresco-transform-core-aio - repository: "{{ nexus_repository.releases }}" - version: 3.1.2 -trouter: - artifact_name: alfresco-transform-router - repository: "{{ nexus_repository.enterprise_releases }}" - version: 2.1.2 -sfs: - artifact_name: alfresco-shared-file-store-controller - repository: "{{ nexus_repository.enterprise_releases }}" - version: 2.1.2 -adw: - artifact_name: alfresco-digital-workspace - repository: "{{ nexus_repository.enterprise_releases }}" - version: 2.6.1 -sync: - repository: "{{ nexus_repository.enterprise_releases }}/services/sync/sync-dist-6.x" - version: 3.11.3 -# this overwrites (and not merge) the same structure in group_vars/all.yml -dependencies_version: - postgresql_connector: 42.6.1 - postgres_major_version: 13 - activemq: 5.16.7 - 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-10 diff --git a/7.2.N-extra-vars.yml b/7.2.N-extra-vars.yml index 5034b1163..c67da439e 100644 --- a/7.2.N-extra-vars.yml +++ b/7.2.N-extra-vars.yml @@ -27,7 +27,7 @@ search_enterprise: search: artifact_name: alfresco-search-services repository: "{{ nexus_repository.releases }}" - version: 2.0.12 + version: 2.0.13 transform: artifact_name: alfresco-transform-core-aio repository: "{{ nexus_repository.releases }}" diff --git a/7.3.N-extra-vars.yml b/7.3.N-extra-vars.yml index b276242e5..ddd1b6140 100644 --- 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.1 + version: 7.3.2.3 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.12 + version: 2.0.13 transform: artifact_name: alfresco-transform-core-aio repository: "{{ nexus_repository.releases }}" diff --git a/7.4.N-extra-vars.yml b/7.4.N-extra-vars.yml index 9556482d1..bcf99f0a3 100644 --- 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.1 + version: 7.4.2.3 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.12 + version: 2.0.13 transform: artifact_name: alfresco-transform-core-aio repository: "{{ nexus_repository.releases }}" - version: 5.1.4 + version: 5.1.5 trouter: artifact_name: alfresco-transform-router repository: "{{ nexus_repository.enterprise_releases }}" - version: 4.1.4 + version: 4.1.5 sfs: artifact_name: alfresco-shared-file-store-controller repository: "{{ nexus_repository.enterprise_releases }}" - version: 4.1.4 + version: 4.1.5 adw: artifact_name: alfresco-digital-workspace repository: "{{ nexus_repository.enterprise_releases }}" diff --git a/community-extra-vars.yml b/community-extra-vars.yml index 4fe0f4e42..9611cacaf 100644 --- a/community-extra-vars.yml +++ b/community-extra-vars.yml @@ -1,28 +1,28 @@ acs: artifact_name: alfresco-content-services-community-distribution repository: "{{ nexus_repository.releases }}" - version: 23.3.0 + version: 23.4.0 edition: Community api_explorer: artifact_name: api-explorer repository: "{{ nexus_repository.releases }}" - version: 23.3.0 + version: 23.4.0 transform: artifact_name: alfresco-transform-core-aio repository: "{{ nexus_repository.releases }}" - version: 5.1.4 + version: 5.1.5 acc: artifact_name: alfresco-control-center repository: "{{ nexus_repository.releases }}" - version: 9.1.0 + version: 9.2.0 search: artifact_name: alfresco-search-services repository: "{{ nexus_repository.releases }}" - version: 2.0.12 + version: 2.0.13 amps: aos_module: repository: "{{ nexus_repository.releases }}/aos-module/alfresco-aos-module" - version: 3.1.0 + version: 3.2.0 googledrive_repo: repository: "{{ nexus_repository.releases }}/integrations/alfresco-googledrive-repo-community" version: 4.1.0 diff --git a/group_vars/all.yml b/group_vars/all.yml index 15f993d1e..fea7f299c 100644 --- a/group_vars/all.yml +++ b/group_vars/all.yml @@ -25,15 +25,15 @@ acs: artifact_name: alfresco-content-services-distribution edition: Enterprise repository: "{{ nexus_repository.enterprise_releases }}" - version: 23.3.2 + version: 23.4.0 amps: aos_module: repository: "{{ nexus_repository.releases }}/aos-module/alfresco-aos-module" - version: 3.1.0 + version: 3.2.0 device_sync: repository: >- {{ nexus_repository.enterprise_releases }}/services/sync/alfresco-device-sync-repo - version: 4.0.1 + version: 5.1.0 googledrive_repo: repository: >- {{ nexus_repository.enterprise_releases }}/integrations/alfresco-googledrive-repo-enterprise @@ -45,39 +45,39 @@ amps: api_explorer: artifact_name: api-explorer repository: "{{ nexus_repository.releases }}" - version: 23.3.0 + version: 23.4.0 search_enterprise: artifact_name: alfresco-elasticsearch-connector-distribution repository: "{{ nexus_repository.enterprise_releases }}" - version: 4.1.0 + version: 4.2.0 search: artifact_name: alfresco-search-services repository: "{{ nexus_repository.releases }}" - version: 2.0.12 + version: 2.0.13 transform: artifact_name: alfresco-transform-core-aio repository: "{{ nexus_repository.releases }}" - version: 5.1.4 + version: 5.1.5 trouter: artifact_name: alfresco-transform-router repository: "{{ nexus_repository.enterprise_releases }}" - version: 4.1.4 + version: 4.1.5 sfs: artifact_name: alfresco-shared-file-store-controller repository: "{{ nexus_repository.enterprise_releases }}" - version: 4.1.4 + version: 4.1.5 adw: artifact_name: alfresco-digital-workspace repository: "{{ nexus_repository.enterprise_releases }}" - version: 5.1.0 + version: 5.2.0 sync: repository: >- {{ nexus_repository.enterprise_releases }}/services/sync/sync-dist-6.x - version: 4.0.1 + version: 5.1.0 acc: artifact_name: alfresco-control-center repository: "{{ nexus_repository.releases }}" - version: 9.1.0 + version: 9.2.0 supported_os: RedHat: versions: diff --git a/molecule/identity/verify.yml b/molecule/identity/verify.yml index 5c5b2db05..3bcf58b51 100644 --- a/molecule/identity/verify.yml +++ b/molecule/identity/verify.yml @@ -123,11 +123,10 @@ - name: Assert keycloak login redirect vars: - expected_url_prefix: http://localhost/auth/realms/alfresco/protocol/openid-connect/auth?response_type=code&client_id=alfresco&scope=openid - expected_login_submit: http://localhost/auth/realms/alfresco/login-actions/authenticate + expected_url_prefix: http://localhost/share/page/aims-login ansible.builtin.assert: - quiet: true that: - this.redirected - expected_url_prefix in this.url - - expected_login_submit in this.content + fail_msg: "Current URL={{ this.url }} did not meet expectations" + quiet: true diff --git a/scripts/updatecli/updatecli_acs23.yml b/scripts/updatecli/updatecli_acs23.yml index aaceff74a..826f91810 100644 --- a/scripts/updatecli/updatecli_acs23.yml +++ b/scripts/updatecli/updatecli_acs23.yml @@ -1,17 +1,17 @@ acs: - version: "23.3" + version: "23.4" adw: - version: "5.1" + version: "5.2" acc: - version: "9.1" + version: "9.2" aos: - version: "3.1" + version: "3.2" apiExplorer: - version: "23.3" + version: "23.4" dsync: version: "5.1" @@ -23,7 +23,7 @@ search: version: "2.0" searchEnterprise: - version: "4.1" + version: "4.2" transform: version: "5.1" diff --git a/scripts/updatecli/updatecli_acs71.yml b/scripts/updatecli/updatecli_acs71.yml deleted file mode 100644 index 2d307e587..000000000 --- a/scripts/updatecli/updatecli_acs71.yml +++ /dev/null @@ -1,35 +0,0 @@ -acs: - version: "7.1" - -adw: - version: "2.6" - -aos: - version: "1.4" - -apiExplorer: - version: "7.1" - -dsync: - version: "3.11" - -googleDrive: - version: "3.2" - -search: - version: "2.0" - -searchEnterprise: - version: "3.1.1" - -transform: - version: "3.1" - -trouter: - version: "2.1" - -sfs: - version: "2.1" - -target_file: 7.1.N-extra-vars.yml -version_pattern: '$' diff --git a/scripts/updatecli/updatecli_community.yml b/scripts/updatecli/updatecli_community.yml index db685d91f..cd89b05e7 100644 --- a/scripts/updatecli/updatecli_community.yml +++ b/scripts/updatecli/updatecli_community.yml @@ -1,15 +1,15 @@ acs: - version: "23.3" + version: "23.4" edition: community acc: - version: "9.1" + version: "9.2" aos: - version: "3.1" + version: "3.2" apiExplorer: - version: "23.3" + version: "23.4" googleDrive: version: "4.1" diff --git a/tests/test-7.1-vars.yml b/tests/test-7.1-vars.yml deleted file mode 100644 index be583439d..000000000 --- a/tests/test-7.1-vars.yml +++ /dev/null @@ -1,88 +0,0 @@ ---- -acs: - artifact_name: alfresco-content-services-distribution - edition: Enterprise - repository: "{{ nexus_repository.enterprise_releases }}" - version: 7.1.1.10 -# To future maintainers: remember there is a tests/test-7.1-vars.yml file that -# is used to test AGS amps in ACS 7.1 suite which we always forgot to update -amps: - aos_module: - repository: "{{ nexus_repository.releases }}/aos-module/alfresco-aos-module" - version: 1.4.1 - device_sync: - repository: "{{ nexus_repository.enterprise_releases }}/services/sync/alfresco-device-sync-repo" - version: 3.11.1 - googledrive_repo: - repository: "{{ nexus_repository.enterprise_releases }}/integrations/alfresco-googledrive-repo-enterprise" - version: 3.2.2 - googledrive_share: - repository: "{{ nexus_repository.releases }}/integrations/alfresco-googledrive-share" - version: 3.2.2 - ags_repo: - repository: "{{ nexus_repository.enterprise_releases }}/alfresco-governance-services-enterprise-repo" - version: 3.5.0 - ags_share: - repository: "{{ nexus_repository.enterprise_releases }}/alfresco-governance-services-enterprise-share" - version: 3.5.0 -amp_downloads: - - url: "{{ amps.googledrive_repo.repository }}/{{ amps.googledrive_repo.version }}/alfresco-googledrive-repo-enterprise-{{ amps.googledrive_repo.version }}.amp" - sha1_checksum_url: "{{ amps.googledrive_repo.repository }}/{{ amps.googledrive_repo.version }}/alfresco-googledrive-repo-enterprise-{{ amps.googledrive_repo.version }}.amp.sha1" - dest: "{{ content_folder }}/amps_repo/alfresco-googledrive-repo-enterprise.amp" - - url: "{{ amps.googledrive_share.repository }}/{{ amps.googledrive_share.version }}/alfresco-googledrive-share-{{ amps.googledrive_share.version }}.amp" - sha1_checksum_url: "{{ amps.googledrive_share.repository }}/{{ amps.googledrive_share.version }}/alfresco-googledrive-share-{{ amps.googledrive_share.version }}.amp.sha1" - dest: "{{ content_folder }}/amps_share/alfresco-googledrive-share.amp" - - url: "{{ amps.device_sync.repository }}/{{ amps.device_sync.version }}/alfresco-device-sync-repo-{{ amps.device_sync.version }}.amp" - sha1_checksum_url: "{{ amps.device_sync.repository }}/{{ amps.device_sync.version }}/alfresco-device-sync-repo-{{ amps.device_sync.version }}.amp.sha1" - dest: "{{ content_folder }}/amps_repo/alfresco-device-sync-repo.amp" - - url: "{{ amps.aos_module.repository }}/{{ amps.aos_module.version }}/alfresco-aos-module-{{ amps.aos_module.version }}.amp" - sha1_checksum_url: "{{ amps.aos_module.repository }}/{{ amps.aos_module.version }}/alfresco-aos-module-{{ amps.aos_module.version }}.amp.sha1" - dest: "{{ content_folder }}/amps_repo/alfresco-aos-module.amp" - - url: "{{ amps.ags_repo.repository }}/{{ amps.ags_repo.version }}/alfresco-governance-services-enterprise-repo-{{ amps.ags_repo.version }}.amp" - sha1_checksum_url: "{{ amps.ags_repo.repository }}/{{ amps.ags_repo.version }}/alfresco-governance-services-enterprise-repo-{{ amps.ags_repo.version }}.amp.sha1" - dest: "{{ content_folder }}/amps_repo/ags-repo.amp" - - url: "{{ amps.ags_share.repository }}/{{ amps.ags_share.version }}/alfresco-governance-services-enterprise-share-{{ amps.ags_share.version }}.amp" - sha1_checksum_url: "{{ amps.ags_share.repository }}/{{ amps.ags_share.version }}/alfresco-governance-services-enterprise-share-{{ amps.ags_share.version }}.amp.sha1" - dest: "{{ content_folder }}/amps_share/ags-share.amp" -api_explorer: - artifact_name: api-explorer - repository: "{{ nexus_repository.releases }}" - version: 7.1.1 -search_enterprise: - artifact_name: alfresco-elasticsearch-connector-distribution - repository: "{{ nexus_repository.enterprise_releases }}" - version: 3.1.1.1 -search: - artifact_name: alfresco-search-services - repository: "{{ nexus_repository.releases }}" - version: 2.0.2.2 -transform: - artifact_name: alfresco-transform-core-aio - repository: "{{ nexus_repository.releases }}" - version: 3.1.2 -trouter: - artifact_name: alfresco-transform-router - repository: "{{ nexus_repository.enterprise_releases }}" - version: 2.1.2 -sfs: - artifact_name: alfresco-shared-file-store-controller - repository: "{{ nexus_repository.enterprise_releases }}" - version: 2.1.2 -adw: - artifact_name: alfresco-digital-workspace - repository: "{{ nexus_repository.enterprise_releases }}" - version: 2.6.1 -sync: - repository: "{{ nexus_repository.enterprise_releases }}/services/sync/sync-dist-6.x" - version: 3.11.1 -# this overwrites (and not merge) the same structure in group_vars/all.yml -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 - libreoffice: 7.0.6.2 - pdf_renderer: 1.1 - imagemagick: 7.1.0-16-ci-10 diff --git a/tests/test-config-7.1.json b/tests/test-config-7.1.json deleted file mode 100644 index 0de04b637..000000000 --- a/tests/test-config-7.1.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "config": { - "host": "TEST_URL", - "username": "admin", - "password": "admin", - "search_retry_interval_seconds": "30" - }, - "assertions": { - "acs": { - "edition": "Enterprise", - "version": "7.1.1", - "identity": false, - "modules": [ - { - "id": "org.alfresco.integrations.google.docs", - "version": "3.2.2", - "installed": true - }, - { - "id": "alfresco-aos-module", - "version": "1.4.1", - "installed": true - }, - { - "id": "org_alfresco_device_sync_repo", - "version": "3.11.3", - "installed": true - } - ] - }, - "adw": { - "version": "2.6.0" - } - } - } diff --git a/tests/test-config-community.json b/tests/test-config-community.json index d6cf7b124..a3cf53c2d 100644 --- a/tests/test-config-community.json +++ b/tests/test-config-community.json @@ -8,7 +8,7 @@ "assertions": { "acs": { "edition": "Community", - "version": "23.3.0", + "version": "23.4.0", "identity": false, "modules": [ { @@ -18,7 +18,7 @@ }, { "id": "alfresco-aos-module", - "version": "3.1.0", + "version": "3.2.0", "installed": true } ] diff --git a/tests/test-config-latest-nosync.json b/tests/test-config-latest-nosync.json index 22743d9d3..f608bf081 100644 --- a/tests/test-config-latest-nosync.json +++ b/tests/test-config-latest-nosync.json @@ -8,7 +8,7 @@ "assertions": { "acs": { "edition": "Enterprise", - "version": "23.3.1", + "version": "23.4.0", "identity": false, "modules": [ { @@ -18,7 +18,7 @@ }, { "id": "alfresco-aos-module", - "version": "3.1.0", + "version": "3.2.0", "installed": true } ] diff --git a/tests/test-config.json b/tests/test-config.json index f6024a978..785c32ce2 100644 --- a/tests/test-config.json +++ b/tests/test-config.json @@ -8,7 +8,7 @@ "assertions": { "acs": { "edition": "Enterprise", - "version": "23.3.1", + "version": "23.4.0", "identity": false, "modules": [ { @@ -18,21 +18,21 @@ }, { "id": "alfresco-aos-module", - "version": "3.1.0", + "version": "3.2.0", "installed": true }, { "id": "org_alfresco_device_sync_repo", - "version": "4.0.1", + "version": "5.1.0", "installed": true } ] }, "acc": { - "version": "9.1.0" + "version": "9.2.0" }, "adw": { - "version": "5.1.0" + "version": "5.2.0" } } }