add support for Ubuntu 18.04
This commit is contained in:
parent
bf22674255
commit
dd64c0aa42
@ -9,7 +9,7 @@ transport:
|
|||||||
|
|
||||||
provisioner:
|
provisioner:
|
||||||
name: ansible_playbook
|
name: ansible_playbook
|
||||||
roles_path: ../../roles
|
roles_path: ../
|
||||||
hosts: test-kitchen
|
hosts: test-kitchen
|
||||||
# ansible_verbose: true
|
# ansible_verbose: true
|
||||||
ansible_verbose: false
|
ansible_verbose: false
|
||||||
@ -17,6 +17,7 @@ provisioner:
|
|||||||
ansible_extra_flags: <%= ENV['ANSIBLE_EXTRA_FLAGS'] %>
|
ansible_extra_flags: <%= ENV['ANSIBLE_EXTRA_FLAGS'] %>
|
||||||
|
|
||||||
platforms:
|
platforms:
|
||||||
|
- name: ubuntu-18.04
|
||||||
- name: ubuntu-16.04
|
- name: ubuntu-16.04
|
||||||
- name: ubuntu-14.04
|
- name: ubuntu-14.04
|
||||||
- name: ubuntu-12.04
|
- name: ubuntu-12.04
|
||||||
|
@ -13,7 +13,6 @@ provisioner:
|
|||||||
ansible_verbose: false
|
ansible_verbose: false
|
||||||
ansible_verbosity: 3
|
ansible_verbosity: 3
|
||||||
ansible_extra_flags: <%= ENV['ANSIBLE_EXTRA_FLAGS'] %>
|
ansible_extra_flags: <%= ENV['ANSIBLE_EXTRA_FLAGS'] %>
|
||||||
# ansible_yum_repo: http://dl.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-8.noarch.rpm
|
|
||||||
require_chef_omnibus: false
|
require_chef_omnibus: false
|
||||||
require_ansible_omnibus: true
|
require_ansible_omnibus: true
|
||||||
# require_chef_for_busser: false
|
# require_chef_for_busser: false
|
||||||
@ -21,6 +20,7 @@ provisioner:
|
|||||||
ansible_connection: ssh
|
ansible_connection: ssh
|
||||||
|
|
||||||
platforms:
|
platforms:
|
||||||
|
- name: ubuntu-18.04
|
||||||
- name: ubuntu-16.04
|
- name: ubuntu-16.04
|
||||||
## FIXME! test frozing/stalling on '-----> Running bats test suite' for trusty and precise???
|
## FIXME! test frozing/stalling on '-----> Running bats test suite' for trusty and precise???
|
||||||
# - name: ubuntu-14.04
|
# - name: ubuntu-14.04
|
||||||
|
@ -10,12 +10,15 @@ env:
|
|||||||
- distribution: centos
|
- distribution: centos
|
||||||
version: 7
|
version: 7
|
||||||
init: /usr/lib/systemd/systemd
|
init: /usr/lib/systemd/systemd
|
||||||
run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
|
run_opts: "'--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro'"
|
||||||
|
- distribution: ubuntu
|
||||||
|
version: 18.04
|
||||||
|
init: /lib/systemd/systemd
|
||||||
|
run_opts: "'--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro'"
|
||||||
- distribution: ubuntu
|
- distribution: ubuntu
|
||||||
version: 16.04
|
version: 16.04
|
||||||
init: /lib/systemd/systemd
|
init: /lib/systemd/systemd
|
||||||
run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
|
run_opts: "'--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro'"
|
||||||
# run_opts: "--cap-add SYS_ADMIN"
|
|
||||||
## FIXME! travis/trusty build stalling
|
## FIXME! travis/trusty build stalling
|
||||||
# - distribution: ubuntu
|
# - distribution: ubuntu
|
||||||
# version: 14.04
|
# version: 14.04
|
||||||
|
@ -11,11 +11,14 @@ env:
|
|||||||
version: 7
|
version: 7
|
||||||
init: /usr/lib/systemd/systemd
|
init: /usr/lib/systemd/systemd
|
||||||
run_opts: "'--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro'"
|
run_opts: "'--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro'"
|
||||||
|
- distribution: ubuntu
|
||||||
|
version: 18.04
|
||||||
|
init: /lib/systemd/systemd
|
||||||
|
run_opts: "'--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro'"
|
||||||
- distribution: ubuntu
|
- distribution: ubuntu
|
||||||
version: 16.04
|
version: 16.04
|
||||||
init: /lib/systemd/systemd
|
init: /lib/systemd/systemd
|
||||||
run_opts: "'--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro'"
|
run_opts: "'--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro'"
|
||||||
# run_opts: "--cap-add SYS_ADMIN"
|
|
||||||
- distribution: ubuntu
|
- distribution: ubuntu
|
||||||
version: 14.04
|
version: 14.04
|
||||||
init: /sbin/init
|
init: /sbin/init
|
||||||
|
@ -10,6 +10,8 @@ env:
|
|||||||
# version: 6
|
# version: 6
|
||||||
# - distribution: centos
|
# - distribution: centos
|
||||||
# version: 7
|
# version: 7
|
||||||
|
- distribution: ubuntu
|
||||||
|
version: 18.04
|
||||||
- distribution: ubuntu
|
- distribution: ubuntu
|
||||||
version: 16.04
|
version: 16.04
|
||||||
- distribution: ubuntu
|
- distribution: ubuntu
|
||||||
|
@ -10,6 +10,8 @@ env:
|
|||||||
# version: 6
|
# version: 6
|
||||||
# - distribution: centos
|
# - distribution: centos
|
||||||
# version: 7
|
# version: 7
|
||||||
|
- distribution: ubuntu
|
||||||
|
version: 18.04
|
||||||
- distribution: ubuntu
|
- distribution: ubuntu
|
||||||
version: 16.04
|
version: 16.04
|
||||||
- distribution: ubuntu
|
- distribution: ubuntu
|
||||||
@ -47,20 +49,12 @@ before_install:
|
|||||||
- sudo service lxd restart
|
- sudo service lxd restart
|
||||||
|
|
||||||
- sudo pip install ansible
|
- sudo pip install ansible
|
||||||
## need to use chef gem for some reason? BAD PATH https://github.com/chef/chef-dk/issues/15
|
|
||||||
# - chef gem install kitchen
|
|
||||||
- gem install kitchen
|
- gem install kitchen
|
||||||
- gem install kitchen-ansible
|
- gem install kitchen-ansible
|
||||||
- gem install kitchen-sync
|
- gem install kitchen-sync
|
||||||
- gem install kitchen-lxd_cli
|
- gem install kitchen-lxd_cli
|
||||||
## Message: Unable to activate kitchen-ansible-0.45.0, because net-ssh-2.9.2 conflicts with net-ssh (~> 3.0)
|
|
||||||
# - chef gem uninstall net-ssh -v 2.9.2 -q ?-y
|
|
||||||
# - chef gem list
|
|
||||||
- gem list
|
- gem list
|
||||||
- which kitchen
|
- which kitchen
|
||||||
# - which chef
|
|
||||||
# - find /var/lib/gems $HOME/.gem /usr/local/rvm/gems /opt/chefdk/embedded/lib/ruby/gem -iname '*lxd_cli*' || true
|
|
||||||
- wget -q https://releases.hashicorp.com/vagrant/1.9.7/vagrant_1.9.7_x86_64.deb && sudo dpkg -i vagrant_1.9.7_x86_64.deb
|
|
||||||
## ssh key for lxd_cli ?
|
## ssh key for lxd_cli ?
|
||||||
- ls ~/.ssh
|
- ls ~/.ssh
|
||||||
- ssh-keygen -t rsa -b 2048 -f ~/.ssh/id_rsa -P ""
|
- ssh-keygen -t rsa -b 2048 -f ~/.ssh/id_rsa -P ""
|
||||||
|
@ -12,10 +12,11 @@ It was tested on the following versions:
|
|||||||
* 1.9
|
* 1.9
|
||||||
* 2.0
|
* 2.0
|
||||||
* 2.2
|
* 2.2
|
||||||
|
* 2.5
|
||||||
|
|
||||||
### Operating systems
|
### Operating systems
|
||||||
|
|
||||||
Ubuntu 14.04, 16.04 and Centos 7
|
Ubuntu 14.04, 16.04, 18.04 and Centos 7
|
||||||
|
|
||||||
## Example Playbook
|
## Example Playbook
|
||||||
|
|
||||||
|
@ -19,6 +19,7 @@ galaxy_info:
|
|||||||
- precise
|
- precise
|
||||||
- trusty
|
- trusty
|
||||||
- xenial
|
- xenial
|
||||||
|
- bionic
|
||||||
#
|
#
|
||||||
# Below are all categories currently available. Just as with
|
# Below are all categories currently available. Just as with
|
||||||
# the platforms above, uncomment those that apply to your role.
|
# the platforms above, uncomment those that apply to your role.
|
||||||
|
11
test/travis/Dockerfile.ubuntu-18.04
Normal file
11
test/travis/Dockerfile.ubuntu-18.04
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
FROM ubuntu:18.04
|
||||||
|
RUN apt-get update
|
||||||
|
|
||||||
|
# Install Ansible
|
||||||
|
RUN env DEBIAN_FRONTEND=noninteractive apt-get install -y software-properties-common git systemd
|
||||||
|
RUN apt-get update
|
||||||
|
RUN apt-get install -y python sudo python-pip python-dev libffi-dev ansible
|
||||||
|
|
||||||
|
# Install Ansible inventory file
|
||||||
|
#RUN mkdir /etc/ansible
|
||||||
|
RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
|
7
vars/Ubuntu-18.04.yml
Normal file
7
vars/Ubuntu-18.04.yml
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
|
||||||
|
fprobe_pkg:
|
||||||
|
- fprobe
|
||||||
|
|
||||||
|
fprobe_svc: fprobe
|
||||||
|
|
Loading…
Reference in New Issue
Block a user