Miscellaneous maintenance of EVG config (#1714)

* Remove obsolete curl_args variable expansion

* Bump latest CMake version to 3.30.2

* Update shrub.py: 3.0.4 -> 3.1.3

* Attempt find_cmake_latest in an EVG setup function before compile and build scripts

* CDRIVER-4645 Remove obsolete and unused debug-compile-* tasks

Author: eramongodb

.evergreen/config_generator/components/c_std_compile.py

@@ -2,6 +2,8 @@
 from shrub.v3.evg_command import EvgCommandType
 from shrub.v3.evg_task import EvgTaskRef
 
+from config_generator.components.funcs.find_cmake_latest import FindCMakeLatest
+
 from config_generator.etc.distros import find_large_distro
 from config_generator.etc.distros import make_distro_str
 from config_generator.etc.distros import to_cc
@@ -80,7 +82,10 @@ def tasks():
                     name=task_name,
                     run_on=distro.name,
                     tags=tags + [f'std-c{std}'],
-                    commands=[StdCompile.call(vars=compile_vars | with_std)],
+                    commands=[
+                        FindCMakeLatest.call(),
+                        StdCompile.call(vars=compile_vars | with_std)
+                    ],
                 )
             )
 

.evergreen/config_generator/components/funcs/find_cmake_latest.py

@@ -0,0 +1,31 @@
+from shrub.v3.evg_command import EvgCommandType
+
+from config_generator.etc.function import Function
+from config_generator.etc.utils import bash_exec
+
+
+class FindCMakeLatest(Function):
+    '''
+    Call `find_cmake_latest` in an attempt to download-and-build the latest
+    CMake version as a Setup task with `retry_on_failure: true` prior to
+    subsequent use of `find-cmake-latest.sh` by compile and build scripts.
+    '''
+
+    name = 'find-cmake-latest'
+    command_type = EvgCommandType.SETUP
+    commands = [
+        bash_exec(
+            command_type=command_type,
+            retry_on_failure=True,
+            working_dir='mongoc',
+            script='. .evergreen/scripts/find-cmake-latest.sh && find_cmake_latest'
+        ),
+    ]
+
+    @classmethod
+    def call(cls, **kwargs):
+        return cls.default_call(**kwargs)
+
+
+def functions():
+    return FindCMakeLatest.defn()

.evergreen/config_generator/components/loadbalanced.py

@@ -5,6 +5,7 @@
 from config_generator.components.funcs.bootstrap_mongo_orchestration import BootstrapMongoOrchestration
 from config_generator.components.funcs.fetch_build import FetchBuild
 from config_generator.components.funcs.fetch_det import FetchDET
+from config_generator.components.funcs.find_cmake_latest import FindCMakeLatest
 from config_generator.components.funcs.run_simple_http_server import RunSimpleHTTPServer
 from config_generator.components.funcs.run_tests import RunTests
 from config_generator.components.funcs.upload_build import UploadBuild
@@ -76,6 +77,7 @@ def tasks():
         run_on=find_large_distro(_DISTRO_NAME).name,
         tags=['loadbalanced', _DISTRO_NAME, _COMPILER],
         commands=[
+            FindCMakeLatest.call(),
             bash_exec(
                 command_type=EvgCommandType.TEST,
                 env={

.evergreen/config_generator/components/make_docs.py

@@ -2,6 +2,8 @@
 from shrub.v3.evg_command import s3_put
 from shrub.v3.evg_task import EvgTask
 
+from config_generator.components.funcs.find_cmake_latest import FindCMakeLatest
+
 from config_generator.etc.function import Function
 from config_generator.etc.function import merge_defns
 from config_generator.etc.utils import bash_exec
@@ -132,6 +134,7 @@ def tasks():
         EvgTask(
             name="make-docs",
             commands=[
+                FindCMakeLatest.call(),
                 MakeDocs.call(),
                 UploadDocs.call(),
                 UploadManPages.call(),

.evergreen/config_generator/components/mock_server.py

@@ -3,6 +3,7 @@
 from shrub.v3.evg_task import EvgTaskRef
 
 from config_generator.components.funcs.fetch_det import FetchDET
+from config_generator.components.funcs.find_cmake_latest import FindCMakeLatest
 from config_generator.components.funcs.run_simple_http_server import RunSimpleHTTPServer
 from config_generator.etc.utils import Task
 from config_generator.etc.utils import bash_exec
@@ -16,6 +17,7 @@ def tasks():
                 # Call fetch-det to define PYTHON3_BINARY expansion required for run-simple-http-server.
                 FetchDET.call(),
                 RunSimpleHTTPServer.call(),
+                FindCMakeLatest.call(),
                 bash_exec(
                     command_type=EvgCommandType.TEST,
                     add_expansions_to_env=True,

.evergreen/config_generator/components/openssl_static_compile.py

@@ -2,6 +2,8 @@
 from shrub.v3.evg_command import EvgCommandType
 from shrub.v3.evg_task import EvgTaskRef
 
+from config_generator.components.funcs.find_cmake_latest import FindCMakeLatest
+
 from config_generator.etc.distros import find_large_distro
 from config_generator.etc.distros import make_distro_str
 from config_generator.etc.distros import to_cc
@@ -69,7 +71,10 @@ def tasks():
                 name=task_name,
                 run_on=distro.name,
                 tags=tags,
-                commands=[StaticOpenSSLCompile.call(vars=compile_vars)],
+                commands=[
+                    FindCMakeLatest.call(),
+                    StaticOpenSSLCompile.call(vars=compile_vars),
+                ],
             )
         )
 

.evergreen/config_generator/components/scan_build.py

@@ -3,6 +3,8 @@
 from shrub.v3.evg_command import FunctionCall
 from shrub.v3.evg_task import EvgTaskRef
 
+from config_generator.components.funcs.find_cmake_latest import FindCMakeLatest
+
 from config_generator.etc.distros import find_large_distro
 from config_generator.etc.distros import make_distro_str
 from config_generator.etc.distros import to_cc
@@ -74,6 +76,7 @@ def tasks():
                 run_on=distro.name,
                 tags=tags,
                 commands=[
+                    FindCMakeLatest.call(),
                     ScanBuild.call(vars=compile_vars),
                     FunctionCall(func='upload scan artifacts'),
                 ],

.evergreen/config_generator/etc/compile.py

@@ -3,6 +3,7 @@
 from config_generator.etc.distros import to_cc
 from config_generator.etc.utils import Task
 
+from config_generator.components.funcs.find_cmake_latest import FindCMakeLatest
 from config_generator.components.funcs.upload_build import UploadBuild
 
 
@@ -35,6 +36,7 @@ def generate_compile_tasks(SSL, TAG, SASL_TO_FUNC, MATRIX, MORE_TAGS=None, MORE_
                 task_name = f'{tag}-{task_name}'
 
             commands = []
+            commands.append(FindCMakeLatest.call())
             commands.append(SASL_TO_FUNC[sasl].call(vars=compile_vars))
             commands.append(UploadBuild.call())
 

.evergreen/config_generator/etc/utils.py

@@ -34,10 +34,11 @@ def bash_exec(
     include_expansions_in_env: Iterable[str] | None = None,
     working_dir: str | None = None,
     command_type: EvgCommandType | None = None,
+    retry_on_failure: bool | None = None,
     env: Mapping[str, str] | None = None,
     **kwargs,
 ):
-    return subprocess_exec(
+    ret = subprocess_exec(
         binary="bash",
         args=["-c", dedent(script)],
         include_expansions_in_env=list(include_expansions_in_env) if include_expansions_in_env else None,
@@ -47,6 +48,11 @@ def bash_exec(
         **kwargs,
     )
 
+    if retry_on_failure is not None:
+        ret.params |= {"retry_on_failure": retry_on_failure}
+
+    return ret
+
 
 def all_components():
     res = []

.evergreen/generated_configs/functions.yml

@@ -248,6 +248,16 @@ functions:
             for file in $(find .evergreen/scripts -type f); do
                 chmod +rx "$file" || exit
             done
+  find-cmake-latest:
+    - command: subprocess.exec
+      type: setup
+      params:
+        binary: bash
+        working_dir: mongoc
+        retry_on_failure: true
+        args:
+          - -c
+          - . .evergreen/scripts/find-cmake-latest.sh && find_cmake_latest
   kms-divergence-check:
     - command: subprocess.exec
       type: test