Rename Galaxy Collection

No-Issue
ansible · Aug 8, 2023 · d46b9b7 · d46b9b7
1 parent 3779fd0
commit d46b9b7
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 33 deletions.
diff --git 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 → dev/galaxy_collection_plays/content.yml b/dev/ah_collection_plays/content.yml → 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 → dev/galaxy_collection_plays/ee.yml b/dev/ah_collection_plays/ee.yml → 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 → dev/galaxy_collection_plays/repo.yml b/dev/ah_collection_plays/repo.yml → 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 → dev/galaxy_collection_plays/user.yml b/dev/ah_collection_plays/user.yml → 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 → dev/galaxy_collection_plays/vars.yml b/dev/ah_collection_plays/vars.yml → dev/galaxy_collection_plays/vars.yml