qontract-reconcile 0.10.1rc940__py3-none-any.whl → 0.10.1rc941__py3-none-any.whl

{qontract_reconcile-0.10.1rc940.dist-info → qontract_reconcile-0.10.1rc941.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qontract-reconcile
-Version: 0.10.1rc940
+Version: 0.10.1rc941
 Summary: Collection of tools to reconcile services with their desired state as defined in the app-interface DB.
 Home-page: https://github.com/app-sre/qontract-reconcile
 Author: Red Hat App-SRE Team

{qontract_reconcile-0.10.1rc940.dist-info → qontract_reconcile-0.10.1rc941.dist-info}/RECORD

@@ -31,7 +31,7 @@ reconcile/github_users.py,sha256=nfTq78QRONIfDVj-5O3bD6psllJjzWFnog-EJ1WqFPU,367
 reconcile/github_validator.py,sha256=cVTVxJIGR4a1Jz8wrdXEAb_CMpXUzvykVmUURX4cook,917
 reconcile/gitlab_fork_compliance.py,sha256=5joAIGOOLhHme1ipa7ZQeQkUOVe3dKbRO1wJtTwyNR4,4178
 reconcile/gitlab_housekeeping.py,sha256=5qIJPflQzwSg3iTSCw7ClEM4VHrn70WLXyYCX9vTZ7Y,22004
-reconcile/gitlab_labeler.py,sha256=a7HToXqv4S72TBp6Dmu2OkjjO60k81kH3B0J4UXHs3A,4768
+reconcile/gitlab_labeler.py,sha256=4xJHmVX155fclrHqkR926sL1GH6RTN5XfZ8PnqNXbRA,4534
 reconcile/gitlab_members.py,sha256=PrJE9OhDRdGG_gHM_77nQojLb4B18jtUu8DxgLsRS88,8417
 reconcile/gitlab_mr_sqs_consumer.py,sha256=O46mdziPgGOndbU-0_UJKJVUaiEoVzJPEgKm4_UvYoI,2571
 reconcile/gitlab_owners.py,sha256=sn9njaKOtqcvnhi2qtm-faAfAR4zNqflbSuusA9RUuI,13456
@@ -842,8 +842,8 @@ tools/test/test_qontract_cli.py,sha256=_D61RFGAN5x44CY1tYbouhlGXXABwYfxKSWSQx3Jr
 tools/test/test_saas_promotion_state.py,sha256=dy4kkSSAQ7bC0Xp2CociETGN-2aABEfL6FU5D9Jl00Y,6056
 tools/test/test_sd_app_sre_alert_report.py,sha256=v363r9zM7__0kR5K6mvJoGFcM9BvE33fWAayrqkpojA,2116
 tools/test/test_sre_checkpoints.py,sha256=SKqPPTl9ua0RFdSSofnoQX-JZE6dFLO3LRhfQzqtfh8,2607
-qontract_reconcile-0.10.1rc940.dist-info/METADATA,sha256=J7rHvi9BG3xcDI8XfR2-qBhCHm4A-q0RZ9GyVkmRF8k,2262
-qontract_reconcile-0.10.1rc940.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qontract_reconcile-0.10.1rc940.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc940.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc940.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc941.dist-info/METADATA,sha256=S6kotXcqOCrbf-Yc5aFLVQBxvJj3t-6msgOz0DZ1pBg,2262
+qontract_reconcile-0.10.1rc941.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qontract_reconcile-0.10.1rc941.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc941.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc941.dist-info/RECORD,,

reconcile/gitlab_labeler.py

@@ -1,6 +1,9 @@
 import logging
 import os
-from collections.abc import Iterable
+from collections.abc import (
+    Iterable,
+    Set,
+)
 
 from reconcile import queries
 from reconcile.gitlab_housekeeping import (
@@ -11,7 +14,6 @@ from reconcile.utils.gitlab_api import GitLabApi
 
 LABEL_COLOR = "#0000FF"  # Color blue in hex for labels
 QONTRACT_INTEGRATION = "gitlab-labeler"
-TEST_ON_RHEL8_AI = "test-on-rhel8-ai"
 
 
 def get_app_list() -> dict:
@@ -78,7 +80,7 @@ def guess_onboarding_status(
 
 def guess_labels(
     project_labels: Iterable[str], changed_paths: Iterable[str]
-) -> set[str]:
+) -> Set[str]:
     """
     Guess labels returns a list of labels from the project labels
     that contain parts of the changed paths.
@@ -127,14 +129,8 @@ def run(dry_run, gitlab_project_id=None, gitlab_merge_request_id=None) -> None:
         project_labels = gl.get_project_labels()
         merge_request = gl.get_merge_request(gitlab_merge_request_id)
         changed_paths = gl.get_merge_request_changed_paths(merge_request)
-        new_labels = guess_labels(project_labels, changed_paths)
-
-        author = merge_request.author["username"]
-        app_sre_team_members = [u.username for u in gl.get_app_sre_group_users()]
-        if author in app_sre_team_members:
-            new_labels.add(TEST_ON_RHEL8_AI)
-
-        labels_to_add = new_labels - set(merge_request.labels)
+        guessed_labels = guess_labels(project_labels, changed_paths)
+        labels_to_add = guessed_labels - set(merge_request.labels)
         labels_to_create = labels_to_add - project_labels
 
         # This integration cannot check dry-run mode as it's always running with