Skip to content
This repository was archived by the owner on Nov 6, 2025. It is now read-only.

Commit dd09e0a

Browse files
authored
Adding new distros via a matrix workflow (#26)
* Adding new distros via a matrix workflow * Simplying distribution release name for debian distros * Adding dependencies needed by ubuntu 16.04 * Adding python-minimal for ubuntu 16 * Make sure python-apt exists on all debian systems * Make sure release_stability is always lowercase
1 parent 05cbcb0 commit dd09e0a

File tree

5 files changed

+28
-21
lines changed

5 files changed

+28
-21
lines changed

.github/workflows/ci.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,17 @@ on:
99
jobs:
1010
molecule:
1111
runs-on: ubuntu-latest
12+
13+
strategy:
14+
matrix:
15+
distros:
16+
- geerlingguy/docker-centos7-ansible:latest
17+
- geerlingguy/docker-centos8-ansible:latest
18+
- geerlingguy/docker-ubuntu2004-ansible:latest
19+
- geerlingguy/docker-ubuntu1804-ansible:latest
20+
- geerlingguy/docker-ubuntu1604-ansible:latest
21+
fail-fast: false
22+
1223
steps:
1324
- uses: actions/checkout@v2
1425
- name: Set up Python 3.x
@@ -32,6 +43,8 @@ jobs:
3243
3344
- name: Molecule
3445
run: echo "${{ secrets.VAULT_PASS }}" > /home/runner/work/_temp/.vault-ci-pass && ANSIBLE_VAULT_PASSWORD_FILE=/home/runner/work/_temp/.vault-ci-pass pipenv run molecule test
46+
env:
47+
MOLECULE_DISTRO: "${{ matrix.distros }}"
3548

3649
- name: Clean up
3750
if: always()

defaults/main.yml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,18 @@ repo_description: Tailscale repository
99
apt_dependencies:
1010
- gnupg2
1111
- gnupg-agent
12+
- apt-transport-https
13+
- python-apt
14+
- python3-apt
1215

13-
apt_deb: deb https://pkgs.tailscale.com/{{ release_stability }}/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} main
16+
apt_deb: deb https://pkgs.tailscale.com/{{ release_stability | lower }}/{{ ansible_distribution | lower }} {{ ansible_distribution_release | lower }} main
17+
18+
apt_signkey: https://pkgs.tailscale.com/{{ release_stability | lower }}/{{ ansible_distribution | lower }}/{{ ansible_distribution_release | lower }}.gpg
1419

1520
yum_dependencies:
1621
- yum-utils
1722
- gnupg2
1823

19-
apt_distros:
20-
Ubuntu18: bionic
21-
Debian10: buster
22-
23-
apt_signkey: https://pkgs.tailscale.com/{{ release_stability }}/{{ ansible_distribution | lower }}/{{ apt_distros[ansible_distribution + ansible_distribution_major_version] }}.gpg
24-
2524
yum_repos:
26-
Amazon: https://pkgs.tailscale.com/{{ release_stability }}/amazon-linux/{{ ansible_distribution_major_version }}/tailscale.repo
27-
CentOS: https://pkgs.tailscale.com/{{ release_stability }}/centos/{{ ansible_distribution_major_version }}/tailscale.repo
25+
Amazon: https://pkgs.tailscale.com/{{ release_stability | lower }}/amazon-linux/{{ ansible_distribution_major_version }}/tailscale.repo
26+
CentOS: https://pkgs.tailscale.com/{{ release_stability | lower }}/centos/{{ ansible_distribution_major_version }}/tailscale.repo

meta/main.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,13 @@ galaxy_info:
1010
platforms:
1111
- name: Ubuntu
1212
versions:
13+
- eoan
1314
- bionic
15+
- xenial
1416
- name: EL
1517
versions:
1618
- 7
19+
- 8
1720

1821
galaxy_tags:
1922
- tailscale

molecule/default/molecule.yml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,8 @@ lint: |
88
yamllint .
99
ansible-lint
1010
platforms:
11-
- name: centos
12-
image: geerlingguy/docker-centos7-ansible:latest
13-
# Needed for systemd
14-
command: ${MOLECULE_DOCKER_COMMAND:-""}
15-
volumes:
16-
- /sys/fs/cgroup:/sys/fs/cgroup:ro
17-
privileged: true
18-
pre_build_image: true
19-
- name: ubuntu
20-
image: geerlingguy/docker-ubuntu1804-ansible:latest
11+
- name: instance
12+
image: ${MOLECULE_DISTRO:-geerlingguy/docker-centos7-ansible:latest}
2113
# Needed for systemd
2214
command: ${MOLECULE_DOCKER_COMMAND:-""}
2315
volumes:

tasks/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
- name: Unstable Warning
88
# Print an error message to the console but proceed anyway
99
fail:
10-
msg: Installing Tailscale from the unstable branch. Stability is not guaranteed. Be warned.
11-
when: release_stability == 'unstable'
10+
msg: Installing Tailscale from the unstable branch. This is bleeding edge and may have issues. Be warned.
11+
when: release_stability | lower == 'unstable'
1212
ignore_errors: yes
1313

1414
- name: Operating System

0 commit comments

Comments
 (0)