Copy of CI from master to 2020

[alexxy/gromacs.git] / admin / containers / utility.py

diff --git a/admin/containers/utility.py b/admin/containers/utility.py
index e612f7b62823b046a5e7791d790ce674dae7fe8b..473881e4af4bf617b438939f6247eb6e91a25448 100644 (file)
--- a/admin/containers/utility.py
+++ b/admin/containers/utility.py
@@ -61,12 +61,12 @@ parser.add_argument('--cmake', type=str, default='3.9.6',
                     choices=['3.9.6', '3.11.4', '3.15.7'],
                     help='Selection of CMake version to provide to base image')
 compiler_group = parser.add_mutually_exclusive_group()
-compiler_group.add_argument('--gnu', type=int, nargs='?', const=7, default=7,
+compiler_group.add_argument('--gcc', type=int, nargs='?', const=7, default=7,
                             choices=[5, 6, 7, 8, 9],
                             help='Select GNU compiler tool chain. (Default) '
                                  'Some checking is implemented to avoid incompatible combinations')
-compiler_group.add_argument('--llvm', type=int, nargs='?', const=7, default=None,
-                            choices=[3, 6, 7, 8],
+compiler_group.add_argument('--llvm', type=str, nargs='?', const='7', default=None,
+                            choices=['3.6', '6', '7', '8'],
                             help='Select LLVM compiler tool chain. '
                                  'Some checking is implemented to avoid incompatible combinations')
 compiler_group.add_argument('--icc', type=int, nargs='?', const=19, default=None,