enable automated tests on SLES (#68)

deric · Sep 14, 2017 · 2b05f46 · 2b05f46
1 parent 172147f
commit 2b05f46
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 16 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -19,7 +19,6 @@ rvm:
 # see http://rubies.travis-ci.org/
   - 1.9.3
   - 2.1.10
-  - 2.2.7
   - 2.3.3
 env:
 #  - BEAKER_set="debian-8-docker"
@@ -37,7 +36,7 @@ env:
   - PUPPET_VERSION="~> 4.10.0" STRICT_VARIABLES=yes
 matrix:
   include:
-    - rvm: 2.3.2
+    - rvm: 2.3.3
       dist: trusty
       env: RAKE_ENV=ci BEAKER_debug=true BEAKER_set=centos7-3.8
       script: bundle exec rake acceptance
@@ -49,38 +48,36 @@ matrix:
     #  script: bundle exec rake acceptance
     #  services: docker
     #  sudo: required
-    - rvm: 2.3.2
+    - rvm: 2.3.3
       dist: trusty
       env: RAKE_ENV=ci BEAKER_debug=true BEAKER_set=debian8-3.8
       script: bundle exec rake acceptance
       services: docker
       sudo: required
-    - rvm: 2.3.2
+    - rvm: 2.3.3
       dist: trusty
       env: RAKE_ENV=ci BEAKER_debug=true BEAKER_set=debian8-4.8
       script: bundle exec rake acceptance
       services: docker
       sudo: required
-    - rvm: 2.3.2
+    - rvm: 2.3.3
       dist: trusty
       # includes puppet provisioning (will included latest puppet version)
       env: PUPPET_install=yes RAKE_ENV=ci PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=ubuntu-14.04
       script: bundle exec rake acceptance
       services: docker
       sudo: required
+    - rvm: 2.3.3
+      dist: trusty
+      env: RAKE_ENV=ci BEAKER_debug=true BEAKER_set=sles13-3.8
+      script: bundle exec rake acceptance
+      services: docker
+      sudo: required
   exclude:
     - rvm: 1.9.3
       env: PUPPET_VERSION="~> 4.9.0" STRICT_VARIABLES=yes
     - rvm: 1.9.3
       env: PUPPET_VERSION="~> 4.10.0" STRICT_VARIABLES=yes
-    - rvm: 2.2.7
-      env: PUPPET_VERSION="~> 3.6.0" STRICT_VARIABLES=yes
-    - rvm: 2.2.7
-      env: PUPPET_VERSION="~> 3.7.0" STRICT_VARIABLES=yes
-    - rvm: 2.2.7
-      env: PUPPET_VERSION="~> 3.8.0" STRICT_VARIABLES=yes
-    - rvm: 2.2.7
-      env: PUPPET_VERSION="~> 3.8.0" STRICT_VARIABLES=yes FUTURE_PARSER=yes
     - rvm: 2.3.3
       env: PUPPET_VERSION="~> 3.6.0" STRICT_VARIABLES=yes
     - rvm: 2.3.3
@@ -89,5 +86,5 @@ matrix:
       env: PUPPET_VERSION="~> 3.8.0" STRICT_VARIABLES=yes
     - rvm: 2.3.3
       env: PUPPET_VERSION="~> 3.8.0" STRICT_VARIABLES=yes FUTURE_PARSER=yes
-#  allow_failures:
-#    - env: RAKE_ENV=ci PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=debian8-3.8
+  allow_failures:
+    - env: RAKE_ENV=ci BEAKER_debug=true BEAKER_set=sles13-3.8
diff --git a/spec/acceptance/nodesets/sles13-3.8.yml b/spec/acceptance/nodesets/sles13-3.8.yml
@@ -7,7 +7,7 @@ HOSTS:
     roles:
       - agent
     debug: false
-    docker_cmd: '["sh","-c", "git clone https://github.com/deric/puppet-gpasswd.git /etc/puppet/modules/gpasswd && /usr/sbin/sshd-gen-keys-start && /usr/sbin/sshd -D"]'
+    docker_cmd: '["sh","-c", "/usr/sbin/sshd-gen-keys-start && /usr/sbin/sshd -D"]'
 CONFIG:
   masterless: true
   log_level: verbose