From 35ed3bc42242588d40328d2070566c52e71f3099 Mon Sep 17 00:00:00 2001 From: Bruno Rocha Date: Tue, 8 Aug 2023 18:57:35 +0100 Subject: [PATCH] Rename Galaxy Collection No-Issue --- .../ci_automation_hub_collection.yml | 26 +++++++++---------- .../content.yml | 26 +++++++++---------- .../ee.yml | 4 +-- .../repo.yml | 4 +-- .../user.yml | 6 ++--- .../vars.yml | 2 +- 6 files changed, 34 insertions(+), 34 deletions(-) rename dev/{ah_collection_plays => galaxy_collection_plays}/content.yml (82%) rename dev/{ah_collection_plays => galaxy_collection_plays}/ee.yml (98%) rename dev/{ah_collection_plays => galaxy_collection_plays}/repo.yml (97%) rename dev/{ah_collection_plays => galaxy_collection_plays}/user.yml (96%) rename dev/{ah_collection_plays => galaxy_collection_plays}/vars.yml (70%) diff --git a/.github/workflows/ci_automation_hub_collection.yml b/.github/workflows/ci_automation_hub_collection.yml index f279292a19..bf76b90e9e 100644 --- a/.github/workflows/ci_automation_hub_collection.yml +++ b/.github/workflows/ci_automation_hub_collection.yml @@ -1,6 +1,6 @@ --- -name: Automation Hub Collection CI -on: +name: Galaxy Collection CI +on: pull_request: branches: - "*" @@ -14,7 +14,7 @@ on: workflow_dispatch: jobs: - automation_hub_collection: + galaxy_collection: runs-on: ubuntu-latest steps: - name: Checkout galaxy_ng @@ -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: | @@ -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 diff --git a/dev/ah_collection_plays/content.yml b/dev/galaxy_collection_plays/content.yml similarity index 82% rename from dev/ah_collection_plays/content.yml rename to dev/galaxy_collection_plays/content.yml index 8d4f7a7727..cf25965eb1 100644 --- a/dev/ah_collection_plays/content.yml +++ b/dev/galaxy_collection_plays/content.yml @@ -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: @@ -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 }}" diff --git a/dev/ah_collection_plays/ee.yml b/dev/galaxy_collection_plays/ee.yml similarity index 98% rename from dev/ah_collection_plays/ee.yml rename to dev/galaxy_collection_plays/ee.yml index bfe218389d..2c10d0279a 100644 --- a/dev/ah_collection_plays/ee.yml +++ b/dev/galaxy_collection_plays/ee.yml @@ -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: diff --git a/dev/ah_collection_plays/repo.yml b/dev/galaxy_collection_plays/repo.yml similarity index 97% rename from dev/ah_collection_plays/repo.yml rename to dev/galaxy_collection_plays/repo.yml index 8273279624..0768b37f70 100644 --- a/dev/ah_collection_plays/repo.yml +++ b/dev/galaxy_collection_plays/repo.yml @@ -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: diff --git a/dev/ah_collection_plays/user.yml b/dev/galaxy_collection_plays/user.yml similarity index 96% rename from dev/ah_collection_plays/user.yml rename to dev/galaxy_collection_plays/user.yml index 0549cbaa1a..10d1748d99 100644 --- a/dev/ah_collection_plays/user.yml +++ b/dev/galaxy_collection_plays/user.yml @@ -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: @@ -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: diff --git a/dev/ah_collection_plays/vars.yml b/dev/galaxy_collection_plays/vars.yml similarity index 70% rename from dev/ah_collection_plays/vars.yml rename to dev/galaxy_collection_plays/vars.yml index 3f11129e14..52727ed057 100644 --- a/dev/ah_collection_plays/vars.yml +++ b/dev/galaxy_collection_plays/vars.yml @@ -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