Merge pull request #1 from fubarhouse/deprecated-stuff

Deprecated stuff
fubarhouse · Apr 29, 2018 · 17f69bb · 17f69bb
2 parents ef6c05f + 63c762c
commit 17f69bb
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 40 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -44,10 +44,10 @@ env:
     init: /sbin/init
     run_opts: --privileged
     playbook: playbook.yml
-#  - distro: yakkety
-#    init: /sbin/init
-#    run_opts: --privileged
-#    playbook: playbook.yml
+  - distro: yakkety
+    init: /sbin/init
+    run_opts: --privileged
+    playbook: playbook.yml
   - distro: zesty
     init: /sbin/init
     run_opts: --privileged
@@ -100,6 +100,10 @@ env:
     init: /usr/lib/systemd/systemd
     run_opts: --privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro
     playbook: playbook.yml
+  - distro: fedora-28
+    init: /usr/lib/systemd/systemd
+    run_opts: --privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro
+    playbook: playbook.yml
 
 before_install:
 
@@ -117,7 +121,7 @@ script:
   - 'docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook} --syntax-check'
 
   # Test role.
-  - 'travis_wait 30 docker exec "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook} --sudo'
+  - 'travis_wait 60 docker exec "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook} --sudo'
 
   - idempotence=$(mktemp)
   - >

diff --git a/meta/main.yml b/meta/main.yml
@@ -4,42 +4,43 @@ galaxy_info:
   license: MIT
   min_ansible_version: 2.4
   platforms:
-    - name: Debian
-      versions:
-        - wheezy
-        - jessie
-        - stretch
-        - buster
-    - name: EL
-      versions:
-        - 6
-        - 7
-    - name: Fedora
-      versions:
-        - 24
-        - 25
-        - 26
-        - 27
-    - name: Ubuntu
-      versions:
-        - precise
-        - quantal
-        - raring
-        - saucy
-        - trusty
-        - utopic
-        - wily
-        - vivid
-        - xenial
-#        - yakkety
-        - zesty
-        - artful
-        - bionic
+  - name: Debian
+    versions:
+    - wheezy
+    - jessie
+    - stretch
+    - buster
+  - name: EL
+    versions:
+    - 6
+    - 7
+  - name: Fedora
+    versions:
+    - 24
+    - 25
+    - 26
+    - 27
+    - 28
+  - name: Ubuntu
+    versions:
+    - precise
+    - quantal
+    - raring
+    - saucy
+    - trusty
+    - utopic
+    - wily
+    - vivid
+    - xenial
+    - yakkety
+    - zesty
+    - artful
+    - bionic
   galaxy_tags:
   - rust
   - development
   - programming
   - language
   - compiler
   - package
-dependencies: []
+  dependencies: []
diff --git a/tasks/setup.yml b/tasks/setup.yml
@@ -2,15 +2,15 @@
 # setup tasks file for fubarhouse-rust
 
 - name: "Rust | Include OS-Specific tasks (CentOS)"
-  include: tasks-CentOS.yml
+  include_tasks: tasks-CentOS.yml
   when: ansible_distribution == "CentOS"
 
 - name: "Rust | Include OS-Specific tasks (Debian)"
-  include: tasks-Debian.yml
+  include_tasks: tasks-Debian.yml
   when: ansible_os_family == "Debian"
 
 - name: "Rust | Include OS-Specific tasks (RedHat)"
-  include: tasks-RedHat.yml
+  include_tasks: tasks-RedHat.yml
   when:
     - ansible_os_family == "RedHat"
     - ansible_distribution != "CentOS"