[jfrog-platform] 7.25.7 release (#159)

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

@@ -1,7 +1,7 @@
 # defaults file for artifactory
 
 # The version of artifactory to install
-artifactory_version: 7.24.3
+artifactory_version: 7.25.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
@@ -13,7 +13,7 @@ artifactory_nginx_enabled: true
 # artifactory_single_license:
 
 # Provide individual (HA) licenses file separated by new line and 2-space indentation and set artifactory_ha_enabled: true.
-# Example:
+# Example: Replace <license_1> , <license_2> , <license_3> with original licenses
 # artifactory_licenses: |-
 #   <license_1>
 
@@ -25,7 +25,7 @@ artifactory_nginx_enabled: true
 artifactory_ha_enabled: false
 
 # By default, all nodes are primary (CNHA) - https://www.jfrog.com/confluence/display/JFROG/High+Availability#HighAvailability-Cloud-NativeHighAvailability
-artifactory_taskAffinity: any
+artifactory_taskaffinity: any
 
 # The location where Artifactory should install
 jfrog_home_directory: /opt/jfrog
@@ -80,7 +80,7 @@ artifactory_systemyaml: |-
     node:
       id: {{ ansible_hostname }}
       ip: {{ ansible_host }}
-      taskAffinity: {{ artifactory_taskAffinity }}
+      taskAffinity: {{ artifactory_taskaffinity }}
       haEnabled: {{ artifactory_ha_enabled }}
     database:
       type: "{{ artifactory_db_type }}"

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

@@ -5,3 +5,9 @@
   systemd:
     name: "{{ artifactory_daemon }}"
     state: restarted
+
+- name: stop artifactory
+  become: yes
+  systemd:
+    name: "{{ artifactory_daemon }}"
+    state: stopped

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

@@ -1,16 +1,27 @@
+---
+dependencies: []
+
 galaxy_info:
   author: "JFrog Maintainers Team <installers@jfrog.com>"
   description: "The artifactory role installs the Artifactory Pro software onto the host."
   company: JFrog
-
   issue_tracker_url: "https://github.com/jfrog/JFrog-Cloud-Installers/issues"
-
   license: license (Apache-2.0)
-
   min_ansible_version: 2.9
-
+  platforms:
+    - name: EL
+      versions:
+        - 7
+        - 8
+    - name: Ubuntu
+      versions:
+        - xenial
+        - bionic
+        - focal
+    - name: Debian
+      versions:
+        - stretch
+        - buster
   galaxy_tags:
     - artifactory
-    - jfrog
-
-dependencies: []
+    - jfrog

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

@@ -1,6 +1,3 @@
-- debug:
-    msg: "Performing installation of Artifactory version : {{ artifactory_version }} "
-
 - name: Install prerequisite packages
   include_tasks: "{{ ansible_os_family }}.yml"
 
@@ -70,7 +67,10 @@
 
 - name: Copy untar directory to artifactory home
   become: yes
-  command: "cp -r {{ artifactory_untar_home }}/. {{ artifactory_home }}"
+  copy:
+    src: "{{ artifactory_untar_home }}/"
+    dest: "{{ artifactory_home }}"
+    remote_src: yes
   when: not app_dir_check.stat.exists
 
 - name: Create required directories
@@ -87,21 +87,22 @@
     - "{{ artifactory_home }}/var/etc/security/"
     - "{{ artifactory_home }}/var/etc/artifactory/info/"
 
-- name: Check if systemyaml exists
+- name: Check if system.yaml exists
   become: yes
   stat:
     path: "{{ artifactory_home }}/var/etc/system.yaml"
   register: systemyaml
 
-- name: Configure systemyaml
+- name: Configure system.yaml
   become: yes
   template:
     src: "{{ artifactory_system_yaml_template }}"
     dest: "{{ artifactory_home }}/var/etc/system.yaml"
+    mode: 0644
   when:
     - artifactory_systemyaml is defined
     - artifactory_systemyaml|length > 0
-    - artifactory_systemyaml_override or (not systemyaml.stat.exists) 
+    - artifactory_systemyaml_override or (not systemyaml.stat.exists)
   notify: restart artifactory
 
 - name: Configure master key
@@ -118,6 +119,7 @@
   template:
     src: installer-info.json.j2
     dest: "{{ artifactory_home }}/var/etc/artifactory/info/installer-info.json"
+    mode: 0644
   notify: restart artifactory
 
 - name: Configure binary store
@@ -125,6 +127,7 @@
   template:
     src: binarystore.xml.j2
     dest: "{{ artifactory_home }}/var/etc/artifactory/binarystore.xml"
+    mode: 0644
   when:
     - artifactory_binarystore is defined
     - artifactory_binarystore | length > 0
@@ -135,6 +138,7 @@
   template:
     src: artifactory.lic.j2
     dest: "{{ artifactory_home }}/var/etc/artifactory/artifactory.lic"
+    mode: 0644
   when:
     - artifactory_single_license is defined
     - artifactory_single_license|length > 0
@@ -145,6 +149,7 @@
   template:
     src: artifactory.cluster.license.j2
     dest: "{{ artifactory_home }}/var/etc/artifactory/artifactory.cluster.license"
+    mode: 0644
   when:
    - artifactory_licenses is defined
    - artifactory_licenses|length > 0
@@ -170,7 +175,7 @@
 
 - name: Create artifactory service
   become: yes
-  shell: "{{ artifactory_home }}/app/bin/installService.sh"
+  command: "{{ artifactory_home }}/app/bin/installService.sh"
   args:
     creates: "{{ artifactory_service_file }}"
 

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

@@ -1,6 +1,4 @@
-- debug:
-    msg: "Performing upgrade of Artifactory version to : {{ artifactory_version }} "
-
+---
 - name: Check if artifactory tar already exists
   become: yes
   stat:
@@ -29,12 +27,8 @@
     creates: "{{ artifactory_untar_home }}"
   when: download_artifactory is succeeded
 
-- name: Stop artifactory
-  become: yes
-  systemd:
-    name: "{{ artifactory_daemon }}"
-    state: stopped
-  when: download_artifactory.changed
+- name: stop artifactory
+  meta: flush_handlers
 
 - name: Ensure jfrog_home_directory exists
   become: yes
@@ -59,6 +53,7 @@
   template:
     src: artifactory.lic.j2
     dest: "{{ artifactory_home }}/var/etc/artifactory/artifactory.lic"
+    mode: 0644
   when:
     - artifactory_single_license is defined
     - artifactory_single_license|length > 0
@@ -69,6 +64,7 @@
   template:
     src: artifactory.cluster.license.j2
     dest: "{{ artifactory_home }}/var/etc/artifactory/artifactory.cluster.license"
+    mode: 0644
   when:
    - artifactory_licenses is defined
    - artifactory_licenses | length > 0
@@ -97,6 +93,7 @@
   template:
     src: installer-info.json.j2
     dest: "{{ artifactory_home }}/var/etc/artifactory/info/installer-info.json"
+    mode: 0644
   notify: restart artifactory
 
 - name: Configure binary store
@@ -104,6 +101,7 @@
   template:
     src: binarystore.xml.j2
     dest: "{{ artifactory_home }}/var/etc/artifactory/binarystore.xml"
+    mode: 0644
   when:
     - artifactory_binarystore is defined
     - artifactory_binarystore|length > 0
@@ -120,6 +118,7 @@
   template:
     src: "{{ artifactory_system_yaml_template }}"
     dest: "{{ artifactory_home }}/var/etc/system.yaml"
+    mode: 0644
   when:
     - artifactory_systemyaml is defined
     - artifactory_systemyaml|length > 0

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

@@ -1,5 +1,5 @@
 # platform collection version
-platform_collection_version: 7.24.3
+platform_collection_version: 7.25.7
 
 # indicates where this collection was downloaded from (galaxy, automation_hub, standalone)
 ansible_marketplace: galaxy