From 127c5d779b1e2b9beb7322a2d03a027c50e5c6d7 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 12 Oct 2020 09:29:41 +0100 Subject: [PATCH] feat: add Gentoo support * Semi-automated using https://github.com/myii/ssf-formula/pull/269 --- .travis.yml | 4 ++++ kitchen.yml | 18 ++++++++++++++++++ test/integration/v201902-py2/inspec.yml | 1 + test/integration/v201902-py3/inspec.yml | 1 + test/integration/v3000-py2/inspec.yml | 1 + test/integration/v3000-py3/inspec.yml | 1 + test/integration/v3001-py3/inspec.yml | 1 + test/salt/pillar/salt.sls | 4 ++++ 8 files changed, 31 insertions(+) diff --git a/.travis.yml b/.travis.yml index eb7e195..6eacb04 100644 --- a/.travis.yml +++ b/.travis.yml @@ -84,6 +84,8 @@ jobs: # - env: INSTANCE=v3001-py3-amazonlinux-2-3001-py3 - env: INSTANCE=v3001-py3-oraclelinux-8-3001-py3 # - env: INSTANCE=v3001-py3-oraclelinux-7-3001-py3 + - env: INSTANCE=v3001-py3-gentoo-stage3-latest-3001-py3 + - env: INSTANCE=v3001-py3-gentoo-stage3-systemd-3001-py3 # - env: INSTANCE=v3000-py3-debian-10-3000-3-py3 # - env: INSTANCE=v3000-py3-debian-9-3000-3-py3 # - env: INSTANCE=v3000-py3-ubuntu-1804-3000-3-py3 @@ -96,6 +98,8 @@ jobs: - env: INSTANCE=v3000-py3-oraclelinux-7-3000-3-py3 - env: INSTANCE=v3000-py2-ubuntu-1804-3000-3-py2 # - env: INSTANCE=v3000-py2-ubuntu-1604-3000-3-py2 + # - env: INSTANCE=v3000-py3-gentoo-stage3-latest-3000-3-py3 + # - env: INSTANCE=v3000-py3-gentoo-stage3-systemd-3000-3-py3 # - env: INSTANCE=v201902-py3-debian-10-2019-2-py3 - env: INSTANCE=v201902-py3-debian-9-2019-2-py3 # - env: INSTANCE=v201902-py3-ubuntu-1804-2019-2-py3 diff --git a/kitchen.yml b/kitchen.yml index 2590626..46a99ce 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -53,6 +53,13 @@ platforms: - name: oraclelinux-7-3001-py3 driver: image: saltimages/salt-3001-py3:oraclelinux-7 + - name: gentoo-stage3-latest-3001-py3 + driver: + image: saltimages/salt-3001-py3:gentoo-stage3-latest + run_command: /sbin/init + - name: gentoo-stage3-systemd-3001-py3 + driver: + image: saltimages/salt-3001-py3:gentoo-stage3-systemd ## SALT `3000.3` - name: debian-10-3000-3-py3 @@ -96,6 +103,13 @@ platforms: - name: ubuntu-1604-3000-3-py2 driver: image: saltimages/salt-3000.3-py2:ubuntu-16.04 + - name: gentoo-stage3-latest-3000-3-py3 + driver: + image: saltimages/salt-3000.3-py3:gentoo-stage3-latest + run_command: /sbin/init + - name: gentoo-stage3-systemd-3000-3-py3 + driver: + image: saltimages/salt-3000.3-py3:gentoo-stage3-systemd ## SALT `2019.2` - name: debian-10-2019-2-py3 @@ -172,6 +186,8 @@ suites: - amazonlinux-2-3001-py3 - oraclelinux-8-3001-py3 - oraclelinux-7-3001-py3 + - gentoo-stage3-latest-3001-py3 + - gentoo-stage3-systemd-3001-py3 provisioner: state_top: base: @@ -203,6 +219,8 @@ suites: - amazonlinux-2-3000-3-py3 - oraclelinux-8-3000-3-py3 - oraclelinux-7-3000-3-py3 + - gentoo-stage3-latest-3000-3-py3 + - gentoo-stage3-systemd-3000-3-py3 provisioner: state_top: base: diff --git a/test/integration/v201902-py2/inspec.yml b/test/integration/v201902-py2/inspec.yml index 843004d..5561f1a 100644 --- a/test/integration/v201902-py2/inspec.yml +++ b/test/integration/v201902-py2/inspec.yml @@ -17,3 +17,4 @@ supports: - platform-name: amazon - platform-name: oracle - platform-name: arch + - platform-name: gentoo diff --git a/test/integration/v201902-py3/inspec.yml b/test/integration/v201902-py3/inspec.yml index ecee5b4..aaaa986 100644 --- a/test/integration/v201902-py3/inspec.yml +++ b/test/integration/v201902-py3/inspec.yml @@ -17,3 +17,4 @@ supports: - platform-name: amazon - platform-name: oracle - platform-name: arch + - platform-name: gentoo diff --git a/test/integration/v3000-py2/inspec.yml b/test/integration/v3000-py2/inspec.yml index beac59f..57a8d0e 100644 --- a/test/integration/v3000-py2/inspec.yml +++ b/test/integration/v3000-py2/inspec.yml @@ -17,3 +17,4 @@ supports: - platform-name: amazon - platform-name: oracle - platform-name: arch + - platform-name: gentoo diff --git a/test/integration/v3000-py3/inspec.yml b/test/integration/v3000-py3/inspec.yml index c0da1ca..aab8e51 100644 --- a/test/integration/v3000-py3/inspec.yml +++ b/test/integration/v3000-py3/inspec.yml @@ -17,4 +17,5 @@ supports: - platform-name: amazon - platform-name: oracle - platform-name: arch + - platform-name: gentoo - platform: windows diff --git a/test/integration/v3001-py3/inspec.yml b/test/integration/v3001-py3/inspec.yml index 32debc1..4d9d790 100644 --- a/test/integration/v3001-py3/inspec.yml +++ b/test/integration/v3001-py3/inspec.yml @@ -17,3 +17,4 @@ supports: - platform-name: amazon - platform-name: oracle - platform-name: arch + - platform-name: gentoo diff --git a/test/salt/pillar/salt.sls b/test/salt/pillar/salt.sls index 1547199..7af0ae5 100644 --- a/test/salt/pillar/salt.sls +++ b/test/salt/pillar/salt.sls @@ -21,3 +21,7 @@ salt: pillar_roots: base: - /srv/pillar + +# Gentoo-specific, improves performance for subsequent test runs within the same day +portage: + sync_wait_one_day: true