Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename Galaxy Collection #1834

Merged
merged 1 commit into from
Aug 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions .github/workflows/ci_automation_hub_collection.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
name: Automation Hub Collection CI
on:
name: Galaxy Collection CI
on:
pull_request:
branches:
- "*"
Expand All @@ -14,7 +14,7 @@ on:
workflow_dispatch:

jobs:
automation_hub_collection:
galaxy_collection:
runs-on: ubuntu-latest
steps:
- name: Checkout galaxy_ng
Expand All @@ -25,22 +25,22 @@ jobs:
with:
python-version: "3.10"

- name: Checkout the automation hub collection
- name: Checkout the galaxy collection
uses: actions/checkout@v3
with:
repository: ansible/automation_hub_collection
path: automation_hub_collection
repository: ansible/galaxy_collection
path: galaxy_collection

- name: Build and install the collection
working-directory: automation_hub_collection
working-directory: galaxy_collection
run: |
# The ansible.cfg defined in the collection repository might break the test. We want the same variables for installation and running.
rm -f ansible.cfg
rm -f galaxy.yml
mv .github/files/galaxy.yml.j2 .
ansible all -i localhost, -c local -m template -a "src=galaxy.yml.j2 dest=galaxy.yml" -e collection_namespace=ansible -e collection_name=automation_hub -e collection_version=1.0.0 -e collection_repo=https://github.com/ansible/automation_hub_collection
ansible all -i localhost, -c local -m template -a "src=galaxy.yml.j2 dest=galaxy.yml" -e collection_namespace=galaxy -e collection_name=galaxy -e collection_version=1.0.0 -e collection_repo=https://github.com/ansible/automation_hub_collection
ansible-galaxy collection build -vvv
ansible-galaxy collection install ansible-automation_hub-1.0.0.tar.gz -vvv
ansible-galaxy collection install galaxy-galaxy-1.0.0.tar.gz -vvv
- name: Spin up a standalone galaxy_ng installation
run: |
Expand All @@ -52,13 +52,13 @@ jobs:
python3 dev/common/poll.py
- name: Test the user playbook
run: ansible-playbook dev/ah_collection_plays/user.yml -vvv
run: ansible-playbook dev/galaxy_collection_plays/user.yml -vvv

- name: Test the content playbook
run: ansible-playbook dev/ah_collection_plays/content.yml -vvv
run: ansible-playbook dev/galaxy_collection_plays/content.yml -vvv

- name: Test the repo playbook
run: ansible-playbook dev/ah_collection_plays/repo.yml -vvv
run: ansible-playbook dev/galaxy_collection_plays/repo.yml -vvv

- name: Test the ee playbook
run: ansible-playbook dev/ah_collection_plays/ee.yml -vvv
run: ansible-playbook dev/galaxy_collection_plays/ee.yml -vvv
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
connection: local
gather_facts: false
collections:
- ansible.automation_hub
- galaxy.galaxy

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

tasks:
- name: Authenticate and retrieve API token
ah_token:
Expand Down Expand Up @@ -45,37 +45,37 @@
ah_token: "{{ ah_token }}"
ah_path_prefix: "{{ ah_path_prefix }}"

- name: Ensure there is an ansible namespace
- name: Ensure there is a galaxy namespace
ah_namespace:
name: ansible
name: galaxy
ah_host: "{{ ah_host }}"
ah_token: "{{ ah_token }}"
ah_path_prefix: "{{ ah_path_prefix }}"

- name: Upload the automation hub collection to the ansible namespace
- name: Upload the galaxy collection to the galaxy namespace
ah_collection:
namespace: ansible
name: automation_hub
namespace: galaxy
name: galaxy
path: "{{ ah_artifact_runner_absolute_path }}"
version: "1.0.0"
ah_host: "{{ ah_host }}"
ah_token: "{{ ah_token }}"
ah_path_prefix: "{{ ah_path_prefix }}"

- name: Approve the automation hub collection
- name: Approve the galaxy collection
ah_approval:
namespace: ansible
name: automation_hub
namespace: galaxy
name: galaxy
version: "1.0.0"
ah_host: "{{ ah_host }}"
ah_token: "{{ ah_token }}"
ah_path_prefix: "{{ ah_path_prefix }}"

- name: Delete the automation hub collection
- name: Delete the galaxy collection
ah_collection:
state: absent
namespace: ansible
name: automation_hub
namespace: galaxy
name: galaxy
version: "1.0.0"
ah_host: "{{ ah_host }}"
ah_token: "{{ ah_token }}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
connection: local
gather_facts: false
collections:
- ansible.automation_hub
- galaxy.galaxy

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

tasks:
- name: Add redhat.io registry
ah_ee_registry:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
connection: local
gather_facts: false
collections:
- ansible.automation_hub
- galaxy.galaxy

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

tasks:
- name: Authenticate and retrieve API token
ah_token:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
connection: local
gather_facts: false
collections:
- ansible.automation_hub
- galaxy.galaxy

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

tasks:
- name: Create a developers group
ah_group:
Expand Down Expand Up @@ -56,7 +56,7 @@
ah_path_prefix: "{{ ah_path_prefix }}"

# TODO: Add a test that permissions/roles can be added to a group after
# https://github.com/ansible/automation_hub_collection/issues/179 is resolved.
# https://github.com/ansible/galaxy_collection/issues/179 is resolved.

- name: Create new executive users
ah_user:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ ah_host: http://localhost:5001
ah_username: iqe_admin
ah_password: redhat
ah_path_prefix: automation-hub
ah_artifact_runner_absolute_path: /home/runner/work/galaxy_ng/galaxy_ng/automation_hub_collection/ansible-automation_hub-1.0.0.tar.gz
ah_artifact_runner_absolute_path: /home/runner/work/galaxy_ng/galaxy_ng/galaxy_collection/galaxy-galaxy-1.0.0.tar.gz
Loading