containerize: fix concretization -> concretizer (spack#31594) (spack#142

)

* containerize: fix concretization -> concretizer (spack#31594)

* Move crtm-fix and jedi-cmake into builtin repo

FMS and CRTM, both in builtin, have dependencies on jedi-cmake and crtm-fix respectively.

Longer term crtm-fix will be moved into builtin (using git-lfs?) but the package isn't stable.

builtin packages should not have dependencies

Co-authored-by: Harmen Stoppels <harmenstoppels@gmail.com>

lib/spack/docs/containers.rst

@@ -59,7 +59,7 @@ other techniques to minimize the size of the final image:
    &&   echo "  specs:" \
    &&   echo "  - gromacs+mpi" \
    &&   echo "  - mpich" \
-   &&   echo "  concretizer: together" \
+   &&   echo "  concretizer:" \
    &&   echo "    unify: true" \
    &&   echo "  config:" \
    &&   echo "    install_tree: /opt/software" \

lib/spack/spack/container/__init__.py

@@ -55,13 +55,13 @@ def validate(configuration_file):
             warnings.warn(msg.format(subsection, configuration_file))
             env_dict.pop(subsection)
 
-    # Set the default value of the concretization strategy to "together" and
+    # Set the default value of the concretization strategy to unify and
     # warn if the user explicitly set another value
-    env_dict.setdefault('concretization', 'together')
-    if env_dict['concretization'] != 'together':
-        msg = ('the "concretization" attribute of the environment is set '
-               'to "{0}" [the advised value is instead "together"]')
-        warnings.warn(msg.format(env_dict['concretization']))
+    env_dict.setdefault('concretizer', {'unify': True})
+    if not env_dict['concretizer']['unify'] is True:
+        warnings.warn('"concretizer:unify" is not set to "true", which means the '
+                      'generated image may contain different variants of the same '
+                      'packages. Set to "true" to get a consistent set of packages.')
 
     # Check if the install tree was explicitly set to a custom value and warn
     # that it will be overridden

lib/spack/spack/test/container/images.py

@@ -31,7 +31,7 @@ def test_package_info(image):
 
 @pytest.mark.parametrize('extra_config,expected_msg', [
     ({'modules': {'enable': ['tcl']}}, 'the subsection "modules" in'),
-    ({'concretization': 'separately'}, 'the "concretization" attribute'),
+    ({'concretizer': {'unify': False}}, '"concretizer:unify" is not set to "true"'),
     ({'config': {'install_tree': '/some/dir'}},
      'the "config:install_tree" attribute has been set'),
     ({'view': '/some/dir'}, 'the "view" attribute has been set')