[jfrog-platform] 7.21.7 release (#141)

Ansible/ansible_collections/jfrog/platform/roles/xray/tasks/install.yml

@@ -38,18 +38,33 @@
     shell: /bin/bash
     state: present
 
+- name: Check if xray tar exists
+  become: yes
+  stat:
+    path: "{{ jfrog_home_directory }}/{{ xray_tar_file_name }}"
+  register: xray_tar_check
+
 - name: Download xray
   become: yes
-  unarchive:
-    src: "{{ xray_tar }}"
+  get_url:
+    url: "{{ xray_tar }}"
+    timeout: "{{ xray_download_timeout }}"
     dest: "{{ jfrog_home_directory }}"
-    remote_src: yes
-    owner: "{{ xray_user }}"
-    group: "{{ xray_group }}"
-    creates: "{{ xray_untar_home }}"
   register: downloadxray
   until: downloadxray is succeeded
   retries: 3
+  when: not xray_tar_check.stat.exists
+
+- name: Extract xray tar
+  become: yes
+  unarchive:
+    src: "{{ jfrog_home_directory }}/{{ xray_tar_file_name }}"
+    dest: "{{ jfrog_home_directory }}"
+    remote_src: true
+    owner: "{{ xray_user }}"
+    group: "{{ xray_group }}"
+    creates: "{{ xray_untar_home }}"
+  when: downloadxray is succeeded
 
 - name: Check if app directory exists
   become: yes

Ansible/ansible_collections/jfrog/platform/roles/xray/tasks/main.yml

@@ -1,6 +1,10 @@
 - name: perform installation
   include_tasks: "install.yml"
-  when: not xray_upgrade_only
+  when:
+    - xray_enabled
+    - not xray_upgrade_only
 - name: perform upgrade
   include_tasks: "upgrade.yml"
-  when: xray_upgrade_only
+  when:
+    - xray_enabled
+    - xray_upgrade_only

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

@@ -2,18 +2,33 @@
 - debug:
     msg: "Performing upgrade of Xray version to {{ xray_version }}..."
 
-- name: download xray for upgrade
+- name: Check if xray tar exists
   become: yes
-  unarchive:
-    src: "{{ xray_tar }}"
+  stat:
+    path: "{{ jfrog_home_directory }}/{{ xray_tar_file_name }}"
+  register: xray_tar_check
+
+- name: Download xray for upgrade
+  become: yes
+  get_url:
+    url: "{{ xray_tar }}"
+    timeout: "{{ xray_download_timeout }}"
     dest: "{{ jfrog_home_directory }}"
-    remote_src: yes
-    owner: "{{ xray_user }}"
-    group: "{{ xray_group }}"
-    creates: "{{ xray_untar_home }}"
   register: downloadxray
   until: downloadxray is succeeded
   retries: 3
+  when: not xray_tar_check.stat.exists
+
+- name: Extract xray tar
+  become: yes
+  unarchive:
+    src: "{{ jfrog_home_directory }}/{{ xray_tar_file_name }}"
+    dest: "{{ jfrog_home_directory }}"
+    remote_src: true
+    owner: "{{ xray_user }}"
+    group: "{{ xray_group }}"
+    creates: "{{ xray_untar_home }}"
+  when: downloadxray is succeeded
 
 - name: stop xray
   become: yes