Merge pull request voxpupuli#550 from jhoblitt/maint/beaker-centos-7

replace centos-7-docker fakesystemd with classic flavor

.travis.yml

@@ -19,22 +19,20 @@ matrix:
     - rvm: '2.1'
       sudo: required
       services: docker
-      env: PUPPET_VERSION="~> 3.8.0" BEAKER_set="centos-6-docker"
+      env: BEAKER_set="centos-6-docker"
       script: bundle exec rake acceptance
       bundler_args: --without development
     - rvm: '2.1'
       sudo: required
       services: docker
-      env: PUPPET_VERSION="~> 3.8.0" BEAKER_set="centos-7-docker"
+      env: BEAKER_set="centos-7-docker"
       script: bundle exec rake acceptance
       bundler_args: --without development
     - rvm: '2.1'
       sudo: required
       services: docker
-      env: PUPPET_VERSION="~> 3.8.0" BEAKER_set="ubuntu-14.04-docker"
+      env: BEAKER_set="ubuntu-14.04-docker"
       script: bundle exec rake acceptance
       bundler_args: --without development
-  allow_failures:
-    - env: PUPPET_VERSION="~> 3.8.0" BEAKER_set="centos-7-docker"
 notifications:
   email: false

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

@@ -0,0 +1,30 @@
+FROM centos:7
+MAINTAINER puppet-jenkins
+ENV container docker
+
+# beaker default behavior
+RUN yum clean all
+RUN yum install -y sudo openssh-server openssh-clients curl ntpdate
+RUN ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key
+RUN ssh-keygen -t dsa -f /etc/ssh/ssh_host_dsa_key
+RUN mkdir -p /var/run/sshd
+RUN echo root:root | chpasswd
+RUN sed -ri 's/^#?PermitRootLogin .*/PermitRootLogin yes/' /etc/ssh/sshd_config
+RUN sed -ri 's/^#?PasswordAuthentication .*/PasswordAuthentication yes/' /etc/ssh/sshd_config
+RUN yum install -y crontabs tar wget
+EXPOSE 22
+
+# based on https://github.com/slafs/dockerfiles/blob/master/centos7-systemd/Dockerfile
+RUN yum -y swap -- remove fakesystemd -- install systemd systemd-libs
+RUN systemctl mask dev-mqueue.mount dev-hugepages.mount \
+    systemd-remount-fs.service sys-kernel-config.mount \
+    sys-kernel-debug.mount sys-fs-fuse-connections.mount \
+    display-manager.service systemd-logind.service
+RUN systemctl disable graphical.target; systemctl enable multi-user.target
+RUN systemctl enable sshd.service
+VOLUME ["/sys/fs/cgroup"]
+
+# provides /usr/sbin/service required by the service redhat provider
+RUN yum install -y initscripts
+
+CMD  ["/usr/lib/systemd/systemd"]

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

@@ -2,9 +2,8 @@ HOSTS:
   centos-7-x64:
     platform: el-7-x86_64
     hypervisor : docker
-    image: centos:7
     docker_preserve_image: true
-    docker_cmd: '["/sbin/init"]'
+    dockerfile: spec/acceptance/nodesets/centos-7-docker.Dockerfile
 CONFIG:
   type: foss
   log_level: debug