Merge pull request #32 from fangohr/BUG-029

BUG-029: Some examples documentation is missing on the desktop of the Full environment

Author: mvousden

jobs/provision_virtualmicromagnetics_fidimag.yml

@@ -9,9 +9,9 @@
     vm_name: virtualmicromagnetics-fidimag
 
   roles:
+    - { role: rst_to_html, SOURCE_PATH: "/vagrant/extra_resources/welcome/welcome_{{ vm_name }}.rst" }
     - fidimag
     - fidimag_examples
     - xserver
-    - { role: rst_to_html, SOURCE_PATH: "/vagrant/extra_resources/welcome/welcome_{{ vm_name }}.rst" }
     - add_super_user
-    - { role: set_hostname, HOSTNAME: "{{ vm_name}}" }
+    - { role: set_hostname, HOSTNAME: "{{ vm_name }}" }

jobs/provision_virtualmicromagnetics_full.yml

@@ -11,6 +11,7 @@
 
   roles:
     - other_dependencies
+    - { role: rst_to_html, SOURCE_PATH: "/vagrant/extra_resources/welcome/welcome_{{ vm_name }}.rst" }
     - oommf
     - oommf_examples
     - magpar
@@ -20,6 +21,6 @@
     - fidimag
     - fidimag_examples
     - xserver
-    - { role: rst_to_html, SOURCE_PATH: "/vagrant/extra_resources/welcome/welcome_{{ vm_name }}.rst" }
     - add_super_user
-    - { role: set_hostname, HOSTNAME: "{{ vm_name}}" }
+    - { role: set_hostname, HOSTNAME: "{{ vm_name }}" }
+

jobs/provision_virtualmicromagnetics_lite.yml

@@ -9,6 +9,7 @@
     vm_name: virtualmicromagnetics-lite
 
   roles:
+    - { role: rst_to_html, SOURCE_PATH: "/vagrant/extra_resources/welcome/welcome_{{ vm_name }}.rst" }
     - oommf
     - oommf_examples
     - magpar
@@ -18,6 +19,5 @@
     - fidimag
     - fidimag_examples
     - xserver
-    - { role: rst_to_html, SOURCE_PATH: "/vagrant/extra_resources/welcome/welcome_{{ vm_name }}.rst" }
     - add_super_user
-    - { role: set_hostname, HOSTNAME: "{{ vm_name}}" }
+    - { role: set_hostname, HOSTNAME: "{{ vm_name }}" }

jobs/provision_virtualmicromagnetics_magpar.yml

@@ -9,9 +9,9 @@
     vm_name: virtualmicromagnetics-magpar
 
   roles:
+    - { role: rst_to_html, SOURCE_PATH: "/vagrant/extra_resources/welcome/welcome_{{ vm_name }}.rst" }
     - magpar
     - magpar_examples
     - xserver
-    - { role: rst_to_html, SOURCE_PATH: "/vagrant/extra_resources/welcome/welcome_{{ vm_name }}.rst" }
     - add_super_user
-    - { role: set_hostname, HOSTNAME: "{{ vm_name}}" }
+    - { role: set_hostname, HOSTNAME: "{{ vm_name }}" }

jobs/provision_virtualmicromagnetics_nmag.yml

@@ -9,9 +9,9 @@
     vm_name: virtualmicromagnetics-nmag
 
   roles:
+    - { role: rst_to_html, SOURCE_PATH: "/vagrant/extra_resources/welcome/welcome_{{ vm_name }}.rst" }
     - nmag
     - nmag_examples
     - xserver
-    - { role: rst_to_html, SOURCE_PATH: "/vagrant/extra_resources/welcome/welcome_{{ vm_name }}.rst" }
     - add_super_user
-    - { role: set_hostname, HOSTNAME: "{{ vm_name}}" }
+    - { role: set_hostname, HOSTNAME: "{{ vm_name }}" }

jobs/provision_virtualmicromagnetics_oommf.yml

@@ -9,9 +9,9 @@
     vm_name: virtualmicromagnetics-oommf
 
   roles:
+    - { role: rst_to_html, SOURCE_PATH: "/vagrant/extra_resources/welcome/welcome_{{ vm_name }}.rst" }
     - oommf
     - oommf_examples
     - xserver
-    - { role: rst_to_html, SOURCE_PATH: "/vagrant/extra_resources/welcome/welcome_{{ vm_name }}.rst" }
     - add_super_user
-    - { role: set_hostname, HOSTNAME: "{{ vm_name}}" }
+    - { role: set_hostname, HOSTNAME: "{{ vm_name }}" }

roles/fidimag_examples/tasks/main.yml

@@ -2,9 +2,21 @@
 # This Ansible role prepares Fidimag examples and places some documentation on
 # the Desktop.
 
+# Create examples documentation.
+- name: Create documentation build directory.
+  file:
+    name={{ EXAMPLES_DOC_FOLDER }}
+    state=directory
+  sudo: yes
+
+- name: Convert to HTML and place in the build directory.
+  shell: rst2html.py {{ EXAMPLES_RST_FILE }} {{ EXAMPLES_OUTPUT_NAME }}
+    chdir={{ EXAMPLES_DOC_FOLDER }}
+    creates={{ EXAMPLES_DOC_FOLDER }}/{{ EXAMPLES_OUTPUT_NAME }}
+  sudo: yes
+
 # This task is not very robust, but I can't think of a better way of doing
 # this.
-
 - name: Copy fidimag examples to a more accessible location.
   command: cp -r /opt/fidimag/examples {{ FIDIMAG_EXAMPLES_FOLDER }}
     creates={{ FIDIMAG_EXAMPLES_FOLDER }}

roles/magpar_examples/tasks/main.yml

@@ -2,6 +2,20 @@
 # This Ansible role prepares Magpar examples and places some documentation on
 # the Desktop.
 
+# Create examples documentation.
+- name: Create documentation build directory.
+  file:
+    name={{ EXAMPLES_DOC_FOLDER }}
+    state=directory
+  sudo: yes
+
+- name: Convert to HTML and place in the build directory.
+  shell: rst2html.py {{ EXAMPLES_RST_FILE }} {{ EXAMPLES_OUTPUT_NAME }}
+    chdir={{ EXAMPLES_DOC_FOLDER }}
+    creates={{ EXAMPLES_DOC_FOLDER }}/{{ EXAMPLES_OUTPUT_NAME }}
+  sudo: yes
+
+# Install examples
 - name: Download magpar examples tarball.
   get_url:
     url={{ MAGPAR_EXAMPLES_URL }}

roles/nmag_examples/tasks/main.yml

@@ -2,6 +2,19 @@
 # This Ansible role prepares Nmag examples and places some documentation on the
 # Desktop.
 
+# Create examples documentation.
+- name: Create documentation build directory.
+  file:
+    name={{ EXAMPLES_DOC_FOLDER }}
+    state=directory
+  sudo: yes
+
+- name: Convert to HTML and place in the build directory.
+  shell: rst2html.py {{ EXAMPLES_RST_FILE }} {{ EXAMPLES_OUTPUT_NAME }}
+    chdir={{ EXAMPLES_DOC_FOLDER }}
+    creates={{ EXAMPLES_DOC_FOLDER }}/{{ EXAMPLES_OUTPUT_NAME }}
+  sudo: yes
+
 # This following task is not very robust, but I can't think of a better way of
 # doing this.
 - name: Copy nmag examples to a more accessible location.

roles/oommf_examples/tasks/main.yml

@@ -2,6 +2,19 @@
 # This Ansible role prepares OOMMF examples and places some documentation on
 # the Desktop.
 
+# Create examples documentation.
+- name: Create documentation build directory.
+  file:
+    name={{ EXAMPLES_DOC_FOLDER }}
+    state=directory
+  sudo: yes
+
+- name: Convert to HTML and place in the build directory.
+  shell: rst2html.py {{ EXAMPLES_RST_FILE }} {{ EXAMPLES_OUTPUT_NAME }}
+    chdir={{ EXAMPLES_DOC_FOLDER }}
+    creates={{ EXAMPLES_DOC_FOLDER }}/{{ EXAMPLES_OUTPUT_NAME }}
+  sudo: yes
+
 # This task is not very robust, but I can't think of a better way of doing
 # this.
 - name: Copy oommf examples to a more accessible location.