Skip to content

Commit

Permalink
One version per platform
Browse files Browse the repository at this point in the history
  • Loading branch information
s0undt3ch committed Mar 4, 2021
1 parent 0b5b569 commit 23a173a
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 17 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ jobs:
os:
- centos
- debian
- ubuntu-16
- ubuntu-18
- ubuntu
steps:
- uses: actions/checkout@v2

Expand Down
21 changes: 6 additions & 15 deletions .kitchen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,20 +86,11 @@ platforms:
sudo apt-get update
DEBIAN_FRONTEND=noninteractive sudo apt-get install -y software-properties-common
salt_bootstrap_options: -X -x python3 -p git -p curl -p sudo -p software-properties-common stable 3000.6
- name: ubuntu-16.04
- name: debian-10
provisioner:
salt_apt_repo: 'https://repo.saltproject.io/py3/ubuntu/16.04/amd64/archive'
salt_apt_repo_key: 'https://repo.saltproject.io/py3/ubuntu/16.04/amd64/latest/SALTSTACK-GPG-KEY.pub'
init_environment: |
sudo mkdir -p /tmp/kitchen/var/cache/salt/master
sudo apt-get update
DEBIAN_FRONTEND=noninteractive sudo apt-get install -y software-properties-common
salt_bootstrap_options: -X -x python3 -p git -p curl -p sudo -p software-properties-common stable 3000.6
- name: debian-9
provisioner:
salt_apt_repo: 'https://repo.saltproject.io/py3/debian/9/amd64/archive'
salt_apt_repo_key: 'https://repo.saltproject.io/py3/debian/9/amd64/latest/SALTSTACK-GPG-KEY.pub'
- name: centos-7
salt_apt_repo: 'https://repo.saltproject.io/py3/debian/10/amd64/archive'
salt_apt_repo_key: 'https://repo.saltproject.io/py3/debian/10/amd64/latest/SALTSTACK-GPG-KEY.pub'
- name: centos-8
driver_config:
provision_command:
- echo . /etc/profile >> ~kitchen/.bashrc
Expand All @@ -108,8 +99,8 @@ platforms:
- yum install -y epel-release
- yum install -y python3-pip python3-devel gcc git gcc-c++
provisioner:
salt_yum_repo: 'https://repo.saltproject.io/py3/redhat/7/x86_64/archive/%s'
salt_yum_rpm_key: 'https://repo.saltproject.io/py3/redhat/7/x86_64/latest/SALTSTACK-GPG-KEY.pub'
salt_yum_repo: 'https://repo.saltproject.io/py3/redhat/8/x86_64/archive/%s'
salt_yum_rpm_key: 'https://repo.saltproject.io/py3/redhat/8/x86_64/latest/SALTSTACK-GPG-KEY.pub'
<% if @vagrant != false %>
- name: windows-2012r2
driver:
Expand Down

0 comments on commit 23a173a

Please sign in to comment.