diff --git a/Ansible/README.md b/Ansible/README.md index 591c237..8151163 100644 --- a/Ansible/README.md +++ b/Ansible/README.md @@ -7,6 +7,15 @@ This Ansible directory consists of the following directories that support the JF * [infra directory](infra) - This directory contains example infrastructure templates that can be used for testing and as example deployments. * [test directory](test) - This directory contains Gradle tests that can be used to verify a deployment. It also has Ansible playbooks for creating infrastructure, provisioning software and testing with Gradle. + ## Tested Artifactory and Xray Versions + The following versions of Artifactory and Xray have been validated with this collection. Other versions and combinations may also work. + + | artifactory_version | xray_version | + |---------------------|--------------| + | 7.6.1 | 3.5.2 | + | 7.5.0 | 3.3.0 | + | 7.4.3 | 3.3.0 | + ## Getting Started 1. Install this collection from Ansible Galaxy. This collection is also available in RedHat Automation Hub. diff --git a/Ansible/ansible_collections/jfrog/installers/roles/artifactory/defaults/main.yml b/Ansible/ansible_collections/jfrog/installers/roles/artifactory/defaults/main.yml index 4520463..9e64a78 100644 --- a/Ansible/ansible_collections/jfrog/installers/roles/artifactory/defaults/main.yml +++ b/Ansible/ansible_collections/jfrog/installers/roles/artifactory/defaults/main.yml @@ -4,7 +4,7 @@ ansible_marketplace: standalone # The version of Artifactory to install -artifactory_version: 7.4.1 +artifactory_version: 7.6.1 # licenses file - specify a licenses file or specify up to 5 licenses artifactory_license1: diff --git a/Ansible/ansible_collections/jfrog/installers/roles/xray/defaults/main.yml b/Ansible/ansible_collections/jfrog/installers/roles/xray/defaults/main.yml index b8aad42..3cdffa3 100644 --- a/Ansible/ansible_collections/jfrog/installers/roles/xray/defaults/main.yml +++ b/Ansible/ansible_collections/jfrog/installers/roles/xray/defaults/main.yml @@ -4,7 +4,7 @@ ansible_marketplace: standalone # The version of xray to install -xray_version: 3.3.0 +xray_version: 3.5.2 # whether to enable HA xray_ha_enabled: true diff --git a/Ansible/pipelines.yaml b/Ansible/pipelines.yaml index 3a3ce38..9f7a18f 100644 --- a/Ansible/pipelines.yaml +++ b/Ansible/pipelines.yaml @@ -34,12 +34,6 @@ pipelines: - sudo apt -y --allow-unauthenticated install ansible - sudo pip install packaging - sudo pip install boto3 botocore - - pwd - - ls - - ls workspace - - ls dependencyState - - ls dependencyState/resources - - ls dependencyState/resources/ansibleRepo - cd dependencyState/resources/ansibleRepo - echo 'Setting environment variables...' - export artifactory_version="$int_ansibleEnvVars_artifactory_version" @@ -90,12 +84,6 @@ pipelines: - sudo pip install packaging - sudo pip install msrestazure - sudo pip install ansible[azure] - - pwd - - ls - - ls workspace - - ls dependencyState - - ls dependencyState/resources - - ls dependencyState/resources/ansibleRepo - cd dependencyState/resources/ansibleRepo - echo 'Setting environment variables...' - export artifactory_version="$int_ansibleEnvVars_artifactory_version"