diff --git a/Ansible/README.md b/Ansible/README.md index 8151163..4527053 100644 --- a/Ansible/README.md +++ b/Ansible/README.md @@ -10,11 +10,11 @@ This Ansible directory consists of the following directories that support the JF ## 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 | +| collection_version | artifactory_version | xray_version | +|--------------------|---------------------|--------------| +| 1.0.7 | 7.6.1 | 3.5.2 | +| 1.0.6 | 7.5.0 | 3.3.0 | +| 1.0.6 | 7.4.3 | 3.3.0 | ## Getting Started diff --git a/Ansible/ansible_collections/jfrog/installers/galaxy.yml b/Ansible/ansible_collections/jfrog/installers/galaxy.yml index 4c7bdc6..45c190b 100644 --- a/Ansible/ansible_collections/jfrog/installers/galaxy.yml +++ b/Ansible/ansible_collections/jfrog/installers/galaxy.yml @@ -9,7 +9,7 @@ namespace: "jfrog" name: "installers" # The version of the collection. Must be compatible with semantic versioning -version: "1.0.6" +version: "1.0.7" # 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/installers/jfrog-installers-1.0.6.tar.gz b/Ansible/ansible_collections/jfrog/installers/jfrog-installers-1.0.6.tar.gz deleted file mode 100644 index 53a4413..0000000 Binary files a/Ansible/ansible_collections/jfrog/installers/jfrog-installers-1.0.6.tar.gz and /dev/null differ diff --git a/Ansible/ansible_collections/jfrog/installers/jfrog-installers-1.0.7.tar.gz b/Ansible/ansible_collections/jfrog/installers/jfrog-installers-1.0.7.tar.gz new file mode 100644 index 0000000..5c37244 Binary files /dev/null and b/Ansible/ansible_collections/jfrog/installers/jfrog-installers-1.0.7.tar.gz differ 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 9e64a78..e4f38fc 100644 --- a/Ansible/ansible_collections/jfrog/installers/roles/artifactory/defaults/main.yml +++ b/Ansible/ansible_collections/jfrog/installers/roles/artifactory/defaults/main.yml @@ -1,7 +1,7 @@ --- # defaults file for artifactory # indicates were this collection was downlaoded from (galaxy, automation_hub, standalone) -ansible_marketplace: standalone +ansible_marketplace: galaxy # The version of Artifactory to install artifactory_version: 7.6.1 diff --git a/Ansible/test/aws/playbook.yaml b/Ansible/test/aws/playbook.yaml index efcbea8..a859072 100644 --- a/Ansible/test/aws/playbook.yaml +++ b/Ansible/test/aws/playbook.yaml @@ -144,8 +144,8 @@ shell: cmd: ./gradlew clean unified_test chdir: ../tests/ -# - name: Cleanup and delete stack -# cloudformation: -# stack_name: "{{ lookup('env', 'stack_name') }}" -# region: "us-east-1" -# state: "absent" \ No newline at end of file + - name: Cleanup and delete stack + cloudformation: + stack_name: "{{ lookup('env', 'stack_name') }}" + region: "us-east-1" + state: "absent" \ No newline at end of file