[jfrog-platform] 7.21.7 release (#141)

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

@@ -2,7 +2,7 @@
 # defaults file for artifactory
 
 # The version of artifactory to install
-artifactory_version: 7.19.8
+artifactory_version: 7.21.7
 
 # Set this to true when SSL is enabled (to use artifactory_nginx_ssl role), default to false (implies artifactory uses artifactory_nginx role )
 artifactory_nginx_ssl_enabled: false
@@ -36,11 +36,15 @@ artifactory_flavour: pro
 
 artifactory_extra_java_opts: -server -Xms512m -Xmx2g -Xss256k -XX:+UseG1GC
 artifactory_system_yaml_template: system.yaml.j2
-artifactory_tar: https://releases.jfrog.io/artifactory/artifactory-pro/org/artifactory/pro/jfrog-artifactory-pro/{{ artifactory_version }}/jfrog-artifactory-pro-{{ artifactory_version }}-linux.tar.gz
+artifactory_tar_file_name: jfrog-artifactory-pro-{{ artifactory_version }}-linux.tar.gz
 artifactory_home: "{{ jfrog_home_directory }}/artifactory"
+artifactory_tar: https://releases.jfrog.io/artifactory/artifactory-pro/org/artifactory/pro/jfrog-artifactory-pro/{{ artifactory_version }}/{{ artifactory_tar_file_name }}
 artifactory_untar_home: "{{ jfrog_home_directory }}/artifactory-{{ artifactory_flavour }}-{{ artifactory_version }}"
 
-postgres_driver_version: 42.2.20
+# Timeout in seconds for URL request
+artifactory_download_timeout: 10
+
+postgres_driver_version: 42.2.23
 postgres_driver_download_url: https://repo1.maven.org/maven2/org/postgresql/postgresql/{{ postgres_driver_version }}/postgresql-{{ postgres_driver_version }}.jar
 
 artifactory_user: artifactory

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

@@ -34,19 +34,33 @@
     shell: /bin/bash
     state: present
 
+- name: Check if artifactory tar already exists
+  become: yes
+  stat:
+    path: "{{ jfrog_home_directory }}/{{ artifactory_tar_file_name }}"
+  register: artifactory_tar_check
+
 - name: Download artifactory
   become: yes
-  unarchive:
-    src: "{{ artifactory_tar }}"
+  get_url:
+    url: "{{ artifactory_tar }}"
+    timeout: "{{ artifactory_download_timeout }}"
     dest: "{{ jfrog_home_directory }}"
-    remote_src: yes
-    owner: "{{ artifactory_user }}"
-    group: "{{ artifactory_group }}"
-    creates: "{{ artifactory_untar_home }}"
-  when: artifactory_tar is defined
   register: downloadartifactory
   until: downloadartifactory is succeeded
   retries: 3
+  when: not artifactory_tar_check.stat.exists
+
+- name: Extract artifactory tar
+  become: yes
+  unarchive:
+    src: "{{ jfrog_home_directory }}/{{ artifactory_tar_file_name }}"
+    dest: "{{ jfrog_home_directory }}"
+    remote_src: true
+    owner: "{{ artifactory_user }}"
+    group: "{{ artifactory_group }}"
+    creates: "{{ artifactory_untar_home }}"
+  when: downloadartifactory is succeeded
 
 - name: Check if app directory exists
   become: yes

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

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

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

@@ -2,19 +2,33 @@
 - debug:
     msg: "Performing upgrade of Artifactory version to : {{ artifactory_version }} "
 
+- name: Check if artifactory tar already exists
+  become: yes
+  stat:
+    path: "{{ jfrog_home_directory }}/{{ artifactory_tar_file_name }}"
+  register: artifactory_tar_check
+
 - name: Download artifactory for upgrade
   become: yes
-  unarchive:
-    src: "{{ artifactory_tar }}"
+  get_url:
+    url: "{{ artifactory_tar }}"
+    timeout: "{{ artifactory_download_timeout }}"
     dest: "{{ jfrog_home_directory }}"
-    remote_src: yes
-    owner: "{{ artifactory_user }}"
-    group: "{{ artifactory_group }}"
-    creates: "{{ artifactory_untar_home }}"
-  when: artifactory_tar is defined
   register: downloadartifactory
   until: downloadartifactory is succeeded
   retries: 3
+  when: not artifactory_tar_check.stat.exists
+
+- name: Extract artifactory tar
+  become: yes
+  unarchive:
+    src: "{{ jfrog_home_directory }}/{{ artifactory_tar_file_name }}"
+    dest: "{{ jfrog_home_directory }}"
+    remote_src: true
+    owner: "{{ artifactory_user }}"
+    group: "{{ artifactory_group }}"
+    creates: "{{ artifactory_untar_home }}"
+  when: downloadartifactory is succeeded
 
 - name: Stop artifactory
   become: yes

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

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