Merge pull request #324 from puppetlabs/update-msync

Update to newest modulesync_configs [9ca280f]

.travis.yml

@@ -8,24 +8,28 @@ matrix:
   fast_finish: true
   include:
   - rvm: 2.1.6
+    dist: trusty
+    env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/ubuntu-14.04
+    script: bundle exec rake beaker
+    services: docker
+    sudo: required
+  - rvm: 2.1.6
+    dist: trusty
+    env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/centos-7
+    script: bundle exec rake beaker
+    services: docker
+    sudo: required
+  - rvm: 2.1.6
+    bundler_args: --without system_tests
     env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES="yes"
   - rvm: 2.1.5
+    bundler_args: --without system_tests
     env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
   - rvm: 2.1.5
+    bundler_args: --without system_tests
     env: PUPPET_GEM_VERSION="~> 3.0"
   - rvm: 1.9.3
+    bundler_args: --without system_tests
     env: PUPPET_GEM_VERSION="~> 3.0"
-  - rvm: 2.1.6
-    sudo: required
-    dist: trusty
-    services: docker
-    env: PUPPET_INSTALL_TYPE=agent BEAKER_set="docker/ubuntu-14.04"
-    script: bundle exec rake beaker
-  - rvm: 2.1.6
-    sudo: required
-    dist: trusty
-    services: docker
-    env: PUPPET_INSTALL_TYPE=agent BEAKER_set="docker/centos-7"
-    script: bundle exec rake beaker
 notifications:
   email: false

spec/acceptance/nodesets/centos-7-x64.yml

@@ -0,0 +1,10 @@
+HOSTS:
+  centos-7-x64:
+    roles:
+      - agent
+      - default
+    platform: redhat-7-x86_64
+    hypervisor: vagrant
+    box: puppetlabs/centos-7.2-64-nocm
+CONFIG:
+  type: foss

spec/acceptance/nodesets/debian-8-x64.yml

@@ -0,0 +1,10 @@
+HOSTS:
+  debian-8-x64:
+    roles:
+      - agent
+      - default
+    platform: debian-8-amd64
+    hypervisor: vagrant
+    box: puppetlabs/debian-8.2-64-nocm
+CONFIG:
+  type: foss

spec/acceptance/nodesets/default.yml

@@ -1,10 +1,10 @@
 HOSTS:
-  centos-64-x64:
+  ubuntu-1404-x64:
     roles:
-      - master
-    platform: el-6-x86_64
-    box : centos-64-x64-vbox4210-nocm
-    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
-    hypervisor : vagrant
+      - agent
+      - default
+    platform: ubuntu-14.04-amd64
+    hypervisor: vagrant
+    box: puppetlabs/ubuntu-14.04-64-nocm
 CONFIG:
   type: foss

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

@@ -1,12 +1,12 @@
 HOSTS:
   centos-7-x64:
     platform: el-7-x86_64
-    hypervisor : docker
+    hypervisor: docker
     image: centos:7
     docker_preserve_image: true
     docker_cmd: '["/usr/sbin/init"]'
+    # install various tools required to get the image up to usable levels
     docker_image_commands:
-      - 'yum install -y crontabs tar wget openssl'
+      - 'yum install -y crontabs tar wget openssl sysvinit-tools iproute which initscripts'
 CONFIG:
-  log_level: verbose
   trace_limit: 200

spec/acceptance/nodesets/docker/debian-8.yml

@@ -0,0 +1,11 @@
+HOSTS:
+  debian-8-x64:
+    platform: debian-8-amd64
+    hypervisor: docker
+    image: debian:8
+    docker_preserve_image: true
+    docker_cmd: '["/sbin/init"]'
+    docker_image_commands:
+      - 'apt-get update && apt-get install -y net-tools wget locales strace lsof && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && locale-gen'
+CONFIG:
+  trace_limit: 200

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

@@ -1,15 +1,12 @@
 HOSTS:
   ubuntu-1404-x64:
     platform: ubuntu-14.04-amd64
-    hypervisor : docker
+    hypervisor: docker
     image: ubuntu:14.04
     docker_preserve_image: true
     docker_cmd: '["/sbin/init"]'
     docker_image_commands:
-      - 'rm /usr/sbin/policy-rc.d'
-      - 'rm /sbin/initctl; dpkg-divert --rename --remove /sbin/initctl'
-      - 'apt-get install -y net-tools wget'
-      - 'locale-gen en_US.UTF-8'
+      # ensure that upstart is booting correctly in the container
+      - 'rm /usr/sbin/policy-rc.d && rm /sbin/initctl && dpkg-divert --rename --remove /sbin/initctl && apt-get update && apt-get install -y net-tools wget && locale-gen en_US.UTF-8'
 CONFIG:
-  log_level: debug
   trace_limit: 200