From 9d8c56ba0e50d936912b1461683d08a31034f938 Mon Sep 17 00:00:00 2001 From: Ram Mohan Rao Chukka <1331672+chukka@users.noreply.github.com> Date: Fri, 1 Mar 2024 17:36:36 +0530 Subject: [PATCH] [ansible] JFrog Platform 10.17.1 release (#375) * #365 Use `fetch` and `lookup('ini')` to get the version (#369) * [ansible] JFrog Platform 10.17.1 release --------- Co-authored-by: David Lundgren --- .../ansible_collections/jfrog/platform/CHANGELOG.md | 4 ++++ Ansible/ansible_collections/jfrog/platform/README.md | 4 ++-- Ansible/ansible_collections/jfrog/platform/galaxy.yml | 2 +- .../jfrog/platform/roles/artifactory/defaults/main.yml | 2 +- .../jfrog/platform/roles/artifactory/tasks/upgrade.yml | 10 +++++----- .../jfrog/platform/roles/artifactory/vars/main.yml | 2 +- .../platform/roles/distribution/defaults/main.yml | 2 +- .../jfrog/platform/roles/distribution/vars/main.yml | 2 +- .../jfrog/platform/roles/insight/defaults/main.yml | 2 +- .../jfrog/platform/roles/insight/vars/main.yml | 2 +- .../jfrog/platform/roles/xray/defaults/main.yml | 2 +- .../jfrog/platform/roles/xray/vars/main.yml | 2 +- 12 files changed, 20 insertions(+), 16 deletions(-) diff --git a/Ansible/ansible_collections/jfrog/platform/CHANGELOG.md b/Ansible/ansible_collections/jfrog/platform/CHANGELOG.md index e17ac267..a8348a8e 100644 --- a/Ansible/ansible_collections/jfrog/platform/CHANGELOG.md +++ b/Ansible/ansible_collections/jfrog/platform/CHANGELOG.md @@ -1,6 +1,10 @@ # JFrog Platform Ansible Collection Changelog All changes to this collection will be documented in this file. +## [10.17.1] - Feb 29, 2024 +* Artifactory - Upgrade fails during the Check artifactory version [GH-369](https://github.com/jfrog/JFrog-Cloud-Installers/pull/369) +* Product Updates/fixes + ## [10.17.0] - Jan 24, 2024 * **IMPORTANT** * From 10.17.x platform collection, Artifactory (7.77.x) is not supported on Ubuntu 18.04, Centos/RHEL 7.x diff --git a/Ansible/ansible_collections/jfrog/platform/README.md b/Ansible/ansible_collections/jfrog/platform/README.md index 67a446a8..37e81df5 100644 --- a/Ansible/ansible_collections/jfrog/platform/README.md +++ b/Ansible/ansible_collections/jfrog/platform/README.md @@ -142,11 +142,11 @@ The JFrog Platform Ansible Collection can be installed on the following operatin * Ubuntu LTS versions (20.04/22.04) * Centos/RHEL 8.x/9.x * Debian 10.x/11.x -* Amazon Linux 2 ## Note -From 10.17.x platform collection, Artifactory (7.77.x) is not supported on Ubuntu - 18.04, Centos/RHEL - 7.x +From 10.17.x platform collection, Artifactory (7.77.x) is not supported on Ubuntu - 18.04, Centos/RHEL - 7.x and Amazon Linux 2 + ## How to avoid IPv6 binding diff --git a/Ansible/ansible_collections/jfrog/platform/galaxy.yml b/Ansible/ansible_collections/jfrog/platform/galaxy.yml index 2836756c..1df3836b 100644 --- a/Ansible/ansible_collections/jfrog/platform/galaxy.yml +++ b/Ansible/ansible_collections/jfrog/platform/galaxy.yml @@ -9,7 +9,7 @@ namespace: "jfrog" name: "platform" # The version of the collection. Must be compatible with semantic versioning -version: "10.17.0" +version: "10.17.1" # The path to the Markdown (.md) readme file. This path is relative to the root of the collection readme: "README.md" diff --git a/Ansible/ansible_collections/jfrog/platform/roles/artifactory/defaults/main.yml b/Ansible/ansible_collections/jfrog/platform/roles/artifactory/defaults/main.yml index 2c0b68c2..4b899509 100644 --- a/Ansible/ansible_collections/jfrog/platform/roles/artifactory/defaults/main.yml +++ b/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.77.3 +artifactory_version: 7.77.6 # 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 diff --git a/Ansible/ansible_collections/jfrog/platform/roles/artifactory/tasks/upgrade.yml b/Ansible/ansible_collections/jfrog/platform/roles/artifactory/tasks/upgrade.yml index b1531fc0..e16881e0 100644 --- a/Ansible/ansible_collections/jfrog/platform/roles/artifactory/tasks/upgrade.yml +++ b/Ansible/ansible_collections/jfrog/platform/roles/artifactory/tasks/upgrade.yml @@ -57,15 +57,15 @@ state: directory - name: Check artifactory version - ansible.builtin.shell: | - set -o pipefail; - grep artifactory.product.version "{{ artifactory_home }}/app/artifactory.product.version.properties" |cut -d= -f2 - register: check_version_cmd + ansible.builtin.fetch: + src: "{{ artifactory_home }}/app/artifactory.product.version.properties" + dest: "/tmp/artifactory.product.version.properties" + flat: true changed_when: false - name: Set running_version ansible.builtin.set_fact: - running_version: "{{ check_version_cmd.stdout }}" + running_version: "{{ lookup('ansible.builtin.ini', 'artifactory.product.version', type='properties', file='/tmp/artifactory.product.version.properties') }}" - name: Delete artifactory app directory become: true diff --git a/Ansible/ansible_collections/jfrog/platform/roles/artifactory/vars/main.yml b/Ansible/ansible_collections/jfrog/platform/roles/artifactory/vars/main.yml index c2ee8775..f2b2b839 100644 --- a/Ansible/ansible_collections/jfrog/platform/roles/artifactory/vars/main.yml +++ b/Ansible/ansible_collections/jfrog/platform/roles/artifactory/vars/main.yml @@ -1,5 +1,5 @@ # platform collection version -platform_collection_version: 10.17.0 +platform_collection_version: 10.17.1 # indicates where this collection was downloaded from (galaxy, automation_hub, standalone) ansible_marketplace: galaxy diff --git a/Ansible/ansible_collections/jfrog/platform/roles/distribution/defaults/main.yml b/Ansible/ansible_collections/jfrog/platform/roles/distribution/defaults/main.yml index c1fe70ca..89ab4571 100644 --- a/Ansible/ansible_collections/jfrog/platform/roles/distribution/defaults/main.yml +++ b/Ansible/ansible_collections/jfrog/platform/roles/distribution/defaults/main.yml @@ -1,7 +1,7 @@ # defaults file for distribution # The version of distribution to install -distribution_version: 2.22.1 +distribution_version: 2.22.2 # whether to enable HA distribution_ha_enabled: false diff --git a/Ansible/ansible_collections/jfrog/platform/roles/distribution/vars/main.yml b/Ansible/ansible_collections/jfrog/platform/roles/distribution/vars/main.yml index bffa97bb..21da86ae 100644 --- a/Ansible/ansible_collections/jfrog/platform/roles/distribution/vars/main.yml +++ b/Ansible/ansible_collections/jfrog/platform/roles/distribution/vars/main.yml @@ -1,5 +1,5 @@ # platform collection version -platform_collection_version: 10.17.0 +platform_collection_version: 10.17.1 # indicates were this collection was downlaoded from (galaxy, automation_hub, standalone) ansible_marketplace: galaxy diff --git a/Ansible/ansible_collections/jfrog/platform/roles/insight/defaults/main.yml b/Ansible/ansible_collections/jfrog/platform/roles/insight/defaults/main.yml index 48f63cec..39e16002 100644 --- a/Ansible/ansible_collections/jfrog/platform/roles/insight/defaults/main.yml +++ b/Ansible/ansible_collections/jfrog/platform/roles/insight/defaults/main.yml @@ -1,7 +1,7 @@ # defaults file for insight # The version of insight to install -insight_version: 1.16.6 +insight_version: 1.16.7 # whether to enable HA insight_ha_enabled: false diff --git a/Ansible/ansible_collections/jfrog/platform/roles/insight/vars/main.yml b/Ansible/ansible_collections/jfrog/platform/roles/insight/vars/main.yml index bffa97bb..21da86ae 100644 --- a/Ansible/ansible_collections/jfrog/platform/roles/insight/vars/main.yml +++ b/Ansible/ansible_collections/jfrog/platform/roles/insight/vars/main.yml @@ -1,5 +1,5 @@ # platform collection version -platform_collection_version: 10.17.0 +platform_collection_version: 10.17.1 # indicates were this collection was downlaoded from (galaxy, automation_hub, standalone) ansible_marketplace: galaxy diff --git a/Ansible/ansible_collections/jfrog/platform/roles/xray/defaults/main.yml b/Ansible/ansible_collections/jfrog/platform/roles/xray/defaults/main.yml index 9bde1d61..37d8be38 100644 --- a/Ansible/ansible_collections/jfrog/platform/roles/xray/defaults/main.yml +++ b/Ansible/ansible_collections/jfrog/platform/roles/xray/defaults/main.yml @@ -1,7 +1,7 @@ # Defaults file for xray # The version of xray to install -xray_version: 3.87.9 +xray_version: 3.90.1 # Whether to enable HA xray_ha_enabled: false diff --git a/Ansible/ansible_collections/jfrog/platform/roles/xray/vars/main.yml b/Ansible/ansible_collections/jfrog/platform/roles/xray/vars/main.yml index bffa97bb..21da86ae 100644 --- a/Ansible/ansible_collections/jfrog/platform/roles/xray/vars/main.yml +++ b/Ansible/ansible_collections/jfrog/platform/roles/xray/vars/main.yml @@ -1,5 +1,5 @@ # platform collection version -platform_collection_version: 10.17.0 +platform_collection_version: 10.17.1 # indicates were this collection was downlaoded from (galaxy, automation_hub, standalone) ansible_marketplace: galaxy