Skip to content

Commit

Permalink
collection failures
Browse files Browse the repository at this point in the history
  • Loading branch information
appuk committed Feb 9, 2024
1 parent 978b399 commit e0cb3cf
Show file tree
Hide file tree
Showing 5 changed files with 76 additions and 74 deletions.
11 changes: 10 additions & 1 deletion dev/galaxy_collection_plays_integration_tests/content.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,15 @@
ah_path_prefix: "{{ ah_path_prefix }}"
validate_certs: false

- name: Ensure there is a infra namespace
ah_namespace:
name: infra
ah_host: "{{ ah_host }}"
ah_username: "{{ ah_username }}"
ah_password: "{{ ah_password }}"
ah_path_prefix: "{{ ah_path_prefix }}"
validate_certs: false

- name: Creates directory
ansible.builtin.file:
path: "{{ ah_configuration_working_dir }}"
Expand All @@ -78,11 +87,11 @@
validate_certs: false

- name: Approve the galaxy collection
timeout: 60
ah_approval:
namespace: infra
name: controller_configuration
version: "2.4.0"
request_timeout: 60
ah_host: "{{ ah_host }}"
ah_username: "{{ ah_username }}"
ah_password: "{{ ah_password }}"
Expand Down
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
48 changes: 24 additions & 24 deletions dev/galaxy_collection_plays_integration_tests/ee.yml
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
#---
#- 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: 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
Expand Down
53 changes: 23 additions & 30 deletions dev/galaxy_collection_plays_integration_tests/ee_image.yml
Original file line number Diff line number Diff line change
@@ -1,33 +1,26 @@
#---
#- name: Collection tests - EE Image
# hosts: localhost
# connection: local
# become: false
# gather_facts: false
# ignore_errors: true
# collections:
# - galaxy.galaxy
# vars:
# repository: test-namespace/ee-minimal-rhel8
# tag: latest
# fake_image: quay.io/ansible/http-test-container:2.0.0
# pre_tasks:
# - name: Include variables
# ansible.builtin.include_vars:
# file: vars/vars.yml
#
# tasks:
# # Preparing an image:
# # - Pulling a small image from Quay (does not matter what image it is)
# # - Tagging it so that it can be pushed to private automation hub
# # - Pushing the image
# # - Deleting the images from the local system
# # The tasks do not use the podman collection because it may not be
# # available on the testing system.
# - name: Ensure a small container image is available
# ansible.builtin.command:
# cmd: "podman pull {{ fake_image }}"
# changed_when: true
---
- name: Collection tests - EE Image
hosts: localhost
connection: local
become: false
gather_facts: false
ignore_errors: true
collections:
- galaxy.galaxy
vars:
repository: test-namespace/ee-minimal-rhel8
tag: latest
fake_image: quay.io/ansible/http-test-container:2.0.0
pre_tasks:
- name: Include variables
ansible.builtin.include_vars:
file: vars/vars.yml

tasks:
- name: Ensure a small container image is available
ansible.builtin.command:
cmd: "podman pull {{ fake_image }}"
changed_when: true
#
# - name: Ensure the image has the correct tag
# ansible.builtin.command:
Expand Down

0 comments on commit e0cb3cf

Please sign in to comment.