OPSEXP-2110 Add 7.3.N-extra-vars.yml

.github/workflows/enteprise.yml

@@ -9,7 +9,7 @@ on:
       - '*.md'
 
 env:
-  DTAS_VERSION: v1.2.0
+  DTAS_VERSION: OPSEXP-2118
   BUILD_NUMBER: ${{ github.run_id }}
   PY_COLORS: 1
   PYTHONUNBUFFERED: 1
@@ -138,12 +138,12 @@ jobs:
           - 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)
           - name: default
             vars: vars-ubuntu22-community.yml
             desc: EC2 ACS 7.4 Community (Ubuntu 22.04)
-          - name: default
-            vars: vars-ubuntu20.yml
-            desc: EC2 ACS 7.4 (Ubuntu 20.04)
           - name: default
             vars: vars-rocky8.yml
             desc: EC2 ACS 7.4 (Rocky Linux 8)

7.3.N-extra-vars.yml

@@ -0,0 +1,59 @@
+acs:
+  artifact_name: alfresco-content-services-distribution
+  edition: Enterprise
+  repository: "{{ nexus_repository.enterprise_releases }}"
+  version: 7.3.0.5
+amps:
+  aos_module:
+    repository: "{{ nexus_repository.releases }}/aos-module/alfresco-aos-module"
+    version: 1.5.0
+  device_sync:
+    repository: "{{ nexus_repository.enterprise_releases }}/services/sync/alfresco-device-sync-repo"
+    version: 3.8.0
+  googledrive_repo:
+    repository: "{{ nexus_repository.enterprise_releases }}/integrations/alfresco-googledrive-repo-enterprise"
+    version: 3.3.1
+  googledrive_share:
+    repository: "{{ nexus_repository.releases }}/integrations/alfresco-googledrive-share"
+    version: 3.3.1
+api_explorer:
+  artifact_name: api-explorer
+  repository: "{{ nexus_repository.releases }}"
+  version: 7.3.0
+search_enterprise:
+  artifact_name: alfresco-elasticsearch-connector-distribution
+  repository: "{{ nexus_repository.enterprise_releases }}"
+  version: 3.2.0
+search:
+  artifact_name: alfresco-search-services
+  repository: "{{ nexus_repository.releases }}"
+  version: 2.0.6.1
+transform:
+  artifact_name: alfresco-transform-core-aio
+  repository: "{{ nexus_repository.releases }}"
+  version: 3.0.0
+trouter:
+  artifact_name: alfresco-transform-router
+  repository: "{{ nexus_repository.enterprise_releases }}"
+  version: 2.0.0
+sfs:
+  artifact_name: alfresco-shared-file-store-controller
+  repository: "{{ nexus_repository.enterprise_releases }}"
+  version: 2.0.0
+adw:
+  artifact_name: alfresco-digital-workspace
+  repository: "{{ nexus_repository.enterprise_releases }}"
+  version: 3.1.0
+sync:
+  repository: "{{ nexus_repository.enterprise_releases }}/services/sync/sync-dist-6.x"
+  version: 3.8.0
+dependencies_version:
+  postgresql_connector: 42.2.19
+  postgres_major_version: 13
+  activemq: 5.16.4
+  java: 11.0.15
+  java_build: 10
+  tomcat: 9.0.59
+  libreoffice: 7.2.5.1
+  pdf_renderer: 1.1
+  imagemagick: 7.1.0-16-ci-2

molecule/default/cleanup.yml

@@ -9,6 +9,7 @@
       amazon.aws.ec2_metadata_facts:
       delegate_to: "{{ groups['nginx'] | first }}"
       failed_when: false
+      ignore_unreachable: true
 
     - name: Set hostname fact from EC2 or localhost
       ansible.builtin.set_fact:

molecule/default/vars-ubuntu20-73.yml

@@ -0,0 +1,4 @@
+MOLECULE_IT_IMAGE_ID: ami-081ff4b9aa4e81a08
+MOLECULE_IT_EXTRA_VARS: 7.3.N-extra-vars.yml
+MOLECULE_IT_TEST_CONFIG: tests/test-config-7.3.json
+MOLECULE_IT_PLATFORM: ubuntu20-73

molecule/default/verify.yml

@@ -31,7 +31,7 @@
             chdir: "{{ dtas_dir }}"
             cmd: |
               export REQUESTS_CA_BUNDLE={{ selfsigned_cert_path }}
-              pytest --tb=line --configuration {{ test_config_file }} tests/ -s
+              pytest --tb=line --color=no --configuration {{ test_config_file }} tests/ -s
       rescue:
         - name: Print multiline pytest stdout as best as we can
           debug:

scripts/updatecli/updatecli_acs73.yml

@@ -23,10 +23,10 @@ searchEnterprise:
   version: "3.2"
 
 transform:
-  version: "3"
+  version: "3.0"
 
 trouter:
-  version: "2"
+  version: "2.0"
 
 target_file: 7.3.N-extra-vars.yml
 version_pattern: '(-M\d*)?$'

scripts/updatecli/updatecli_config.tpl

@@ -86,6 +86,7 @@ sources:
       versionFilter:
         kind: regex
         pattern: '{{ .adw.version }}(.(\d+))+{{ .version_pattern }}'
+  {{- if index . "ags" "version" }}
   agsAmp:
     name: AGS AMP {{ .ags.version }}.x
     kind: gittag
@@ -96,6 +97,7 @@ sources:
         pattern: 'ags-{{ .ags.version }}(.(\d+))+{{ .version_pattern }}'
     transformers:
       - trimprefix: "ags-"
+  {{- end }}
   aosAmp:
     name: AOS AMP {{ .aos.version }}
     kind: gittag

tests/test-config-7.3.json

@@ -0,0 +1,34 @@
+{
+    "config": {
+      "host": "TEST_URL",
+      "username": "admin",
+      "password": "admin"
+    },
+    "assertions": {
+      "acs": {
+        "edition": "Enterprise",
+        "version": "7.3.0",
+        "identity": false,
+        "modules": [
+          {
+            "id": "org.alfresco.integrations.google.docs",
+            "version": "3.3.1",
+            "installed": true
+          },
+          {
+            "id": "alfresco-aos-module",
+            "version": "1.5.0",
+            "installed": true
+          },
+          {
+            "id": "org_alfresco_device_sync_repo",
+            "version": "3.8.0",
+            "installed": true
+          }
+        ]
+      },
+      "adw": {
+        "version": "2.9.0"
+      }
+    }
+  }

tests/test-config.json

@@ -7,22 +7,22 @@
     "assertions": {
       "acs": {
         "edition": "Enterprise",
-        "version": "7.3.0",
+        "version": "7.4.0",
         "identity": false,
         "modules": [
           {
             "id": "org.alfresco.integrations.google.docs",
-            "version": "3.3.0",
+            "version": "3.4.0",
             "installed": true
           },
           {
             "id": "alfresco-aos-module",
-            "version": "1.5.0",
+            "version": "1.6.0",
             "installed": true
           },
           {
             "id": "org_alfresco_device_sync_repo",
-            "version": "3.8.0",
+            "version": "3.9.0",
             "installed": true
           }
         ]
@@ -31,7 +31,7 @@
         "version": "8.0.0"
       },
       "adw": {
-        "version": "2.9.0"
+        "version": "4.0.0"
       }
     }
   }