default.yml in simp-rake-helpers-2.4.3

- old
+ new
@@ -1,56 +1,78 @@
 HOSTS:
-  container:
+  el6-build-server:
     roles:
       - default
       - master
       - agent
-    platform:    el-6-x86_64
-    hypervisor:  docker
-    image:       'centos:centos6.7'
+      - build_server
+    platform: el-6-x86_64
+    hypervisor: docker
+    image: centos:6
     docker_image_commands:
-      - "echo 'Defaults !requiretty' >> /etc/sudoers"
       - 'yum install -y epel-release'
+      - "echo 'Defaults:build_user !requiretty' >> /etc/sudoers"
+      - "echo 'build_user ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers"
+      - 'useradd -b /home -m -c "Build User" -s /bin/bash -U build_user'
       # simp build-deps
       - 'yum install -y rpm-build augeas-devel createrepo genisoimage git gnupg2 libicu-devel libxml2 libxml2-devel libxslt libxslt-devel mock rpmdevtools clamav which'
+      - 'usermod -a -G mock build_user'
       # rvm build-deps
       - 'yum install -y libyaml-devel glibc-headers autoconf gcc-c++ glibc-devel readline-devel libffi-devel openssl-devel automake libtool bison sqlite-devel'
-      - 'gpg2 --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3'
-      - 'echo export rvm_prefix="\$HOME" > /root/.rvmrc && echo export rvm_path="\$HOME/.rvm" >> /root/.rvmrc'
-      - '\curl -sSL https://get.rvm.io | bash -s stable --ruby=1.9.3'
-      - 'source ~/.rvm/scripts/rvm'
+      - 'runuser build_user -l -c "gpg2 --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3"'
+      - 'runuser build_user -l -c "curl -sSL https://get.rvm.io | bash -s stable --ruby=2.1"'
+      - 'runuser build_user -l -c "rvm use --default 2.1"'
+      - 'runuser build_user -l -c "rvm all do gem install bundler"'
+      - 'runuser build_user -l -c "rvm use default; gem install --no-ri --no-rdoc simp-rake-helpers"'
+      - 'runuser build_user -l -c "rvm use default; gem install --no-ri --no-rdoc rake"'
+      - 'runuser build_user -l -c "rvm use default; gem install --no-ri --no-rdoc json"'
+      - 'runuser build_user -l -c "rvm use default; gem install --no-ri --no-rdoc charlock_holmes"'
+      - 'runuser build_user -l -c "rvm use default; gem install --no-ri --no-rdoc posix-spawn"'
     # NOTE: the './' syntax requires BKR-704
     mount_folders:
       folder1:
         # must be an absolute path, seemingly
         host_path: ./
         container_path: /host_files
     docker_preserve_image: true
+
+  el7-build-server:
+    roles:
+      - build_server
+    platform: el-7-x86_64
+    hypervisor: docker
+    image: centos:7
+    docker_cmd: '/sbin/sshd; tail -f /dev/null'
+    docker_image_commands:
+      - 'yum install -y epel-release'
+      - 'ln -sf /bin/true /usr/bin/systemctl'
+      - "echo 'Defaults:build_user !requiretty' >> /etc/sudoers"
+      - "echo 'build_user ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers"
+      - 'useradd -b /home -m -c "Build User" -s /bin/bash -U build_user'
+      # simp build-deps
+      - 'yum install -y rpm-build augeas-devel createrepo genisoimage git gnupg2 libicu-devel libxml2 libxml2-devel libxslt libxslt-devel mock rpmdevtools clamav clamav-update which'
+      - 'usermod -a -G mock build_user'
+      # rvm build-deps
+      - 'yum install -y libyaml-devel glibc-headers autoconf gcc-c++ glibc-devel readline-devel libffi-devel openssl-devel automake libtool bison sqlite-devel'
+      - 'runuser build_user -l -c "gpg2 --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3"'
+      - 'runuser build_user -l -c "curl -sSL https://get.rvm.io | bash -s stable --ruby=2.1"'
+      - 'runuser build_user -l -c "rvm use --default 2.1"'
+      - 'runuser build_user -l -c "rvm all do gem install bundler"'
+      - 'runuser build_user -l -c "rvm use default; gem install --no-ri --no-rdoc simp-rake-helpers"'
+      - 'runuser build_user -l -c "rvm use default; gem install --no-ri --no-rdoc json"'
+      - 'runuser build_user -l -c "rvm use default; gem install --no-ri --no-rdoc charlock_holmes"'
+      - 'runuser build_user -l -c "rvm use default; gem install --no-ri --no-rdoc posix-spawn"'
+    # NOTE: the './' syntax requires BKR-704
+    mount_folders:
+      folder1:
+        # must be an absolute path, seemingly
+        host_path: ./
+        container_path: /host_files
+    docker_preserve_image: true
+    ssh:
+      password: root
+      auth_methods:
+        - password
+
 CONFIG:
   log_level: verbose
   type:      foss
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-#      - 'sed -i "s/UsePAM.*/UsePAM yes/g" /etc/ssh/sshd_config'
-#      - 'sed -i "s/#UsePrivilegeSeparation.*/UsePrivilegeSeparation no/g" /etc/ssh/sshd_config'
-#      - "ssh-keygen -t ed25519 -f /etc/ssh/ssh_host_ed25519_key -N ''"
-#      - "ssh-keygen -t ecdsa -f /etc/ssh/ssh_host_ecdsa_key -N ''"
-    #docker_cmd: '["/usr/sbin/sshd -e"]'