Merge pull request #42 from grycap/devel

Improve test

.github/workflows/main.yaml

@@ -35,7 +35,7 @@ jobs:
         run: pip3 install ansible molecule-plugins[docker] docker
 
       - name: Run Molecule tests.
-        run: molecule test
+        run: molecule test --all
         env:
           PY_COLORS: '1'
           ANSIBLE_FORCE_COLOR: '1'

defaults/main.yml

@@ -76,4 +76,6 @@ slurm_default_conf_options:
 slurm_conf_options: {}
 # SLURM configuration options for cgroup
 slurm_cgroup_conf_options:
-  CgroupPlugin: cgroup/v1
+  CgroupPlugin: cgroup/v1
+# Add extra nodes to the /etc/hosts (elastic version)
+add_extra_hosts: true

molecule/cluster/converge.yml

@@ -0,0 +1,23 @@
+---
+- name: Converge
+  hosts: all
+  become: true
+
+  tasks:
+
+    - name: "Include grycap.slurm"
+      include_role:
+        name: "ansible-role-slurm"
+      vars:
+        slurm_wn_cpus: 2
+        slurm_wn_mem: 1048576
+        slurm_wn_gres: "gpu:tesla:2"
+        slurm_server_name: slurmserver
+        slurm_wn_ips: "{{ groups['wn'] | map('extract', hostvars,'facter_ipaddress') | list }}"
+        slurm_vnode_prefix: vnode-
+        max_number_of_nodes: 1
+        drmaa_lib_install: true
+        drmaa_lib_version: 1.1.4
+        slurm_version: 21.08.8
+        add_extra_hosts: false
+

molecule/cluster/molecule.yml

@@ -0,0 +1,61 @@
+---
+scenario:
+  name: cluster
+  test_sequence:
+    - dependency
+    - destroy
+    - create
+    - prepare
+    - converge
+    # - idempotence
+    - verify
+    - destroy
+dependency:
+  name: galaxy
+driver:
+  name: docker
+verifier:
+  name: ansible
+platforms:
+  - name: slurmserver
+    image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos8}-ansible:latest"
+    command: ${MOLECULE_DOCKER_COMMAND:-""}
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
+    cgroupns_mode: host
+    privileged: true
+    pre_build_image: true
+    groups:
+      - front
+    networks:
+      - name: "slurm"
+    network_mode: "slurm"
+    published_ports:
+      - 6818/tcp
+      - 6817/tcp
+  - name: vnode-1
+    image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos8}-ansible:latest"
+    command: ${MOLECULE_DOCKER_COMMAND:-""}
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
+    cgroupns_mode: host
+    privileged: true
+    pre_build_image: true
+    groups:
+      - wn
+    networks:
+      - name: "slurm"
+    network_mode: "slurm"
+    published_ports:
+      - 6818/tcp
+      - 6817/tcp
+provisioner:
+  name: ansible
+  playbooks:
+    converge: ${MOLECULE_PLAYBOOK:-converge.yml}
+  inventory:
+    group_vars:
+      front:
+        slurm_type_of_node: "front"
+      wn:
+        slurm_type_of_node: "wn"

molecule/default/prepare.yml → molecule/cluster/prepare.yml

@@ -8,3 +8,6 @@
       apt:
         update_cache: yes
       when: ansible_os_family == "Debian"
+
+  roles:
+    - role: kevincoakley.facter

molecule/default/requirements.yml → molecule/cluster/requirements.yml

@@ -1,3 +1,4 @@
 - name: geerlingguy.ntp
 - name: grycap.ssh
 - name: grycap.munge
+- name: kevincoakley.facter

molecule/default/verify.yml → molecule/cluster/verify.yml

@@ -11,6 +11,6 @@
 
     - name: Check service running
       fail:
-        msg: "Error getting node info"
-      when:
-        - "'NodeName=vnode-1' not in nodes.stdout"
+        msg: "Error getting node IDLE state"
+      when: "'NodeName=vnode-1' not in nodes.stdout or 'State=IDLE' not in nodes.stdout" 
+

tasks/front.yaml

@@ -8,6 +8,7 @@
           item="{{slurm_vnode_prefix}}${i}";
           grep -q "\<${item}\>" /etc/hosts || echo "127.0.0.1 ${item}.localdomain ${item}" >> /etc/hosts;
         done
+    when: add_extra_hosts
 
   - name: Create the slurm.conf file
     template: dest={{ SLURM_CONF_DIR }}/slurm.conf src=slurm.conf.j2