install pyyaml in workflow, update configs to include language, add check in lint_config.py

Author: Jibola

.evergreen/config.yml

@@ -325,7 +325,7 @@ buildvariants:
         batchtime: 10080  # 1 week
 
   # TODO: INTPYTHON-668
-  # - name: test-chatgpt-retrieval-plugin-rhel
+  # - name: test-chatgpt-retrieval-plugin-python-rhel
   #   display_name: ChatGPT Retrieval Plugin
   #   tags: [python]
   #   expansions:
@@ -338,7 +338,7 @@ buildvariants:
   #       batchtime: 10080  # 1 week
 
   # TODO: INTPYTHON-669
-  # - name: test-llama-index-vectorstore-rhel
+  # - name: test-llama-index-vectorstore-python-rhel
   #   display_name: LlamaIndex RHEL Vector Store
   #   tags: [python]
   #   expansions:
@@ -351,7 +351,7 @@ buildvariants:
   #     # - name: test-llama-index-remote
   #     #   batchtime: 10080  # 1 week
 
-  - name: test-docarray-rhel
+  - name: test-docarray-python-rhel
     display_name: DocArray RHEL
     tags: [python]
     expansions:
@@ -362,7 +362,7 @@ buildvariants:
       - name: test-docarray-local
       - name: test-docarray-remote
 
-  - name: test-pymongo-voyageai-rhel
+  - name: test-pymongo-voyageai-python-rhel
     display_name: PyMongo-VoyageAI RHEL
     tags: [python]
     expansions:
@@ -373,8 +373,9 @@ buildvariants:
       - name: test-pymongo-voyageai-local
       - name: test-pymongo-voyageai-remote
 
-  - name: test-crewai-tools-rhel
+  - name: test-crewai-tools-python-rhel
     display_name: CrewAI-Tools Ubuntu
+    tags: [python]
     expansions:
       DIR: crewai-tools
     run_on:
@@ -383,7 +384,7 @@ buildvariants:
       - name: test-crewai-tools-local
       - name: test-crewai-tools-remote
 
-  - name: test-haystack-embeddings-rhel
+  - name: test-haystack-embeddings-python-rhel
     display_name: Haystack Embeddings RHEL
     tags: [python]
     expansions:
@@ -395,7 +396,7 @@ buildvariants:
       # TODO: INTPYTHON-465
       # - name: test-haystack-embeddings-remote
 
-  - name: test-haystack-fulltext-rhel
+  - name: test-haystack-fulltext-python-rhel
     display_name: Haystack FullText RHEL
     tags: [python]
     expansions:
@@ -407,7 +408,7 @@ buildvariants:
       # TODO: INTPYTHON-465
       # - name: test-haystack-fulltext-remote
 
-  - name: test-langchaingo-ubuntu
+  - name: test-langchaingo-golang-ubuntu
     display_name: LangchainGo Ubuntu2204
     tags: [golang]
     expansions:

.evergreen/lint_config.py

@@ -25,9 +25,10 @@ def load_yaml_file(file_path: str) -> Dict[Any, Any]:
         return yaml.safe_load(file) or {}
 
 
-def check_buildvariant_tags(data: Dict[Any, Any]) -> List[str]:
+def check_buildvariants(data: Dict[Any, Any]) -> List[str]:
     """
-    Check if buildvariant tasks contain at least one required language tag.
+    Check if buildvariant tasks contain at least one required language tag
+    as well as the language within the buildvariant name.
 
     Example Buildvariant structure in YAML:
     buildvariants:
@@ -57,21 +58,34 @@ def check_buildvariant_tags(data: Dict[Any, Any]) -> List[str]:
 
     for i, buildvariant in enumerate(buildvariants):
         if not isinstance(buildvariant, dict):
-            errors.append(f"buildvariants[{i}] should be a dictionary")
+            errors.append(f"buildvariants[{i}] should contain sub-fields")
             continue
 
-        buildvariant_name = buildvariant.get("display_name", f"buildvariant_{i}")
+        buildvariant_name = buildvariant.get("name", "")
+        if not buildvariant_name:
+            errors.append(f"buildvariants[{i}] is missing 'name'")
+            continue
+        else:
+            if all([f"-{lang}-" not in buildvariant_name for lang in VALID_LANGUAGES]):
+                errors.append(
+                    f"buildvariant '{buildvariant_name}' should contain one"
+                    f" '-[{', '.join(VALID_LANGUAGES)}]-' in its name"
+                    f"got: {buildvariant_name}",
+                )
+
+        buildvariant_display_name = buildvariant.get("display_name", buildvariant_name)
+
         tags = buildvariant.get("tags", [])
 
         if not isinstance(tags, list) or len(tags) != 1:
             errors.append(
-                f"'tags' in buildvariant '{buildvariant_name}' should be a list of size 1"
+                f"'tags' in buildvariant '{buildvariant_display_name}' should be a list of size 1"
             )
             continue
 
         if tags[0] not in VALID_LANGUAGES:
             errors.append(
-                f"buildvariant '{buildvariant_name}' has invalid tag '{tags[0]}'. "
+                f"buildvariant '{buildvariant_display_name}' has invalid tag '{tags[0]}'. "
                 f"Valid tags are: {', '.join(VALID_LANGUAGES)}"
             )
     return errors
@@ -85,7 +99,7 @@ def main():
     if not data:
         raise FileNotFoundError(f"Failed to load or parse {CONFIG_YML}")
 
-    errors = check_buildvariant_tags(data)
+    errors = check_buildvariants(data)
 
     if errors:
         logger.error("❌ Errors found in %s:", CONFIG_YML)

.github/workflows/lint.yml

@@ -23,7 +23,7 @@ jobs:
           python-version: '3.10'
       - name: Install Python dependencies
         run: |
-          python -m pip install -U pip pre-commit
+          python -m pip install -U pip pre-commit pyyaml
       - name: Run linters
         run: |
           pre-commit run --hook-stage=manual --all-files