Merge pull request #210 from lewismiddleton/parameterise-tests

feat(ci): parameterise out github account
MonolithProjects · May 24, 2024 · b95b43c · b95b43c
2 parents b33b8e0 + ef5aee2
commit b95b43c
Show file tree

Hide file tree

Showing 13 changed files with 25 additions and 21 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -63,6 +63,8 @@ jobs:
           MOLECULE_DOCKER_CGROUPS_MODE: ${{ matrix.config.cgroup_mode }}
           MOLECULE_DOCKER_VOLUMES: ${{ matrix.config.volumes }}
           PERSONAL_ACCESS_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
+          GITHUB_ACCOUNT: monolithprojects-testorg
+          GITHUB_REPO: ansible-github_actions_runner-testrepo
 
   org:
     name: Test Org Runner
@@ -104,3 +106,5 @@ jobs:
           MOLECULE_DOCKER_CGROUPS_MODE: ${{ matrix.config.cgroup_mode }}
           MOLECULE_DOCKER_VOLUMES: ${{ matrix.config.volumes }}
           PERSONAL_ACCESS_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
+          GITHUB_ACCOUNT: monolithprojects-testorg
+          GITHUB_REPO: ansible-github_actions_runner-testrepo
diff --git a/molecule/custom_env/cleanup.yml b/molecule/custom_env/cleanup.yml
@@ -5,8 +5,8 @@
   become: yes
   vars:
     runner_user: ansible
-    github_repo: ansible-github_actions_runner-testrepo
-    github_account: monolithprojects-testorg
+    github_repo: "{{ lookup('env', 'GITHUB_REPO') }}"
+    github_account: "{{ lookup('env', 'GITHUB_ACCOUNT') }}"
     runner_state: absent
   roles:
     - monolithprojects.github_actions_runner
diff --git a/molecule/custom_env/converge.yml b/molecule/custom_env/converge.yml
@@ -6,8 +6,8 @@
   become: yes
   vars:
     runner_user: ansible
-    github_repo: ansible-github_actions_runner-testrepo
-    github_account: monolithprojects-testorg
+    github_repo: "{{ lookup('env', 'GITHUB_REPO') }}"
+    github_account: "{{ lookup('env', 'GITHUB_ACCOUNT') }}"
     runner_version: "latest"
     runner_labels:
         - label1

diff --git a/molecule/custom_env/verify.yml b/molecule/custom_env/verify.yml
@@ -6,8 +6,8 @@
   become: yes
   vars:
     runner_user: ansible
-    github_repo: ansible-github_actions_runner-testrepo
-    github_account: monolithprojects-testorg
+    github_repo: "{{ lookup('env', 'GITHUB_REPO') }}"
+    github_account: "{{ lookup('env', 'GITHUB_ACCOUNT') }}"
     github_api_url: "https://api.github.com"
     access_token: "{{ lookup('env', 'PERSONAL_ACCESS_TOKEN') }}"
     runner_name: ubuntu16-latest

diff --git a/molecule/default/cleanup.yml b/molecule/default/cleanup.yml
@@ -5,8 +5,8 @@
   become: yes
   vars:
     runner_user: ansible
-    github_repo: ansible-github_actions_runner-testrepo
-    github_account: monolithprojects-testorg
+    github_repo: "{{ lookup('env', 'GITHUB_REPO') }}"
+    github_account: "{{ lookup('env', 'GITHUB_ACCOUNT') }}"
     runner_state: absent
     runner_name: test_name
   roles:

diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml
@@ -6,8 +6,8 @@
   become: yes
   vars:
     runner_user: ansible
-    github_repo: ansible-github_actions_runner-testrepo
-    github_account: monolithprojects-testorg
+    github_repo: "{{ lookup('env', 'GITHUB_REPO') }}"
+    github_account: "{{ lookup('env', 'GITHUB_ACCOUNT') }}"
     runner_version: "latest"
     runner_name: test_name
     runner_on_ghes: yes

diff --git a/molecule/default/verify.yml b/molecule/default/verify.yml
@@ -6,8 +6,8 @@
   become: yes
   vars:
     runner_user: ansible
-    github_repo: ansible-github_actions_runner-testrepo
-    github_account: monolithprojects-testorg
+    github_repo: "{{ lookup('env', 'GITHUB_REPO') }}"
+    github_account: "{{ lookup('env', 'GITHUB_ACCOUNT') }}"
     github_api_url: "https://api.github.com"
     access_token: "{{ lookup('env', 'PERSONAL_ACCESS_TOKEN') }}"
     runner_name: ubuntu16-latest

diff --git a/molecule/org/cleanup.yml b/molecule/org/cleanup.yml
@@ -5,7 +5,7 @@
   become: yes
   vars:
     runner_user: ansible
-    github_account: monolithprojects-testorg
+    github_account: "{{ lookup('env', 'GITHUB_ACCOUNT') }}"
     runner_org: yes
     runner_state: absent
   roles:

diff --git a/molecule/org/converge.yml b/molecule/org/converge.yml
@@ -5,7 +5,7 @@
   become: yes
   vars:
     runner_user: ansible
-    github_account: monolithprojects-testorg
+    github_account: "{{ lookup('env', 'GITHUB_ACCOUNT') }}"
     runner_org: yes
     runner_state: "stopped"
     runner_version: "2.303.0"

diff --git a/molecule/org/verify.yml b/molecule/org/verify.yml
@@ -6,7 +6,7 @@
   become: yes
   vars:
     runner_user: ansible
-    github_account: monolithprojects-testorg
+    github_account: "{{ lookup('env', 'GITHUB_ACCOUNT') }}"
     runner_org: yes
     github_api_url: "https://api.github.com"
     access_token: "{{ lookup('env', 'PERSONAL_ACCESS_TOKEN') }}"

diff --git a/molecule/repo/cleanup.yml b/molecule/repo/cleanup.yml
@@ -5,8 +5,8 @@
   become: yes
   vars:
     runner_user: ansible
-    github_repo: ansible-github_actions_runner-testrepo
-    github_account: monolithprojects-testorg
+    github_repo: "{{ lookup('env', 'GITHUB_REPO') }}"
+    github_account: "{{ lookup('env', 'GITHUB_ACCOUNT') }}"
     runner_state: absent
   roles:
     - monolithprojects.github_actions_runner
diff --git a/molecule/repo/converge.yml b/molecule/repo/converge.yml
@@ -6,8 +6,8 @@
   become: yes
   vars:
     runner_user: ansible
-    github_repo: ansible-github_actions_runner-testrepo
-    github_account: monolithprojects-testorg
+    github_repo: "{{ lookup('env', 'GITHUB_REPO') }}"
+    github_account: "{{ lookup('env', 'GITHUB_ACCOUNT') }}"
     runner_version: "latest"
     runner_labels:
         - label1

diff --git a/molecule/repo/verify.yml b/molecule/repo/verify.yml
@@ -6,8 +6,8 @@
   become: yes
   vars:
     runner_user: ansible
-    github_repo: ansible-github_actions_runner-testrepo
-    github_account: monolithprojects-testorg
+    github_repo: "{{ lookup('env', 'GITHUB_REPO') }}"
+    github_account: "{{ lookup('env', 'GITHUB_ACCOUNT') }}"
     github_api_url: "https://api.github.com"
     access_token: "{{ lookup('env', 'PERSONAL_ACCESS_TOKEN') }}"
     runner_name: "{{ ansible_facts.hostname }}"