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

Use docker for acceptance tests

parent dd20711e

.gitignore

+3 −0
Original line number Diff line number Diff line
@@ -5,3 +5,6 @@ spec/fixtures/ 
.vagrant/

.bundle/

coverage/

log/

.*.swp

*~

.travis.yml

+36 −15
Original line number Diff line number Diff line
@@ -15,29 +15,50 @@ matrix: 
    env: PUPPET_GEM_VERSION="~> 3.0"

  - rvm: 2.0.0

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

  - rvm: 2.1.0

  - rvm: 2.1.6

    env: PUPPET_GEM_VERSION="~> 4.0"

  - env: BEAKER_set="debian-6-x86_64-openstack"

  - rvm: default

    sudo: required

    services: docker

    env: BEAKER_set="debian-6-x86_64-docker"

    bundler_args:

    script: '[ -z "${OS_AUTH_URL}" -o -z "${OS_USERNAME}" -o -z "${OS_PASSWORD}" -o -z "${OS_TENANT_NAME}" ] || bundle exec rspec spec/acceptance/*_spec.rb'

  - env: BEAKER_set="debian-7-x86_64-openstack"

    script: bundle exec rspec spec/acceptance/*_spec.rb

  - rvm: default

    sudo: required

    services: docker

    env: BEAKER_set="debian-7-x86_64-docker"

    bundler_args:

    script: '[ -z "${OS_AUTH_URL}" -o -z "${OS_USERNAME}" -o -z "${OS_PASSWORD}" -o -z "${OS_TENANT_NAME}" ] || bundle exec rspec spec/acceptance/*_spec.rb'

  - env: BEAKER_set="debian-8-x86_64-openstack"

    script: bundle exec rspec spec/acceptance/*_spec.rb

  - rvm: default

    sudo: required

    services: docker

    env: BEAKER_set="debian-8-x86_64-docker"

    bundler_args:

    script: '[ -z "${OS_AUTH_URL}" -o -z "${OS_USERNAME}" -o -z "${OS_PASSWORD}" -o -z "${OS_TENANT_NAME}" ] || bundle exec rspec spec/acceptance/*_spec.rb'

  - env: BEAKER_set="ubuntu-12.04-x86_64-openstack"

    script: bundle exec rspec spec/acceptance/*_spec.rb

  - rvm: default

    sudo: required

    services: docker

    env: BEAKER_set="ubuntu-12.04-x86_64-docker"

    bundler_args:

    script: '[ -z "${OS_AUTH_URL}" -o -z "${OS_USERNAME}" -o -z "${OS_PASSWORD}" -o -z "${OS_TENANT_NAME}" ] || bundle exec rspec spec/acceptance/*_spec.rb'

  - env: BEAKER_set="ubuntu-14.04-x86_64-openstack"

    script: bundle exec rspec spec/acceptance/*_spec.rb

  - rvm: default

    sudo: required

    services: docker

    env: BEAKER_set="ubuntu-14.04-x86_64-docker"

    bundler_args:

    script: '[ -z "${OS_AUTH_URL}" -o -z "${OS_USERNAME}" -o -z "${OS_PASSWORD}" -o -z "${OS_TENANT_NAME}" ] || bundle exec rspec spec/acceptance/*_spec.rb'

  - env: BEAKER_set="centos-6-x86_64-openstack"

    script: bundle exec rspec spec/acceptance/*_spec.rb

  - rvm: default

    sudo: required

    services: docker

    env: BEAKER_set="centos-6-x86_64-docker"

    bundler_args:

    script: '[ -z "${OS_AUTH_URL}" -o -z "${OS_USERNAME}" -o -z "${OS_PASSWORD}" -o -z "${OS_TENANT_NAME}" ] || bundle exec rspec spec/acceptance/*_spec.rb'

  - env: BEAKER_set="centos-7-x86_64-openstack"

    script: bundle exec rspec spec/acceptance/*_spec.rb

  - rvm: default

    sudo: required

    services: docker

    env: BEAKER_set="centos-7-x86_64-docker"

    bundler_args:

    script: '[ -z "${OS_AUTH_URL}" -o -z "${OS_USERNAME}" -o -z "${OS_PASSWORD}" -o -z "${OS_TENANT_NAME}" ] || bundle exec rspec spec/acceptance/*_spec.rb'

    script: bundle exec rspec spec/acceptance/*_spec.rb

notifications:

  email: false

deploy:

spec/acceptance/nodesets/centos-5-x86_64-docker.yml

+3 −1
Original line number Diff line number Diff line
@@ -6,8 +6,10 @@ HOSTS: 
    platform: el-5-x86_64

    hypervisor : docker

    image: centos:5

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

    docker_preserve_image: true

    docker_cmd: '["/sbin/init"]'

    docker_image_commands:

      - 'yum install -y crontabs tar wget'

CONFIG:

  type: foss

  log_level: debug

spec/acceptance/nodesets/centos-6-x86_64-docker.yml

+3 −1
Original line number Diff line number Diff line
@@ -6,8 +6,10 @@ HOSTS: 
    platform: el-6-x86_64

    hypervisor : docker

    image: centos:6

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

    docker_preserve_image: true

    docker_cmd: '["/sbin/init"]'

    docker_image_commands:

      - 'yum install -y crontabs tar wget'

CONFIG:

  type: foss

  log_level: debug

spec/acceptance/nodesets/centos-7-x86_64-docker.yml

+3 −1
Original line number Diff line number Diff line
@@ -6,8 +6,10 @@ HOSTS: 
    platform: el-7-x86_64

    hypervisor : docker

    image: centos:7

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

    docker_preserve_image: true

    docker_cmd: '["/usr/sbin/init"]'

    docker_image_commands:

      - 'yum install -y crontabs tar wget'

CONFIG:

  type: foss

  log_level: debug