diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index ba2b0d3..b16625c 100644 --- 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 index da4cc41..8969cf2 100644 --- 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 index c8cad66..3d9afd0 100644 --- 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 index 4f4a3d2..95b8028 100644 --- 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 index f7ab701..34bc208 100644 --- 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 index 83d0a01..9f445e3 100644 --- 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 index 34346ac..dd95a09 100644 --- 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 index 491ba0b..6023cee 100644 --- 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 index 4761921..27e6ef6 100644 --- 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 index 7ec77f8..7b4a5fa 100644 --- 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 index da4cc41..8969cf2 100644 --- 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 index 0c201a1..0bc8c2f 100644 --- 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 index 9a6a8ca..d0e10ec 100644 --- 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 }}"