OPSEXP-3045 Refactor search role to use default vars (#1069)

pmacius · web-flow · commit 97615bac5be5 · 2025-02-18T15:33:06.000+01:00
diff --git a/.secrets.baseline b/.secrets.baseline
@@ -144,7 +144,7 @@
         "filename": "playbooks/acs.yml",
         "hashed_secret": "0ca8f28152882e5edb182fc3f7d4ae10a5b10dc5",
         "is_verified": false,
-        "line_number": 436,
+        "line_number": 441,
         "is_secret": false
       }
     ],
@@ -178,16 +178,6 @@
         "is_secret": false
       }
     ],
-    "roles/search/tasks/main.yml": [
-      {
-        "type": "Secret Keyword",
-        "filename": "roles/search/tasks/main.yml",
-        "hashed_secret": "0eeb6b7bb932e8594b4ffe039dc15332f670cbd9",
-        "is_verified": false,
-        "line_number": 20,
-        "is_secret": false
-      }
-    ],
     "roles/search_enterprise/tasks/main.yml": [
       {
         "type": "Secret Keyword",
@@ -259,5 +249,5 @@
       }
     ]
   },
-  "generated_at": "2025-02-17T10:12:53Z"
+  "generated_at": "2025-02-18T09:33:20Z"
 }
diff --git a/7.3.N-extra-vars.yml b/7.3.N-extra-vars.yml
@@ -25,10 +25,6 @@ search_enterprise:
   artifact_name: alfresco-elasticsearch-connector-distribution
   repository: "{{ nexus_repository.enterprise_releases }}"
   version: 3.2.1
-search:
-  artifact_name: alfresco-search-services
-  repository: "{{ nexus_repository.releases }}"
-  version: 2.0.14
 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
@@ -28,10 +28,6 @@ search_enterprise:
   artifact_name: alfresco-elasticsearch-connector-distribution
   repository: "{{ nexus_repository.enterprise_releases }}"
   version: 3.3.3
-search:
-  artifact_name: alfresco-search-services
-  repository: "{{ nexus_repository.releases }}"
-  version: 2.0.14
 transform:
   artifact_name: alfresco-transform-core-aio
   repository: "{{ nexus_repository.releases }}"
diff --git a/community-extra-vars.yml b/community-extra-vars.yml
@@ -12,10 +12,6 @@ transform:
   artifact_name: alfresco-transform-core-aio
   repository: "{{ nexus_repository.releases }}"
   version: 5.1.6
-search:
-  artifact_name: alfresco-search-services
-  repository: "{{ nexus_repository.releases }}"
-  version: 2.0.14
 amps:
   aos_module:
     repository: "{{ nexus_repository.releases }}/aos-module/alfresco-aos-module"
diff --git a/group_vars/all.yml b/group_vars/all.yml
@@ -51,10 +51,6 @@ search_enterprise:
   artifact_name: alfresco-elasticsearch-connector-distribution
   repository: "{{ nexus_repository.enterprise_releases }}"
   version: 4.2.0
-search:
-  artifact_name: alfresco-search-services
-  repository: "{{ nexus_repository.releases }}"
-  version: 2.0.14
 transform:
   artifact_name: alfresco-transform-core-aio
   repository: "{{ nexus_repository.releases }}"
@@ -80,10 +76,6 @@ downloads:
     {{ search_enterprise.repository }}/{{ search_enterprise.artifact_name }}/{{ search_enterprise.version }}/{{ search_enterprise.artifact_name }}-{{ search_enterprise.version }}.zip
   search_enterprise_zip_sha1_url: >-
     {{ search_enterprise.repository }}/{{ search_enterprise.artifact_name }}/{{ search_enterprise.version }}/{{ search_enterprise.artifact_name }}-{{ search_enterprise.version }}.zip.sha1
-  search_zip_url: >-
-    {{ search.repository }}/{{ search.artifact_name }}/{{ search.version }}/{{ search.artifact_name }}-{{ search.version }}.zip
-  search_zip_sha1_checksum_url: >-
-    {{ search.repository }}/{{ search.artifact_name }}/{{ search.version }}/{{ search.artifact_name }}-{{ search.version }}.zip.sha1
   sfs_jar_url: >-
     {{ sfs.repository }}/{{ sfs.artifact_name }}/{{ sfs.version }}/{{ sfs.artifact_name }}-{{ sfs.version }}.jar
   sfs_jar_sha1_checksum_url: >-
diff --git a/playbooks/acs.yml b/playbooks/acs.yml
@@ -200,9 +200,11 @@
   gather_facts: true
   roles:
     - role: ../roles/search
-      search_version: "{{ search.version }}"
+      search_version: "{{ acs_play_search_version }}"
       search_flavor: >-
-        {{ 'alfresco-insight-engine' if 'insight-engine' in search.artifact_name else 'alfresco-search-services' }}
+        {{ 'alfresco-insight-engine' if 'insight-engine' in acs_play_search_artifact_name else 'alfresco-search-services' }}
+      search_zip_url: "{{ acs_play_search_download_zip_url }}"
+      search_zip_checksum_url: "{{ acs_play_search_download_zip_sha1_checksum_url }}"
       search_master_hostname: "{{ solr_host }}"
       search_shared_secret: "{{ reposearch_shared_secret }}"
       alfresco:
@@ -223,7 +225,10 @@
       become: true
       vars:
         search_components:
-          search: "{{ search }}"
+          search:
+            artifact_name: "{{ acs_play_search_artifact_name }}"
+            repository: "{{ acs_play_search_repository }}"
+            version: "{{ acs_play_search_version }}"
       ansible.builtin.blockinfile:
         block: "{{ search_components | to_nice_yaml(indent=2) }}"
         create: true
diff --git a/playbooks/group_vars/search.yml b/playbooks/group_vars/search.yml
@@ -0,0 +1,4 @@
+acs_play_search_artifact_name: alfresco-search-services
+acs_play_search_repository: "{{ nexus_repository.releases }}"
+acs_play_search_download_zip_url: "{{ acs_play_search_repository }}/{{ acs_play_search_artifact_name }}/{{ acs_play_search_version }}/{{ acs_play_search_artifact_name }}-{{ acs_play_search_version }}.zip"
+acs_play_search_download_zip_sha1_checksum_url: "sha1:{{ acs_play_search_download_zip_url }}.sha1"
diff --git a/playbooks/prerun-upgrade-checks.yml b/playbooks/prerun-upgrade-checks.yml
@@ -1,5 +1,8 @@
 ---
 # This playbook is used to run preliminary upgrade checks for the hosts in the ACS deployment.
+- name: Include vars based on acs major version
+  ansible.builtin.import_playbook: include-vars.yml
+
 - name: Run preliminary upgrade checks for all hosts
   hosts: all:!external
   gather_facts: false
@@ -69,7 +72,7 @@
           ansible.builtin.fail:
           when:
             - installed_components.search is defined
-            - search.version != installed_components.search.version
+            - acs_play_search_version != installed_components.search.version
 
         - name: Fail on unsupported Sync upgrades
           ansible.builtin.fail:
diff --git a/roles/search/defaults/main.yml b/roles/search/defaults/main.yml
@@ -7,7 +7,10 @@ alfresco:
   port_ssl: 443
 
 search_flavor: alfresco-search-services  # set to alfresco-insight-engine for IE
-search_version: 2.0.6
+search_version: 2.0.14
+search_artifact_repository: https://artifacts.alfresco.com/nexus/content/groups/public/org/alfresco
+search_zip_url: "{{ search_artifact_repository }}/{{ search_flavor }}/{{ search_version }}/{{ search_flavor }}-{{ search_version }}.zip"
+search_zip_checksum_url: "sha1:{{ search_zip_url }}.sha1"
 search_environment:  # This will add extra vars at the end of the solr.in.sh file
   SOLR_JAVA_MEM: "-Xms1g -Xmx1g"
 search_cores:
diff --git a/roles/search/meta/argument_specs.yml b/roles/search/meta/argument_specs.yml
@@ -83,13 +83,23 @@ argument_specs:
       search_version:
         description: Alfresco Search Service version to use for deployment.
         required: false
-        default: 2.0.6
+        default: 2.0.14
       search_flavor:
         description: |
           Choose between alfresco-search-services and alfresco-insight-engine.
           Insight Engine requires a specific entitlement.
         required: false
         default: alfresco-search-services
+      search_zip_url:
+        description: |
+          The URL of the Search Service zip file to download.
+        required: false
+        type: str
+      search_zip_checksum_url:
+        description: |
+          The URL of the Search Service zip file checksum to download.
+        required: false
+        type: str
       solr:
         description: |
           A dictionnary to describe Solr setup
diff --git a/roles/search/molecule/default/tests/test_search.py b/roles/search/molecule/default/tests/test_search.py
@@ -38,10 +38,7 @@ def test_search_service_running_and_enabled(host, svc):
 
 def test_solr_stats_is_accessible(host):
     """Check that SOLR creates the alfresco and archive cores"""
-    curl_opts = '-iL'
-    search_env = host.ansible.get_variables()
-    if version.parse(search_env['search']['version']) >= version.parse('2.0.3'):
-        curl_opts += ' -H "X-Alfresco-Search-Secret: alfresco with space"'
+    curl_opts = '-iL -H "X-Alfresco-Search-Secret: alfresco with space"'
     print("curl {} http://{}:8983/solr/#/~cores/alfresco".format(curl_opts, test_host))
     alfresco_core_command = host.run("curl {} http://{}:8983/solr/#/~cores/alfresco".format(curl_opts, test_host))
     archive_core_command = host.run("curl {} http://{}:8983/solr/#/~cores/archive".format(curl_opts, test_host))
diff --git a/roles/search/tasks/main.yml b/roles/search/tasks/main.yml
@@ -15,9 +15,9 @@
 
 - name: "Download {{ search_flavor }}-{{ search_version }}.zip"
   ansible.builtin.get_url:
-    url: "{{ downloads.search_zip_url }}"
+    url: "{{ search_zip_url }}"
     dest: "{{ download_location }}/{{ search_flavor }}-{{ search_version }}.zip"
-    checksum: sha1:{{ lookup('url', downloads.search_zip_sha1_checksum_url, username=nexus_user, password=nexus_password) }}
+    checksum: "{{ search_zip_checksum_url }}"
     mode: "0644"
     url_username: "{{ nexus_user }}"
     url_password: "{{ nexus_password }}"
diff --git a/vars/acs23.yml b/vars/acs23.yml
@@ -21,3 +21,4 @@ acs_play_activemq_version: 5.18.6
 acs_play_audit_storage_version: 1.0.0
 acs_play_acc_version: 9.3.0
 acs_play_adw_version: 5.3.0
+acs_play_search_version: 2.0.14
diff --git a/vars/acs73.yml b/vars/acs73.yml
@@ -10,3 +10,4 @@ supported_os:
       - 22.04
 acs_play_activemq_version: 5.17.6
 acs_play_adw_version: 4.4.1
+acs_play_search_version: 2.0.14
diff --git a/vars/acs74.yml b/vars/acs74.yml
@@ -19,3 +19,4 @@ supported_os:
 acs_play_activemq_version: 5.17.6
 acs_play_acc_version: 8.0.0
 acs_play_adw_version: 5.0.0
+acs_play_search_version: 2.0.14

Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@`
`144`	`144`	`"filename": "playbooks/acs.yml",`
`145`	`145`	`"hashed_secret": "0ca8f28152882e5edb182fc3f7d4ae10a5b10dc5",`
`146`	`146`	`"is_verified": false,`
`147`		`- "line_number": 436,`
	`147`	`+ "line_number": 441,`
`148`	`148`	`"is_secret": false`
`149`	`149`	`}`
`150`	`150`	`],`
`@@ -178,16 +178,6 @@`
`178`	`178`	`"is_secret": false`
`179`	`179`	`}`
`180`	`180`	`],`
`181`		`- "roles/search/tasks/main.yml": [`
`182`		`- {`
`183`		`- "type": "Secret Keyword",`
`184`		`- "filename": "roles/search/tasks/main.yml",`
`185`		`- "hashed_secret": "0eeb6b7bb932e8594b4ffe039dc15332f670cbd9",`
`186`		`- "is_verified": false,`
`187`		`- "line_number": 20,`
`188`		`- "is_secret": false`
`189`		`- }`
`190`		`- ],`
`191`	`181`	`"roles/search_enterprise/tasks/main.yml": [`
`192`	`182`	`{`
`193`	`183`	`"type": "Secret Keyword",`
`@@ -259,5 +249,5 @@`
`259`	`249`	`}`
`260`	`250`	`]`
`261`	`251`	`},`
`262`		`- "generated_at": "2025-02-17T10:12:53Z"`
	`252`	`+ "generated_at": "2025-02-18T09:33:20Z"`
`263`	`253`	`}`