From e0cb3cf1ff458e08c271299a160167e77b6406aa Mon Sep 17 00:00:00 2001 From: abakshi Date: Thu, 8 Feb 2024 03:22:17 +0530 Subject: [PATCH] collection failures --- .../content.yml | 11 +++- .../dispatch.yml | 38 ++++++------- .../ee.yml | 48 ++++++++--------- .../ee_image.yml | 53 ++++++++----------- .../{repo.yml => repo.yml.noop} | 0 5 files changed, 76 insertions(+), 74 deletions(-) rename dev/galaxy_collection_plays_integration_tests/{repo.yml => repo.yml.noop} (100%) diff --git a/dev/galaxy_collection_plays_integration_tests/content.yml b/dev/galaxy_collection_plays_integration_tests/content.yml index 46f8914f8b..81dcdde79e 100644 --- a/dev/galaxy_collection_plays_integration_tests/content.yml +++ b/dev/galaxy_collection_plays_integration_tests/content.yml @@ -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 }}" @@ -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 }}" diff --git a/dev/galaxy_collection_plays_integration_tests/dispatch.yml b/dev/galaxy_collection_plays_integration_tests/dispatch.yml index e69b2753bc..e75e42262d 100644 --- a/dev/galaxy_collection_plays_integration_tests/dispatch.yml +++ b/dev/galaxy_collection_plays_integration_tests/dispatch.yml @@ -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 \ No newline at end of file +--- +- 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 \ No newline at end of file diff --git a/dev/galaxy_collection_plays_integration_tests/ee.yml b/dev/galaxy_collection_plays_integration_tests/ee.yml index 840c4f7cc9..75bae3b1e5 100644 --- a/dev/galaxy_collection_plays_integration_tests/ee.yml +++ b/dev/galaxy_collection_plays_integration_tests/ee.yml @@ -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 diff --git a/dev/galaxy_collection_plays_integration_tests/ee_image.yml b/dev/galaxy_collection_plays_integration_tests/ee_image.yml index 2f863d582f..bd149a4f49 100644 --- a/dev/galaxy_collection_plays_integration_tests/ee_image.yml +++ b/dev/galaxy_collection_plays_integration_tests/ee_image.yml @@ -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: diff --git a/dev/galaxy_collection_plays_integration_tests/repo.yml b/dev/galaxy_collection_plays_integration_tests/repo.yml.noop similarity index 100% rename from dev/galaxy_collection_plays_integration_tests/repo.yml rename to dev/galaxy_collection_plays_integration_tests/repo.yml.noop