Skip to content

Commit

Permalink
final prettification
Browse files Browse the repository at this point in the history
  • Loading branch information
appuk committed Feb 7, 2024
1 parent 1f2c0e6 commit 978b399
Show file tree
Hide file tree
Showing 9 changed files with 274 additions and 226 deletions.
6 changes: 0 additions & 6 deletions dev/galaxy_collection_plays_integration_tests/ansible.cfg

This file was deleted.

9 changes: 9 additions & 0 deletions dev/galaxy_collection_plays_integration_tests/content.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
ah_host: "{{ ah_host }}"
ah_username: "{{ ah_username }}"
ah_password: "{{ ah_password }}"
validate_certs: false

- name: Rename automate namespace to automator
ah_namespace:
Expand All @@ -35,6 +36,7 @@
ah_username: "{{ ah_username }}"
ah_password: "{{ ah_password }}"
ah_path_prefix: "{{ ah_path_prefix }}"
validate_certs: false

- name: Delete the automator namespace
ah_namespace:
Expand All @@ -44,6 +46,7 @@
ah_username: "{{ ah_username }}"
ah_password: "{{ ah_password }}"
ah_path_prefix: "{{ ah_path_prefix }}"
validate_certs: false

- name: Ensure there is a galaxy namespace
ah_namespace:
Expand All @@ -52,6 +55,7 @@
ah_username: "{{ ah_username }}"
ah_password: "{{ ah_password }}"
ah_path_prefix: "{{ ah_path_prefix }}"
validate_certs: false

- name: Creates directory
ansible.builtin.file:
Expand All @@ -71,6 +75,7 @@
ah_host: "{{ ah_host }}"
ah_username: "{{ ah_username }}"
ah_password: "{{ ah_password }}"
validate_certs: false

- name: Approve the galaxy collection
ah_approval:
Expand All @@ -81,6 +86,7 @@
ah_host: "{{ ah_host }}"
ah_username: "{{ ah_username }}"
ah_password: "{{ ah_password }}"
validate_certs: false

- name: Delete the galaxy collection
ah_collection:
Expand All @@ -91,6 +97,7 @@
ah_host: "{{ ah_host }}"
ah_username: "{{ ah_username }}"
ah_password: "{{ ah_password }}"
validate_certs: false

# - name: Publish Collections
# ansible.builtin.include_role:
Expand All @@ -100,3 +107,5 @@
# - collection_name: cisco.iosxr
# git_url: https://github.com/ansible-collections/cisco.iosxr
# ah_auto_approve: true
# validate_certs: false

38 changes: 19 additions & 19 deletions dev/galaxy_collection_plays_integration_tests/dispatch.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
---
- name: Collection tests - Dispatch role
hosts: localhost
connection: local
gather_facts: false
ignore_errors: true
collections:
- galaxy.galaxy

pre_tasks:
- name: Include variables
ansible.builtin.include_vars:
file: vars/vars.yml

- name: Include dispatch vars
ansible.builtin.include_vars:
file: vars/dispatch_vars.yml
roles:
- galaxy.galaxy.dispatch
#---
#- name: Collection tests - Dispatch role
# hosts: localhost
# connection: local
# gather_facts: false
# ignore_errors: true
# collections:
# - galaxy.galaxy
#
# pre_tasks:
# - name: Include variables
# ansible.builtin.include_vars:
# file: vars/vars.yml
#
# - name: Include dispatch vars
# ansible.builtin.include_vars:
# file: vars/dispatch_vars.yml
# roles:
# - galaxy.galaxy.dispatch
87 changes: 45 additions & 42 deletions dev/galaxy_collection_plays_integration_tests/ee.yml
Original file line number Diff line number Diff line change
@@ -1,38 +1,40 @@
---
- name: Collection tests - EE
hosts: localhost
connection: local
gather_facts: false
ignore_errors: true
collections:
- galaxy.galaxy

pre_tasks:
- name: Include variables
ansible.builtin.include_vars:
file: vars.yml

tasks:
- name: Add redhat.io registry
ah_ee_registry:
name: redhat
url: https://registry.redhat.io
ah_host: "{{ ah_host }}"
ah_username: "{{ ah_username }}"
ah_password: "{{ ah_password }}"

- name: create a repo
ah_ee_repository:
name: ansible-automation-platform-19/ee-29-rhel8
description: AAP RHEL execution environment
registry: redhat
upstream_name: redhat
readme: |
# RHEL execution environment
* Contains ansible
ah_host: "{{ ah_host }}"
ah_username: "{{ ah_username }}"
ah_password: "{{ ah_password }}"
#---
#- name: Collection tests - EE
# hosts: localhost
# connection: local
# gather_facts: false
# ignore_errors: true
# collections:
# - galaxy.galaxy
#
# pre_tasks:
# - name: Include variables
# ansible.builtin.include_vars:
# file: vars.yml
#
# tasks:
# - name: Add redhat.io registry
# ah_ee_registry:
# name: redhat
# url: https://registry.redhat.io
# ah_host: "{{ ah_host }}"
# ah_username: "{{ ah_username }}"
# ah_password: "{{ ah_password }}"
# validate_certs: false
#
# - name: create a repo
# ah_ee_repository:
# name: ansible-automation-platform-19/ee-29-rhel8
# description: AAP RHEL execution environment
# registry: redhat
# upstream_name: redhat
# readme: |
# # RHEL execution environment
# * Contains ansible
# ah_host: "{{ ah_host }}"
# ah_username: "{{ ah_username }}"
# ah_password: "{{ ah_password }}"
# validate_certs: false

# - name: Index redhat.io registry
# ah_ee_registry_index:
Expand Down Expand Up @@ -61,11 +63,12 @@
# ah_username: "{{ ah_username }}"
# ah_password: "{{ ah_password }}"

- name: Delete the redhat.io registry
ah_ee_registry:
name: redhat
state: absent
ah_host: "{{ ah_host }}"
ah_username: "{{ ah_username }}"
ah_password: "{{ ah_password }}"
# - name: Delete the redhat.io registry
# ah_ee_registry:
# name: redhat
# state: absent
# ah_host: "{{ ah_host }}"
# ah_username: "{{ ah_username }}"
# ah_password: "{{ ah_password }}"
# validate_certs: false

Loading

0 comments on commit 978b399

Please sign in to comment.