Commit 47843411 authored by Mickaël Canévet's avatar Mickaël Canévet
Browse files

Add Puppet 4 to travis matrix

parent 7494cfc9

.travis.yml

+2 −0
Changes for .travis.yml: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ matrix: 
    env: PUPPET_GEM_VERSION="~> 3.0"

  - rvm: 2.0.0

    env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"

  - rvm: 2.1.0

    env: PUPPET_GEM_VERSION="~> 4.0"

notifications:

  email: false

deploy:

spec/acceptance/nodesets/ubuntu-10.04-x86_64-docker.yml

0 → 100644
+12 −0
Changes for spec/acceptance/nodesets/ubuntu-10.04-x86_64-docker.yml: 12 added lines, 0 removed lines.
Original line number Diff line number Diff line 
HOSTS:

  ubuntu-1004-x64:

    default_apply_opts:

      strict_variables:

    platform: ubuntu-10.04-amd64

    hypervisor : docker

    image: ubuntu:10.04

    # This stops the image from being deleted on completion, speeding up the process.

    docker_preserve_image: true

CONFIG:

  type: foss

  log_level: debug

spec/acceptance/nodesets/ubuntu-12.04-x86_64-docker.yml

0 → 100644
+12 −0
Changes for spec/acceptance/nodesets/ubuntu-12.04-x86_64-docker.yml: 12 added lines, 0 removed lines.
Original line number Diff line number Diff line 
HOSTS:

  ubuntu-1204-x64:

    default_apply_opts:

      strict_variables:

    platform: ubuntu-12.04-amd64

    hypervisor : docker

    image: ubuntu:12.04

    # This stops the image from being deleted on completion, speeding up the process.

    docker_preserve_image: true

CONFIG:

  type: foss

  log_level: debug

spec/acceptance/nodesets/ubuntu-14.04-x86_64-docker.yml

0 → 100644
+12 −0
Changes for spec/acceptance/nodesets/ubuntu-14.04-x86_64-docker.yml: 12 added lines, 0 removed lines.
Original line number Diff line number Diff line 
HOSTS:

  ubuntu-1404-x64:

    default_apply_opts:

      strict_variables:

    platform: ubuntu-14.04-amd64

    hypervisor : docker

    image: ubuntu:14.04

    # This stops the image from being deleted on completion, speeding up the process.

    docker_preserve_image: true

CONFIG:

  type: foss

  log_level: debug

spec/acceptance/nodesets/ubuntu-14.04-x86_64-openstack.yml

+1 −1
Changes for spec/acceptance/nodesets/ubuntu-14.04-x86_64-openstack.yml: 1 added line, 1 removed line.
Original line number Diff line number Diff line 
HOSTS:

  ubuntu-14.04-x64:

  ubuntu-1404-x64:

    default_apply_opts:

      strict_variables:

    platform: ubuntu-14.04-amd64