From ae539f592891aa7e3753288c6f5ae1bf9e256147 Mon Sep 17 00:00:00 2001
From: Vasileios Karakasis <karakasis@cscs.ch>
Date: Wed, 10 Apr 2019 11:24:11 +0200
Subject: [PATCH 1/3] Disable running modified tests on Daint

- Temporarily due to upgrade.
---
 ci-scripts/ci-runner.bash | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ci-scripts/ci-runner.bash b/ci-scripts/ci-runner.bash
index 76cfc415b5..46c075747c 100644
--- a/ci-scripts/ci-runner.bash
+++ b/ci-scripts/ci-runner.bash
@@ -194,9 +194,13 @@ else
     fi
 
     # Find modified or added user checks
+    if [[ $(hostname) =~ daint ]]; then
+        # Temporarily disable running modified checks on Daint
+        userchecks=""
+    fi
+
     userchecks=( $(git diff origin/master...HEAD --name-only --oneline --no-merges | \
                    grep -e '^cscs-checks/.*\.py') )
-
     if [ ${#userchecks[@]} -ne 0 ]; then
         userchecks_path=""
         for check in ${userchecks[@]}; do

From ebd4606c774acbea755a88722298b855d56c34ee Mon Sep 17 00:00:00 2001
From: Vasileios Karakasis <karakasis@cscs.ch>
Date: Wed, 10 Apr 2019 11:44:26 +0200
Subject: [PATCH 2/3] Address PR comments

---
 ci-scripts/ci-runner.bash | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ci-scripts/ci-runner.bash b/ci-scripts/ci-runner.bash
index 46c075747c..37e05747a0 100644
--- a/ci-scripts/ci-runner.bash
+++ b/ci-scripts/ci-runner.bash
@@ -194,13 +194,13 @@ else
     fi
 
     # Find modified or added user checks
+    userchecks=( $(git diff origin/master...HEAD --name-only --oneline --no-merges | \
+                   grep -e '^cscs-checks/.*\.py') )
     if [[ $(hostname) =~ daint ]]; then
         # Temporarily disable running modified checks on Daint
         userchecks=""
     fi
 
-    userchecks=( $(git diff origin/master...HEAD --name-only --oneline --no-merges | \
-                   grep -e '^cscs-checks/.*\.py') )
     if [ ${#userchecks[@]} -ne 0 ]; then
         userchecks_path=""
         for check in ${userchecks[@]}; do

From 86a9ec2b4a3ce84d9c1ecb2394a15f31ce4e8b6e Mon Sep 17 00:00:00 2001
From: Vasileios Karakasis <karakasis@cscs.ch>
Date: Wed, 10 Apr 2019 13:50:52 +0200
Subject: [PATCH 3/3] Fix CI runner script + Dom config

- Temporarily remove `PrgEnv-pgi` from Dom
---
 ci-scripts/ci-runner.bash | 4 ++--
 config/cscs.py            | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ci-scripts/ci-runner.bash b/ci-scripts/ci-runner.bash
index 37e05747a0..a10977653c 100644
--- a/ci-scripts/ci-runner.bash
+++ b/ci-scripts/ci-runner.bash
@@ -197,8 +197,8 @@ else
     userchecks=( $(git diff origin/master...HEAD --name-only --oneline --no-merges | \
                    grep -e '^cscs-checks/.*\.py') )
     if [[ $(hostname) =~ daint ]]; then
-        # Temporarily disable running modified checks on Daint
-        userchecks=""
+        # FIXME: temporarily disable running modified checks on Daint
+        userchecks=()
     fi
 
     if [ ${#userchecks[@]} -ne 0 ]; then
diff --git a/config/cscs.py b/config/cscs.py
index 842a44445d..6bf83d1b80 100644
--- a/config/cscs.py
+++ b/config/cscs.py
@@ -61,12 +61,13 @@ class ReframeSettings:
                 'modules_system': 'tmod',
                 'resourcesdir': '/apps/common/UES/reframe/resources',
                 'partitions': {
+                    # FIXME: temporarily disable PrgEnv-pgi on all partitions
                     'login': {
                         'scheduler': 'local',
                         'modules': [],
                         'access':  [],
                         'environs': ['PrgEnv-cray', 'PrgEnv-gnu',
-                                     'PrgEnv-intel', 'PrgEnv-pgi'],
+                                     'PrgEnv-intel'],
                         'descr': 'Login nodes',
                         'max_jobs': 4
                     },
@@ -76,7 +77,7 @@ class ReframeSettings:
                         'modules': ['daint-gpu'],
                         'access':  ['--constraint=gpu'],
                         'environs': ['PrgEnv-cray', 'PrgEnv-gnu',
-                                     'PrgEnv-intel', 'PrgEnv-pgi'],
+                                     'PrgEnv-intel'],
                         'descr': 'Hybrid nodes (Haswell/P100)',
                         'max_jobs': 100,
                         'resources': {
@@ -89,7 +90,7 @@ class ReframeSettings:
                         'modules': ['daint-mc'],
                         'access':  ['--constraint=mc'],
                         'environs': ['PrgEnv-cray', 'PrgEnv-gnu',
-                                     'PrgEnv-intel', 'PrgEnv-pgi'],
+                                     'PrgEnv-intel'],
                         'descr': 'Multicore nodes (Broadwell)',
                         'max_jobs': 100,
                         'resources': {