[jfrog-platform] 7.21.7 release (#141)

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

@@ -2,7 +2,7 @@
 # defaults file for xray
 
 # The version of xray to install
-xray_version: 3.26.1
+xray_version: 3.27.4
 
 # whether to enable HA
 xray_ha_enabled: false
@@ -13,7 +13,11 @@ xray_ha_node_type : master
 jfrog_home_directory: /opt/jfrog
 
 # The remote xray download file
-xray_tar: https://releases.jfrog.io/artifactory/jfrog-xray/xray-linux/{{ xray_version }}/jfrog-xray-{{ xray_version }}-linux.tar.gz
+xray_tar_file_name: jfrog-xray-{{ xray_version }}-linux.tar.gz
+xray_tar: https://releases.jfrog.io/artifactory/jfrog-xray/xray-linux/{{ xray_version }}/{{ xray_tar_file_name }}
+
+# Timeout in seconds for URL request
+xray_download_timeout: 10
 
 #The xray install directory
 xray_untar_home: "{{ jfrog_home_directory }}/jfrog-xray-{{ xray_version }}-linux"

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

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

@@ -1,6 +1,6 @@
 ---
 # platform collection version
-platform_collection_version: 7.19.8
+platform_collection_version: 7.21.7
 
 # indicates were this collection was downlaoded from (galaxy, automation_hub, standalone)
 ansible_marketplace: galaxy

Ansible/ansible_collections/jfrog/platform/roles/xray/vars/script/archive.yml

@@ -1,9 +1,5 @@
 xray_installer_scenario:
   main:
-    - {
-        "expecting": "have you disconnected artifactory xray pairings",
-        "sending": "y"
-      }
     - {
         "expecting": "(data|installation) directory \\(",
         "sending": "{{ xray_home }}"
@@ -51,4 +47,4 @@ xray_installer_scenario:
     - {
         "expecting": "rabbitmq active node ip:",
         "sending": "{{ ansible_host }}"
-      }
+      }