[feat] Build configuration incrementally by allowing to combine multiple configuration files

ci-scripts/ci-runner.bash

@@ -42,7 +42,7 @@ checked_exec()
 run_tutorial_checks()
 {
     export RFM_AUTODETECT_XTHOSTNAME=1
-    cmd="./bin/reframe -C tutorials/config/settings.py -J account=jenscscs \
+    cmd="./bin/reframe -C tutorials/config/daint_ext.py -J account=jenscscs \
 --save-log-files --flex-alloc-nodes=2 -r -x HelloThreadedExtendedTest|BZip2.*Check $@"
     echo "[INFO] Running tutorial checks with \`$cmd'"
     checked_exec $cmd
@@ -148,6 +148,11 @@ elif [ $CI_TUTORIAL -eq 1 ]; then
             tutorialchecks_path="${tutorialchecks_path} -c ${check}"
         done
 
+        if [[ $(hostname) =~ daint ]]; then
+            echo "[INFO] Applying tutorial patch for daint"
+            patch -s -p0 < ci-scripts/tutorials.patch
+        fi
+
         echo "[INFO] Modified tutorial checks"
         echo ${tutorialchecks_path}
         for i in ${!invocations[@]}; do

ci-scripts/dockerfiles/tutorials.dockerfile

@@ -37,4 +37,4 @@ RUN echo '. /usr/local/lmod/lmod/init/profile && . /home/rfmuser/spack/share/spa
 
 ENV BASH_ENV /home/rfmuser/setup.sh
 
-CMD ["/bin/bash", "-c", "./bin/reframe -r -C tutorials/config/settings.py -R -c tutorials/build_systems --system tutorials-docker"]
+CMD ["/bin/bash", "-c", "./bin/reframe -r -C tutorials/config/lmodsys.py -R -c tutorials/build_systems"]

ci-scripts/tutorials.patch

@@ -0,0 +1,68 @@
+diff -Nru tutorials.orig/advanced/affinity/affinity.py tutorials/advanced/affinity/affinity.py
+--- tutorials.orig/advanced/affinity/affinity.py	2022-11-17 19:13:28.000000000 +0100
++++ tutorials/advanced/affinity/affinity.py	2022-11-17 19:12:26.000000000 +0100
+@@ -26,3 +26,11 @@
+     @sanity_function
+     def validate_test(self):
+         return sn.assert_found(r'CPU affinity', self.stdout)
++
++    @run_before('compile')
++    def prgenv_nvidia_workaround(self):
++        ce = self.current_environ.name
++        if ce == 'nvidia':
++            self.build_system.cppflags += [
++                '-D__GCC_ATOMIC_TEST_AND_SET_TRUEVAL'
++            ]
+diff -Nru tutorials.orig/basics/hello/hello2.py tutorials/basics/hello/hello2.py
+--- tutorials.orig/basics/hello/hello2.py	2022-11-17 19:13:28.000000000 +0100
++++ tutorials/basics/hello/hello2.py	2022-11-17 19:12:26.000000000 +0100
+@@ -13,6 +13,7 @@
+
+     valid_systems = ['*']
+     valid_prog_environs = ['*']
++    build_system = 'SingleSource'
+
+     @run_before('compile')
+     def set_sourcepath(self):
+@@ -21,3 +22,11 @@
+     @sanity_function
+     def assert_hello(self):
+         return sn.assert_found(r'Hello, World\!', self.stdout)
++
++    @run_before('compile')
++    def prgenv_nvidia_workaround(self):
++        ce = self.current_environ.name
++        if ce == 'nvidia' and self.lang=='cpp':
++            self.build_system.cppflags = [
++                '-D__GCC_ATOMIC_TEST_AND_SET_TRUEVAL'
++            ]
+diff -Nru tutorials.orig/basics/hellomp/hellomp1.py tutorials/basics/hellomp/hellomp1.py
+--- tutorials.orig/basics/hellomp/hellomp1.py	2022-11-17 19:13:28.000000000 +0100
++++ tutorials/basics/hellomp/hellomp1.py	2022-11-17 19:12:26.000000000 +0100
+@@ -25,3 +25,11 @@
+     @sanity_function
+     def assert_hello(self):
+         return sn.assert_found(r'Hello, World\!', self.stdout)
++
++    @run_before('compile')
++    def prgenv_nvidia_workaround(self):
++        ce = self.current_environ.name
++        if ce == 'nvidia':
++            self.build_system.cppflags += [
++                '-D__GCC_ATOMIC_TEST_AND_SET_TRUEVAL'
++            ]
+diff -Nru tutorials.orig/basics/hellomp/hellomp3.py tutorials/basics/hellomp/hellomp3.py
+--- tutorials.orig/basics/hellomp/hellomp3.py	2022-11-17 19:13:28.000000000 +0100
++++ tutorials/basics/hellomp/hellomp3.py	2022-11-17 19:12:26.000000000 +0100
+@@ -28,3 +28,11 @@
+         num_messages = sn.len(sn.findall(r'\[\s?\d+\] Hello, World\!',
+                                          self.stdout))
+         return sn.assert_eq(num_messages, 16)
++
++    @run_before('compile')
++    def prgenv_nvidia_workaround(self):
++        ce = self.current_environ.name
++        if ce == 'nvidia':
++            self.build_system.cppflags += [
++                '-D__GCC_ATOMIC_TEST_AND_SET_TRUEVAL'
++            ]

config/cscs-ci.py

@@ -143,65 +143,6 @@
                 }
             ]
         },
-        {
-            'name': 'generic',
-            'descr': 'Generic example system',
-            'partitions': [
-                {
-                    'name': 'default',
-                    'scheduler': 'local',
-                    'environs': [
-                        'builtin'
-                    ],
-                    'descr': 'Login nodes',
-                    'launcher': 'local'
-                }
-            ],
-            'hostnames': ['.*']
-        }
-    ],
-    'environments': [
-        {
-            'name': 'builtin',
-            'cc': 'cc',
-            'cxx': '',
-            'ftn': ''
-        },
-    ],
-    'logging': [
-        {
-            'handlers': [
-                {
-                    'type': 'file',
-                    'level': 'debug2',
-                    'format': '[%(asctime)s] %(levelname)s: %(check_info)s: %(message)s',   # noqa: E501
-                    'append': False
-                },
-                {
-                    'type': 'stream',
-                    'name': 'stdout',
-                    'level': 'info',
-                    'format': '%(message)s'
-                },
-                {
-                    'type': 'file',
-                    'name': 'reframe.out',
-                    'level': 'info',
-                    'format': '%(message)s',
-                    'append': False
-                }
-            ],
-            'handlers_perflog': [
-                {
-                    'type': 'filelog',
-                    'prefix': '%(check_system)s/%(check_partition)s',
-                    'level': 'info',
-                    'format': '%(check_job_completion_time)s|reframe %(version)s|%(check_info)s|jobid=%(check_jobid)s|num_tasks=%(check_num_tasks)s|%(check_perf_var)s=%(check_perf_value)s|ref=%(check_perf_ref)s (l=%(check_perf_lower_thres)s, u=%(check_perf_upper_thres)s)|%(check_perf_unit)s',   # noqa: E501
-                    'datefmt': '%FT%T%:z',
-                    'append': True
-                }
-            ]
-        }
     ],
     'general': [
         {