Merge branch 'main' into zeid/bug-1744327-refactor-workers

Author: zzzeid

.circleci/config.yml

@@ -112,6 +112,9 @@ jobs:
               elif [[ ${CIRCLE_BRANCH} == develop ]]; then
                 docker tag "mozilla/landoapi" "${DOCKERHUB_REPO}:develop-latest"
                 docker push "${DOCKERHUB_REPO}:develop-latest"
+              elif [[ ${CIRCLE_BRANCH} == staging ]]; then
+                docker tag "mozilla/landoapi" "${DOCKERHUB_REPO}:staging-latest"
+                docker push "${DOCKERHUB_REPO}:staging-latest"
               fi
             fi
 

landoapi/api/uplift.py

@@ -9,7 +9,6 @@
 
 from landoapi import auth
 from landoapi.phabricator import PhabricatorClient
-from landoapi.projects import get_relman_group_phid
 from landoapi.repos import get_repos_for_env
 from landoapi.transplants import convert_path_id_to_phid
 from landoapi.uplift import (
@@ -90,19 +89,6 @@ def create(data):
             type="https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/404",
         )
 
-    # Get the `#release-managers` group PHID for requesting review.
-    relman_phid = get_relman_group_phid(phab)
-    if not relman_phid:
-        return problem(
-            500,
-            "#release-managers group not found.",
-            (
-                "The RelMan review group could not be found. This is a server-side "
-                "issue, please file a bug."
-            ),
-            type="https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/404",
-        )
-
     landing_path = convert_path_id_to_phid(landing_path, revision_data)
     commit_stack = []
     for rev_id, _diff_id in landing_path:
@@ -124,7 +110,6 @@ def create(data):
                 revision,
                 diff,
                 parent_phid,
-                relman_phid,
                 target_repository,
             )
             commit_stack.append(rev)

landoapi/models/revisions.py

@@ -348,11 +348,6 @@ class DiffWarning(Base):
     # The "type" of warning. This is mainly to group warnings when querying the API.
     group = db.Column(db.Enum(DiffWarningGroup), nullable=False)
 
-    # The code freeze dates generally correspond to PST work days.
-    @property
-    def code_freeze_offset(self) -> str:
-        return "-0800"
-
     def serialize(self):
         """Return a JSON serializable dictionary."""
         return {

landoapi/transplants.py

@@ -1,4 +1,4 @@
-# This Source Code Form is subject to the terms of the Mozilla Publc
+# This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 import functools
@@ -41,6 +41,9 @@
     defaults=(None, None, None, None, False),
 )
 
+# The code freeze dates generally correspond to PST work days.
+CODE_FREEZE_OFFSET = "-0800"
+
 
 def tokens_are_equal(t1, t2):
     """Return whether t1 and t2 are equal.
@@ -330,14 +333,14 @@ def warning_code_freeze(*, repo, **kwargs):
 
     today = datetime.now(tz=timezone.utc)
     freeze_date = datetime.strptime(
-        f"{freeze_date_str} {DiffWarning.code_freeze_offset}",
+        f"{freeze_date_str} {CODE_FREEZE_OFFSET}",
         "%Y-%m-%d %z",
     ).replace(tzinfo=timezone.utc)
     if today < freeze_date:
         return
 
     merge_date = datetime.strptime(
-        f"{merge_date_str} {DiffWarning.code_freeze_offset}",
+        f"{merge_date_str} {CODE_FREEZE_OFFSET}",
         "%Y-%m-%d %z",
     ).replace(tzinfo=timezone.utc)
 

landoapi/uplift.py

@@ -203,7 +203,6 @@ def create_uplift_revision(
     source_revision: dict,
     source_diff: dict,
     parent_phid: Optional[str],
-    relman_phid: str,
     target_repository: dict,
 ) -> dict[str, str]:
     """Create a new revision on a repository, cloning a diff from another repo.
@@ -278,11 +277,6 @@ def create_uplift_revision(
         # Copy title & summary from source revision.
         {"type": "title", "value": phab.expect(source_revision, "fields", "title")},
         {"type": "summary", "value": summary},
-        # Set release managers as reviewers.
-        {
-            "type": "reviewers.add",
-            "value": [f"blocking({relman_phid})"],
-        },
         # Copy Bugzilla id.
         {
             "type": "bugzilla.bug-id",

tests/conftest.py

@@ -21,7 +21,7 @@
 from landoapi.app import construct_app, load_config, SUBSYSTEMS
 from landoapi.cache import cache, cache_subsystem
 from landoapi.mocks.auth import MockAuth0, TEST_JWKS
-from landoapi.models.revisions import DiffWarning, Revision
+from landoapi.models.revisions import Revision
 from landoapi.phabricator import PhabricatorClient
 from landoapi.projects import (
     CHECKIN_PROJ_SLUG,
@@ -32,7 +32,7 @@
 from landoapi.repos import Repo, SCM_LEVEL_3
 from landoapi.storage import db as _db, db_subsystem
 from landoapi.tasks import celery
-from landoapi.transplants import tokens_are_equal
+from landoapi.transplants import tokens_are_equal, CODE_FREEZE_OFFSET
 
 from tests.factories import TransResponseFactory
 from tests.mocks import PhabricatorDouble, TreeStatusDouble
@@ -431,7 +431,7 @@ def register_codefreeze_uri(request_mocker):
 
 @pytest.fixture
 def codefreeze_datetime(request_mocker):
-    utc_offset = DiffWarning.code_freeze_offset
+    utc_offset = CODE_FREEZE_OFFSET
     dates = {
         "today": datetime(2000, 1, 5, 0, 0, 0, tzinfo=timezone.utc),
         f"two_days_ago {utc_offset}": datetime(2000, 1, 3, 0, 0, 0),

tests/test_transplants.py

@@ -1,8 +1,9 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-import os
+from datetime import datetime, timezone
 from unittest.mock import MagicMock, patch
+import os
 
 import pytest
 
@@ -1076,3 +1077,9 @@ def _create_landing_job(
     job.status = LandingJobStatus.SUBMITTED
     db.session.commit()
     return job
+
+
+def test_codefreeze_datetime_mock(codefreeze_datetime):
+    dt = codefreeze_datetime()
+    assert dt.now(tz=timezone.utc) == datetime(2000, 1, 5, 0, 0, 0, tzinfo=timezone.utc)
+    assert dt.strptime("tomorrow -0800", fmt="") == datetime(2000, 1, 6, 0, 0, 0)