[jfrog-platform] 7.21.7 release (#141)

Ansible/ansible_collections/jfrog/platform/roles/missioncontrol/tasks/setup-elasticsearch.yml

@@ -58,7 +58,7 @@
   become: yes
   find:
     paths: "{{ mc_home }}/app/third-party/elasticsearch"
-    patterns: "^elasticsearch-oss-.+\\.tar.gz$"
+    patterns: "^elasticsearch-.+\\.tar.gz$"
     use_regex: yes
     file_type: file
   register: check_elasticsearch_package_result
@@ -157,7 +157,7 @@
   become: yes
   shell: "su -c '{{ mc_es_script_path }}/elasticsearch -d' elasticsearch"
   environment:
-    JAVA_HOME: "{{ mc_es_java_home }}"
+    ES_JAVA_HOME: "{{ mc_es_java_home }}"
     ES_PATH_CONF: "{{ mc_es_conf_base }}/"
   register: start_elasticsearch_result
   when: unarchive_result.extract_results.rc | default(128) == 0

Ansible/ansible_collections/jfrog/platform/roles/missioncontrol/tasks/setup-searchguard.yml

@@ -28,7 +28,7 @@
     {{ mc_es_script_path }}/elasticsearch-plugin install \
     -b file://{{ check_searchguard_bundle_result.files[0].path }}
   environment:
-    JAVA_HOME: "{{ mc_es_java_home }}"
+    ES_JAVA_HOME: "{{ mc_es_java_home }}"
     ES_PATH_CONF: "{{ mc_es_conf_base }}/"
   register: install_searchguard_result
   when: check_searchguard_bundle_result.matched == 1

Ansible/ansible_collections/jfrog/platform/roles/missioncontrol/tasks/upgrade-elasticsearch.yml

@@ -53,7 +53,7 @@
   become: yes
   find:
     paths: "{{ mc_home }}/app/third-party/elasticsearch"
-    patterns: "^elasticsearch-oss-.+\\.tar.gz$"
+    patterns: "^elasticsearch-.+\\.tar.gz$"
     use_regex: yes
     file_type: file
   register: check_elasticsearch_package_result
@@ -104,7 +104,7 @@
   become: yes
   shell: "su -c '{{ mc_es_script_path }}/elasticsearch -d' elasticsearch"
   environment:
-    JAVA_HOME: "{{ mc_es_java_home }}"
+    ES_JAVA_HOME: "{{ mc_es_java_home }}"
     ES_PATH_CONF: "{{ mc_es_conf_base }}/"
   when: unarchive_result.extract_results.rc | default(128) == 0
   register: start_elastcsearch_upgraded

Ansible/ansible_collections/jfrog/platform/roles/missioncontrol/tasks/upgrade-searchguard.yml

@@ -37,7 +37,7 @@
     {{ mc_es_script_path }}/elasticsearch-plugin install \
     -b file://{{ check_searchguard_bundle_result.files[0].path }}
   environment:
-    JAVA_HOME: "{{ mc_es_java_home }}"
+    ES_JAVA_HOME: "{{ mc_es_java_home }}"
     ES_PATH_CONF: "{{ mc_es_conf_base }}/"
   register: install_searchguard_result
   when: check_searchguard_bundle_result.matched == 1

Ansible/ansible_collections/jfrog/platform/roles/missioncontrol/tasks/upgrade.yml

@@ -2,18 +2,33 @@
 - debug:
     msg: "Performing Upgrade of missionControl version - {{ missioncontrol_version }}"
 
-- name: Download mc for upgrade
-  unarchive:
-    src: "{{ mc_tar }}"
-    dest: "{{ jfrog_home_directory }}"
-    remote_src: yes
-    owner: "{{ mc_user }}"
-    group: "{{ mc_group }}"
-    creates: "{{ mc_untar_home }}"
+- name: Check if mc tar exists
   become: yes
+  stat:
+    path: "{{ jfrog_home_directory }}/{{ mc_tar_file_name }}"
+  register: mc_tar_check
+
+- name: Download mc for upgrade
+  become: yes
+  get_url:
+    url: "{{ mc_tar }}"
+    timeout: "{{ mc_download_timeout }}"
+    dest: "{{ jfrog_home_directory }}"
   register: downloadmc
   until: downloadmc is succeeded
   retries: 3
+  when: not mc_tar_check.stat.exists
+
+- name: Extract mc tar
+  become: yes
+  unarchive:
+    src: "{{ jfrog_home_directory }}/{{ mc_tar_file_name }}"
+    dest: "{{ jfrog_home_directory }}"
+    remote_src: true
+    owner: "{{ mc_user }}"
+    group: "{{ mc_group }}"
+    creates: "{{ mc_untar_home }}"
+  when: downloadmc is succeeded
 
 - name: Stop mc service
   become: yes