Exorcise merge gremlins

* Fix upstream repository references

* Only run Galaxy push when creds are defined

* Molecule Tests
  * Copy init playbook from local project
  * Remove unused files

Author: syndr

.github/workflows/build.yml

@@ -37,7 +37,7 @@ jobs:
       - name: Build and install collection
         run: |
           ansible-galaxy collection build --force
-          ansible-galaxy collection install --force syndr-molecule-*.tar.gz
+          ansible-galaxy collection install --force *-molecule-*.tar.gz
 
       - name: Log into AWS
         if: ${{ matrix.molecule-scenario == 'ec2_platform' }}

.github/workflows/publish.yml

@@ -24,6 +24,7 @@ jobs:
 
       - name: Build and Deploy Collection
         uses: artis3n/ansible_galaxy_collection@v2
+        if: ${{ secrets.GALAXY_API_KEY != '' }}
         with:
           api_key: '${{ secrets.GALAXY_API_KEY }}'
 

molecule/ec2_platform/converge.yml

@@ -13,7 +13,7 @@ platforms:
     region: us-west-2
     vpc_id: vpc-07bd460b98a3fb162
     vpc_subnet_id: subnet-0725b4ef4d069f1bf
-    instance_type: t3.micro
+    instance_type: t3.small
     ssh_user: molecule_runner
     hostvars:
       test_hostvar: test

molecule/ec2_platform/molecule.yml

@@ -54,7 +54,6 @@
     - name: Run the init role
       vars:
         test_dir: /tmp/molecule-init
-        test_init_wget_path: "https://raw.githubusercontent.com/syndr/ansible-collection-molecule/main/roles/init/files/init.yml"
         test_collection_dir: "{{ test_dir }}/ci_testing/test_collection"
         test_role_dir: "{{ test_dir }}/ci_testing/test_collection"
       block:
@@ -77,17 +76,18 @@
                 state: directory
 
             - name: Molecule init playbook exists for collection
-              ansible.builtin.command:
-                chdir: "{{ test_collection_dir }}"
-                cmd: wget -P molecule/default {{ test_init_wget_path }}
-                creates: "{{ test_collection_dir }}/molecule/default/init.yml"
+              ansible.builtin.copy:
+                src: "{{ playbook_dir }}/../../roles/init/files/init.yml"
+                dest: "{{ test_collection_dir }}/molecule/default/init.yml"
+                mode: "0644"
 
             - name: Run init playbook on collection
               # TODO: Actually check idempotence on this
+              tags:
+                - molecule-idempotence-notest
               ansible.builtin.command:
                 chdir: "{{ test_collection_dir }}"
                 cmd: ansible-playbook molecule/default/init.yml
-              changed_when: false
 
         - name: Test with a role
           block:
@@ -103,17 +103,18 @@
                 state: directory
 
             - name: Molecule init playbook exists for role
-              ansible.builtin.command:
-                chdir: "{{ test_role_dir }}"
-                cmd: wget -P molecule/default {{ test_init_wget_path }}
-                creates: "{{ test_role_dir }}/molecule/default/init.yml"
+              ansible.builtin.copy:
+                src: "{{ playbook_dir }}/../../roles/init/files/init.yml"
+                dest: "{{ test_role_dir }}/molecule/default/init.yml"
+                mode: "0644"
 
             - name: Run init playbook on role
               # TODO: Actually check idempotence on this
+              tags:
+                - molecule-idempotence-notest
               ansible.builtin.command:
                 chdir: "{{ test_role_dir }}"
                 cmd: ansible-playbook molecule/default/init.yml
-              changed_when: false
 
         - name: Test with a monolith
           block:

molecule/ec2_platform/prepare.yml

@@ -131,15 +131,13 @@
               ansible.builtin.apt:
                 pkg:
                   - ansible
-                  - wget
                   - acl
           when: ansible_distribution | lower == 'ubuntu'
 
         - name: Install packages (RHEL Family)
           ansible.builtin.package:
             name:
               - ansible-core
-              - wget
           when: ansible_distribution_file_variety | lower == 'redhat'
 
     - name: Verify application availibility
@@ -148,7 +146,6 @@
       changed_when: false
       loop:
         - ansible-playbook --version
-        - wget --version
 
     - name: Add the working version of this project to test host
       become: true