From 59e528d8d3d059d4cbcface20197563807b01ddb Mon Sep 17 00:00:00 2001
From: caubet_m <marc.caubet@psi.ch>
Date: Tue, 18 Jun 2019 09:45:31 +0200
Subject: [PATCH] Updated merlin6 account request

---
 .../requesting-merlin6-accounts.md            | 58 ++++++++++++++++---
 .../merlin6-slurm/slurm-basic-commands.md     | 13 +++++
 2 files changed, 62 insertions(+), 9 deletions(-)

diff --git a/pages/merlin6/accessing-merlin6/requesting-merlin6-accounts.md b/pages/merlin6/accessing-merlin6/requesting-merlin6-accounts.md
index ae642d3..6b4330b 100644
--- a/pages/merlin6/accessing-merlin6/requesting-merlin6-accounts.md
+++ b/pages/merlin6/accessing-merlin6/requesting-merlin6-accounts.md
@@ -1,5 +1,5 @@
 ---
-title: Requesting Merlin6 Accounts
+title: Requesting Accounts
 #tags:
 #keywords:
 last_updated: 13 June 2019
@@ -8,6 +8,16 @@ sidebar: merlin6_sidebar
 permalink: /merlin6/request-account.html
 ---
 
+# Requesting Accounts
+
+Requesting access to the cluster must be done through **[PSI Service Now](https://psi.service-now.com/psisp)** as an
+*Incident Request*. We are working in a form that will ease this process in the future.
+
+With the default ticket *priority* (*Low*), users may need to wait up to 56h until the have access to the cluster or to
+a new Unix Group.
+
+---
+
 ## Requesting Access to Merlin6
 
 PSI users with their Linux account belonging to the **svc-cluster_merlin6** group are allowed to use Merlin6.
@@ -62,15 +72,45 @@ Registration for **Merlin5** access *must be done* through **[PSI Service Now](h
    Thanks a lot,
    $Name $Surname
    ```
+
+Alternatively, if you want to request access for Merlin5 and Merlin6, you can request it in the same ticket as follows:
+* Use the template **[Requesting Access to Merlin6](##Requesting-Access-to-Merlin6)** 
+* Add the **``'svc-cluster_merlin5'``** Unix Group in the request (together with **``'svc-cluster_merlin6'``**)
+
 ---
 
 ## Requesting extra Unix groups
 
-* Some users may require to be added to some extra specific Unix groups.
-   * This will grant access to specific resources.
-      * In example, some BIO groups may belong to a specific BIO group for having access to the project area for that group.
-   * Supervisors should inform new users which extra groups are needed.
-* When requesting access to **[Merlin6](##Requesting-Access-to-Merlin6)** or **[Merlin5](##Requesting-Access-to-Merlin5)**, extra groups can be added in the same *Incident Request*
-   * Alternatively, this step can be done later in the future on a different **[PSI Service Now](https://psi.service-now.com/psisp)** ticket.
-* If you want to request access for Merlin5 and Merlin6
-   * Use the template **[Requesting Access to Merlin6](##Requesting-Access-to-Merlin6)** and add also the **``'svc-cluster_merlin5'``** Unix Group to the request.
+Some users may require to be added to some extra specific Unix groups.
+* This will grant access to specific resources.
+   * In example, some BIO groups may belong to a specific BIO group for having access to the project area for that group.
+* Supervisors should inform new users which extra groups are needed for their project(s).
+
+When requesting access to **[Merlin6](##Requesting-Access-to-Merlin6)** or **[Merlin5](##Requesting-Access-to-Merlin5)**, 
+these extra Unix Groups can be added in the same *Incident Request*
+
+Alternatively, this step can be done later in the future on a different **[PSI Service Now](https://psi.service-now.com/psisp)** ticket.
+
+* Please open a ticket as *Incident Request*, with subject:
+
+   ```bash
+   Subject: [Unix Group] Access Request for user '$username'
+   ```
+
+* Text content (please use always this template):
+
+   ```bash
+   Dear HelpDesk,
+
+   my name is $Name $Surname with PSI username $username and I would like to be added to the following Unix groups:
+    * '$unix_group_1'
+    * '$unix_group_2'
+    * ...
+    * '$unix_group_N'
+
+   Thanks a lot,
+   $Name $Surname
+   ```
+
+**Important note**: Requesting access to specific Unix Groups may require validation from the responsible of the Unix Group. If 
+multiple requests exist, it may take some time.
diff --git a/pages/merlin6/merlin6-slurm/slurm-basic-commands.md b/pages/merlin6/merlin6-slurm/slurm-basic-commands.md
index c5db257..5ed04b0 100644
--- a/pages/merlin6/merlin6-slurm/slurm-basic-commands.md
+++ b/pages/merlin6/merlin6-slurm/slurm-basic-commands.md
@@ -29,6 +29,19 @@ sshare -a        # to list shares of associations to a cluster
 sprio -l         # to view the factors that comprise a job's scheduling priority (add -u <username> for filtering user)
 ```
 
+---
+
+## Slurm CPU Template (Mandatory Settings)
+
+The following Slurm template shows mandatory settings that must be included in your batch scripts:
+
+```bash
+#!/bin/sh
+#SBATCH --partition=<general|daily|hourly>  # name of slurm partition to submit. General is the 'default'.
+#SBATCH --constraint=<mc|gpu>               # For CPU, always set it to 'mc'. For GPU, set it to 'gpu' (only 'merlin6-gpu' accounts can submit there)
+
+
+
 ---
 
 ## Basic slurm example