github2gerrit 1.0.9__tar.gz → 1.2.0__tar.gz

{github2gerrit-1.0.9 → github2gerrit-1.2.0}/.pre-commit-config.yaml

@@ -3,7 +3,7 @@
 # SPDX-FileCopyrightText: 2025 The Linux Foundation
 
 ci:
-  skip: [pytest]
+  skip: [pytest, gha-workflow-linter]
   autofix_commit_msg: |
     Chore: pre-commit autofixes
 
@@ -59,7 +59,7 @@ repos:
         types: [yaml]
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: b969e2851312ca2b24bbec879ba4954341d1bd12  # frozen: v0.15.5
+    rev: e05c5c0818279e5ac248ac9e954431ba58865e61  # frozen: v0.15.7
     hooks:
       - id: ruff
         files: ^(src|scripts|tests)/.+\.py$
@@ -76,13 +76,6 @@ repos:
           - types-PyYAML
           - types-requests
 
-  # Doesn't seem to run reliably inside pre-commit.ci
-  # - repo: https://github.com/RobertCraigie/pyright-python
-  #   rev: d393df1703a808473b84bd14a2702f4793014031  # frozen: v1.1.404
-  #   hooks:
-  #     - id: pyright
-  #       files: ^(src|scripts|tests)/.+\.py$
-
   - repo: https://github.com/btford/write-good
     rev: ab66ce10136dfad5146e69e70f82a3efac8842c1 # frozen: v1.0.8
     hooks:
@@ -120,6 +113,18 @@ repos:
     hooks:
       - id: codespell
 
+  # Requires a mirror, primary repo lacks .pre-commit-hooks.yaml
+  - repo: https://github.com/DetachHead/basedpyright-prek-mirror
+    rev: d58fe7fc44458fa7e41e2d38c04598a3c87833f2  # frozen: 1.38.3
+    hooks:
+      - id: basedpyright
+        files: ^src/.+\.py$
+
+  - repo: https://github.com/lfreleng-actions/gha-workflow-linter
+    rev: a7caf8f3a1a05688d1cee46615ff94def617e5a3  # frozen: v1.0.2
+    hooks:
+      - id: gha-workflow-linter
+
   - repo: https://github.com/python-jsonschema/check-jsonschema
     rev: 8db279a37c552206d2df62269ff6f9d31125815a  # frozen: 0.37.0
     hooks:

{github2gerrit-1.0.9 → github2gerrit-1.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: github2gerrit
-Version: 1.0.9
+Version: 1.2.0
 Summary: Submit a GitHub pull request to a Gerrit repository.
 Project-URL: Homepage, https://github.com/lfreleng-actions/github2gerrit-action
 Project-URL: Repository, https://github.com/lfreleng-actions/github2gerrit-action

{github2gerrit-1.0.9 → github2gerrit-1.2.0}/action.yaml

@@ -69,6 +69,10 @@ inputs:
     description: "Enable CI testing mode; overrides .gitreview, creates orphan commits"
     required: false
     default: "false"
+  G2G_NO_GERRIT:
+    description: "Run full pipeline without contacting Gerrit (forces DRY_RUN, suppresses cleanup)"
+    required: false
+    default: "false"
   FORCE:
     description: "Force PR closure regardless of Gerrit change status (abandoned, etc)"
     required: false
@@ -153,6 +157,10 @@ inputs:
     description: "Create a Gerrit change when an UPDATE operation cannot find an existing one"
     required: false
     default: "false"
+  G2G_DISABLED:
+    description: "Set to 'true' to disable the action entirely (exits successfully with a message)"
+    required: false
+    default: ""
 
 outputs:
   gerrit_change_request_url:
@@ -168,27 +176,57 @@ outputs:
 runs:
   using: "composite"
   steps:
+    - name: "Check if GitHub2Gerrit is disabled"
+      id: disabled-check
+      shell: bash
+      run: |
+        # Check if GitHub2Gerrit is disabled
+        set -euo pipefail
+        DISABLED_ENV="${G2G_DISABLED:-}"
+        DISABLED_INPUT="${{ inputs.G2G_DISABLED }}"
+        # Normalize: accept the same truthy set as env_bool()
+        # (1/true/yes/on, case-insensitive, trimmed)
+        _normalize() {
+          printf '%s' "$1" | tr '[:upper:]' '[:lower:]' | xargs
+        }
+        _is_truthy() {
+          case "$(_normalize "$1")" in
+            1|true|yes|on) return 0 ;;
+            *) return 1 ;;
+          esac
+        }
+        if _is_truthy "${DISABLED_ENV}" || _is_truthy "${DISABLED_INPUT}"; then
+          echo "🛑 GitHub2Gerrit is disabled by check of G2G_DISABLED variable or input"
+          echo "disabled=true" >> "$GITHUB_OUTPUT"
+        else
+          echo "disabled=false" >> "$GITHUB_OUTPUT"
+        fi
+
+    - name: "Checkout repository"
+      if: steps.disabled-check.outputs.disabled != 'true'
+      # yamllint disable-line rule:line-length
+      uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd  # v6.0.2
+      with:
+        fetch-depth: ${{ inputs.FETCH_DEPTH }}
+        # Ensure we are on the PR's head SHA when triggered by PR events
+        ref: ${{ github.event.pull_request.head.sha || github.sha }}
+
     - name: "Setup Python"
+      if: steps.disabled-check.outputs.disabled != 'true'
       # yamllint disable-line rule:line-length
       uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405  # v6.2.0
       with:
         python-version-file: '${{ github.action_path }}/pyproject.toml'
 
     - name: "Setup uv"
+      if: steps.disabled-check.outputs.disabled != 'true'
       # yamllint disable-line rule:line-length
-      uses: astral-sh/setup-uv@e06108dd0aef18192324c70427afc47652e63a82  # v7.5.0
+      uses: astral-sh/setup-uv@37802adc94f370d6bfd71619e3f0bf239e1f3b78  # v7.6.0
       with:
         enable-cache: false
 
-    - name: "Checkout repository"
-      # yamllint disable-line rule:line-length
-      uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd  # v6.0.2
-      with:
-        fetch-depth: ${{ inputs.FETCH_DEPTH }}
-        # Ensure we are on the PR's head SHA when triggered by PR events
-        ref: ${{ github.event.pull_request.head.sha || github.sha }}
-
     - name: "Setup github2gerrit"
+      if: steps.disabled-check.outputs.disabled != 'true'
       shell: bash
       env:
         # Provide version for hatch-vcs (via setuptools-scm)
@@ -210,7 +248,7 @@ runs:
 
     - name: "Validate PR_NUMBER usage"
       # yamllint disable-line rule:line-length
-      if: ${{ github.event_name != 'workflow_dispatch' && inputs.PR_NUMBER != '' && inputs.PR_NUMBER != '0' }}
+      if: ${{ steps.disabled-check.outputs.disabled != 'true' && github.event_name != 'workflow_dispatch' && inputs.PR_NUMBER != '' && inputs.PR_NUMBER != '0' }}
       shell: bash
       run: |
         # Validate PR_NUMBER usage
@@ -219,7 +257,7 @@ runs:
         exit 2
 
     - name: "Normalize PR_NUMBER"
-      if: ${{ github.event_name == 'workflow_dispatch' }}
+      if: ${{ steps.disabled-check.outputs.disabled != 'true' && github.event_name == 'workflow_dispatch' }}
       shell: bash
       run: |
         # Normalize PR_NUMBER
@@ -239,6 +277,7 @@ runs:
         fi
 
     - name: "Extract PR number, validate context"
+      if: steps.disabled-check.outputs.disabled != 'true'
       shell: bash
       run: |
         # Extract PR number, validate context
@@ -280,6 +319,7 @@ runs:
         fi
 
     - name: "Run github2gerrit Python CLI"
+      if: steps.disabled-check.outputs.disabled != 'true'
       id: run-cli
       shell: bash
       env:
@@ -338,6 +378,7 @@ runs:
         SYNC_ALL_OPEN_PRS: ${{ env.SYNC_ALL_OPEN_PRS }}
         PR_NUMBER: ${{ env.PR_NUMBER }}
         G2G_TEST_MODE: "false"
+        G2G_NO_GERRIT: ${{ inputs.G2G_NO_GERRIT }}
       run: |
         # Run github2gerrit Python CLI
         set -euo pipefail
@@ -352,6 +393,7 @@ runs:
         fi
 
     - name: "Capture outputs"
+      if: steps.disabled-check.outputs.disabled != 'true'
       id: capture-outputs
       shell: bash
       # yamllint disable rule:line-length

{github2gerrit-1.0.9 → github2gerrit-1.2.0}/pyproject.toml

@@ -235,19 +235,7 @@ markers = [
 
 [tool.pyright]
 pythonVersion = "3.11"
-include = ["src", "tests"]
-exclude = [
-  "build/",
-  "dist/",
-  "docs/",
-  "scripts/",
-  "tests/fixtures/",
-  ".venv/",
-  ".mypy_cache/",
-  ".pytest_cache/",
-  ".ruff_cache/",
-  "coverage_html_report/",
-]
+include = ["src"]
 typeCheckingMode = "strict"
 reportMissingImports = "none"
 reportMissingTypeStubs = "none"

{github2gerrit-1.0.9 → github2gerrit-1.2.0}/src/github2gerrit/cli.py

@@ -845,6 +845,14 @@ def main(
             typer.echo("Version information not available")
         sys.exit(int(ExitCode.SUCCESS))
 
+    # Check if GitHub2Gerrit is disabled via environment variable
+    if env_bool("G2G_DISABLED"):
+        typer.echo(
+            "\U0001f6d1 GitHub2Gerrit is disabled by check of "
+            "G2G_DISABLED variable"
+        )
+        sys.exit(int(ExitCode.SUCCESS))
+
     # Override boolean parameters with properly parsed environment variables.
     # This ensures that string "false" from GitHub Actions is handled
     # correctly (Typer/Click treats any non-empty string as truthy).
@@ -2126,8 +2134,40 @@ def _process() -> None:
         raise converted_error from exc
 
     gh = _read_github_context()
+
+    # --- G2G_NO_GERRIT: leverage DRY_RUN infrastructure ---
+    # G2G_NO_GERRIT reuses the existing DRY_RUN + G2G_DRYRUN_DISABLE_NETWORK
+    # code paths so that all tool logic runs but Gerrit network operations
+    # are no-ops.  Cleanup tasks (abandoned-PR / Gerrit-change sweeps) are
+    # also suppressed because they would hit a non-existent server.
+    no_gerrit = env_bool("G2G_NO_GERRIT", False)
+
+    if no_gerrit:
+        log.info(
+            "🧪 G2G_NO_GERRIT enabled: forcing DRY_RUN=true and "
+            "G2G_DRYRUN_DISABLE_NETWORK=true"
+        )
+        os.environ["DRY_RUN"] = "true"
+        os.environ["G2G_DRYRUN_DISABLE_NETWORK"] = "true"
+        # Rebuild inputs so the rest of the pipeline sees dry_run=True
+        data = _load_effective_inputs()
+
+    # Display config AFTER G2G_NO_GERRIT evaluation so the table
+    # reflects the actual runtime values (e.g. DRY_RUN forced true).
     _display_effective_config(data, gh)
 
+    # Log configured Gerrit server if present.  DNS validation is
+    # handled by Orchestrator._resolve_gerrit_info() which covers
+    # both explicit GERRIT_SERVER and .gitreview-derived hosts in
+    # a single, consolidated code path.
+    gerrit_host = data.gerrit_server or ""
+    if gerrit_host:
+        log.debug(
+            "Gerrit server '%s' configured; DNS validation "
+            "deferred to Orchestrator",
+            gerrit_host.strip(),
+        )
+
     # Detect PR operation mode for routing
     operation_mode = gh.get_operation_mode()
     if operation_mode != models.PROperationMode.UNKNOWN:
@@ -2145,13 +2185,25 @@ def _process() -> None:
             log.debug("✏️  PR edit event - will sync metadata to Gerrit change")
         elif operation_mode == models.PROperationMode.CLOSE:
             pr_num = gh.pr_number or "unknown"
-            log.debug(
-                "🚪 Pull request #%s closed; performing Gerrit cleanup",
-                pr_num,
-            )
-            safe_console_print(
-                f"🚪 Pull request #{pr_num} closed; performing Gerrit cleanup"
-            )
+            if no_gerrit:
+                log.debug(
+                    "🚪 Pull request #%s closed; Gerrit cleanup skipped "
+                    "(G2G_NO_GERRIT)",
+                    pr_num,
+                )
+                safe_console_print(
+                    f"🚪 Pull request #{pr_num} closed; "
+                    "Gerrit cleanup skipped (G2G_NO_GERRIT)"
+                )
+            else:
+                log.debug(
+                    "🚪 Pull request #%s closed; performing Gerrit cleanup",
+                    pr_num,
+                )
+                safe_console_print(
+                    f"🚪 Pull request #{pr_num} closed; "
+                    "performing Gerrit cleanup"
+                )
 
             # Debug log prerequisites for abandoning Gerrit change
             log.debug(
@@ -2164,8 +2216,10 @@ def _process() -> None:
             )
 
             # First, abandon the specific Gerrit change for this closed PR
+            # Skip in G2G_NO_GERRIT: no Gerrit server to query
             if (
-                gh.pr_number
+                not no_gerrit
+                and gh.pr_number
                 and data.gerrit_server
                 and data.gerrit_project
                 and gh.repository
@@ -2209,7 +2263,8 @@ def _process() -> None:
                     )
 
             # Run abandoned PR cleanup if enabled
-            if FORCE_ABANDONED_CLEANUP:
+            # Skip in G2G_NO_GERRIT: no Gerrit server to query
+            if FORCE_ABANDONED_CLEANUP and not no_gerrit:
                 try:
                     log.debug("Running abandoned PR cleanup...")
                     if gh.repository and "/" in gh.repository:
@@ -2225,7 +2280,8 @@ def _process() -> None:
                     log.warning("Abandoned PR cleanup failed: %s", exc)
 
             # Run Gerrit cleanup if enabled
-            if FORCE_GERRIT_CLEANUP:
+            # Skip in G2G_NO_GERRIT: no Gerrit server to query
+            if FORCE_GERRIT_CLEANUP and not no_gerrit:
                 try:
                     log.debug("Running Gerrit cleanup for closed GitHub PRs...")
                     if data.gerrit_server and data.gerrit_project:
@@ -2264,10 +2320,14 @@ def _process() -> None:
         log.debug(merge_message)
         safe_console_print(merge_message)
 
-        force = env_bool("FORCE", False)
-        _process_close_gerrit_change(
-            data, gh, gerrit_event_change_url, force=force
-        )
+        # Skip in G2G_NO_GERRIT: Gerrit REST calls are not possible
+        if no_gerrit:
+            log.info("G2G_NO_GERRIT: skipping Gerrit change processing")
+        else:
+            force = env_bool("FORCE", False)
+            _process_close_gerrit_change(
+                data, gh, gerrit_event_change_url, force=force
+            )
 
         # Continue with cleanup tasks even if no PR was found/closed
         # (Gerrit change might not have originated from GitHub)
@@ -2276,16 +2336,23 @@ def _process() -> None:
     gerrit_change_url = os.getenv("G2G_GERRIT_CHANGE_URL") or ""
     if gerrit_change_url and not gerrit_event_change_url:
         log.info("🔄 Gerrit change URL provided: %s", gerrit_change_url)
-        log.info("Finding and closing source GitHub pull request")
-        force = env_bool("FORCE", False)
-        _process_close_gerrit_change(data, gh, gerrit_change_url, force=force)
+        # Skip in G2G_NO_GERRIT: Gerrit REST calls are not possible
+        if no_gerrit:
+            log.info("G2G_NO_GERRIT: skipping Gerrit change processing")
+        else:
+            log.info("Finding and closing source GitHub pull request")
+            force = env_bool("FORCE", False)
+            _process_close_gerrit_change(
+                data, gh, gerrit_change_url, force=force
+            )
 
         # Continue with cleanup tasks
 
     # Run cleanup tasks for Gerrit events and legacy G2G_GERRIT_CHANGE_URL
     if gerrit_event_change_url or gerrit_change_url:
         # Run abandoned PR cleanup if enabled
-        if FORCE_ABANDONED_CLEANUP:
+        # Skip in G2G_NO_GERRIT: no Gerrit server to query
+        if FORCE_ABANDONED_CLEANUP and not no_gerrit:
             try:
                 log.debug("Running abandoned PR cleanup...")
                 if gh.repository and "/" in gh.repository:
@@ -2301,7 +2368,8 @@ def _process() -> None:
                 log.warning("Abandoned PR cleanup failed: %s", exc)
 
         # Run Gerrit cleanup if enabled
-        if FORCE_GERRIT_CLEANUP:
+        # Skip in G2G_NO_GERRIT: no Gerrit server to query
+        if FORCE_GERRIT_CLEANUP and not no_gerrit:
             try:
                 log.debug("Running Gerrit cleanup for closed GitHub PRs...")
                 if data.gerrit_server and data.gerrit_project:
@@ -2322,7 +2390,8 @@ def _process() -> None:
         _process_close_merged_prs(data, gh)
 
         # Run abandoned PR cleanup if enabled
-        if FORCE_ABANDONED_CLEANUP:
+        # Skip in G2G_NO_GERRIT: no Gerrit server to query
+        if FORCE_ABANDONED_CLEANUP and not no_gerrit:
             try:
                 log.debug("Running abandoned PR cleanup...")
                 if gh.repository and "/" in gh.repository:
@@ -2338,7 +2407,8 @@ def _process() -> None:
                 log.warning("Abandoned PR cleanup failed: %s", exc)
 
         # Run Gerrit cleanup if enabled
-        if FORCE_GERRIT_CLEANUP:
+        # Skip in G2G_NO_GERRIT: no Gerrit server to query
+        if FORCE_GERRIT_CLEANUP and not no_gerrit:
             try:
                 log.info("Running Gerrit cleanup for closed GitHub PRs...")
                 if data.gerrit_server and data.gerrit_project:
@@ -2383,7 +2453,8 @@ def _process() -> None:
             log.debug("Processing completed ✅")
 
             # Run abandoned PR cleanup if enabled
-            if FORCE_ABANDONED_CLEANUP:
+            # Skip in G2G_NO_GERRIT: no Gerrit server to query
+            if FORCE_ABANDONED_CLEANUP and not no_gerrit:
                 try:
                     log.debug("Running abandoned PR cleanup...")
                     if gh.repository and "/" in gh.repository:
@@ -2399,7 +2470,8 @@ def _process() -> None:
                     log.warning("Abandoned PR cleanup failed: %s", exc)
 
             # Run Gerrit cleanup if enabled
-            if FORCE_GERRIT_CLEANUP:
+            # Skip in G2G_NO_GERRIT: no Gerrit server to query
+            if FORCE_GERRIT_CLEANUP and not no_gerrit:
                 try:
                     log.info("Running Gerrit cleanup for closed GitHub PRs...")
                     if data.gerrit_server and data.gerrit_project:
@@ -2567,7 +2639,8 @@ def _process() -> None:
     pipeline_success, result = _process_single(data, gh, progress_tracker)
 
     # Run abandoned PR cleanup if enabled and pipeline was successful
-    if pipeline_success and FORCE_ABANDONED_CLEANUP:
+    # Skip in G2G_NO_GERRIT: no Gerrit server to query
+    if pipeline_success and FORCE_ABANDONED_CLEANUP and not no_gerrit:
         try:
             log.debug("Running abandoned PR cleanup...")
             # Extract owner and repo from gh.repository (format: "owner/repo")
@@ -2585,7 +2658,8 @@ def _process() -> None:
             log.warning("Abandoned PR cleanup failed: %s", exc)
 
     # Run Gerrit cleanup if enabled and pipeline was successful
-    if pipeline_success and FORCE_GERRIT_CLEANUP:
+    # Skip in G2G_NO_GERRIT: no Gerrit server to query
+    if pipeline_success and FORCE_GERRIT_CLEANUP and not no_gerrit:
         try:
             log.debug("Running Gerrit cleanup for closed GitHub PRs...")
             if data.gerrit_server and data.gerrit_project:
@@ -2612,10 +2686,11 @@ def _process() -> None:
     # Show summary after progress tracker is stopped
     if show_progress and RICH_AVAILABLE:
         summary = progress_tracker.get_summary() if progress_tracker else {}
+        safe_console_print("")
         safe_console_print(
-            "\n✅ Operation completed!"
+            "✅ Operation completed!"
             if pipeline_success
-            else "\n❌ Operation failed!",
+            else "❌ Operation failed!",
             style="green" if pipeline_success else "red",
         )
         safe_console_print(
@@ -2864,6 +2939,9 @@ def _get_ssh_agent_status() -> str:
 
 def _display_effective_config(data: Inputs, gh: GitHubContext) -> None:
     """Display effective configuration in a formatted table."""
+    # Use env_bool for consistent boolean parsing across the codebase
+    no_gerrit_enabled = env_bool("G2G_NO_GERRIT", False)
+
     # Detect mode and display prominently
     github_mode = _is_github_mode()
     mode_label = "GITHUB_MODE" if github_mode else "CLI_MODE"
@@ -2924,6 +3002,11 @@ def _display_effective_config(data: Inputs, gh: GitHubContext) -> None:
     # Mode first - always show
     config_info[mode_label] = mode_description
 
+    # Show G2G_NO_GERRIT regardless of operation mode so logs always
+    # indicate when the run is using test infrastructure.
+    if no_gerrit_enabled:
+        config_info["G2G_NO_GERRIT"] = "🧪"
+
     if is_closing_pr_mode:
         # In PR closing mode, only show minimal relevant config
         if data.dry_run:

{github2gerrit-1.0.9 → github2gerrit-1.2.0}/src/github2gerrit/core.py

@@ -116,12 +116,16 @@ log = logging.getLogger("github2gerrit.core")
 _MSG_ISSUE_ID_MULTILINE = "Issue ID must be single line"
 _MSG_MISSING_PR_CONTEXT = "missing PR context"
 _MSG_BAD_REPOSITORY_CONTEXT = "bad repository context"
-_MSG_MISSING_GERRIT_SERVER = "missing GERRIT_SERVER"
+_MSG_MISSING_GERRIT_SERVER = (
+    "Missing Gerrit host. Provide it via the GERRIT_SERVER "
+    "input/environment variable, .gitreview file, or action configuration."
+)
 _MSG_MISSING_GERRIT_PROJECT = "missing GERRIT_PROJECT"
 _MSG_PYGERRIT2_REQUIRED_REST = "pygerrit2 is required to query Gerrit REST API"
 _MSG_PYGERRIT2_REQUIRED_AUTH = "pygerrit2 is required for HTTP authentication"
 _MSG_PYGERRIT2_MISSING = "pygerrit2 missing"
 _MSG_PYGERRIT2_AUTH_MISSING = "pygerrit2 auth missing"
+_MSG_DNS_RESOLUTION_FAILED = "DNS resolution failed for '%s'"
 
 
 # Removed _insert_issue_id_into_commit_message - dead code
@@ -1658,6 +1662,38 @@ class Orchestrator:
     # Public API
     # ---------------
 
+    def validate_gerrit_server(self, gerrit_host: str | None) -> None:
+        """Validate that the Gerrit server hostname can be resolved via DNS.
+
+        This provides a fast-fail mechanism to catch invalid or
+        unresolvable Gerrit server hostnames early, before any work is done.
+
+        Args:
+            gerrit_host: The Gerrit server hostname to validate.
+                May be ``None`` or empty, in which case an error is raised.
+
+        Raises:
+            OrchestratorError: If the hostname is empty/None or cannot
+                be resolved.
+        """
+        if not gerrit_host or not gerrit_host.strip():
+            raise OrchestratorError(_MSG_MISSING_GERRIT_SERVER)
+
+        host = gerrit_host.strip()
+        try:
+            socket.getaddrinfo(host, None)
+            log.debug("DNS resolution for Gerrit host '%s' succeeded", host)
+        except (OSError, UnicodeError) as exc:
+            log.debug(
+                "Gerrit server '%s' could not be resolved via DNS. "
+                "This typically means either the server hostname is "
+                "incorrect or there is no Gerrit server associated "
+                "with this repository.",
+                host,
+                exc_info=True,
+            )
+            raise OrchestratorError(_MSG_DNS_RESOLUTION_FAILED % host) from exc
+
     def execute(
         self,
         inputs: Inputs,
@@ -2058,7 +2094,15 @@ class Orchestrator:
         inputs: Inputs,
         repo: RepoNames,
     ) -> GerritInfo:
-        """Resolve Gerrit connection info from .gitreview or inputs."""
+        """Resolve Gerrit connection info from .gitreview or inputs.
+
+        After resolution, the Gerrit host is validated via DNS to
+        catch bogus hostnames early — regardless of whether the host
+        came from ``.gitreview`` or explicit ``GERRIT_SERVER`` input.
+
+        DNS validation is skipped when ``G2G_DRYRUN_DISABLE_NETWORK``
+        is set, consistent with the preflight and CLI-level guards.
+        """
         log.debug(
             "_resolve_gerrit_info: inputs.ci_testing=%s", inputs.ci_testing
         )
@@ -2071,6 +2115,7 @@ class Orchestrator:
 
         if gitreview:
             log.debug("Using .gitreview settings: %s", gitreview)
+            self._validate_resolved_gerrit_host(gitreview.host)
             return gitreview
 
         host = inputs.gerrit_server.strip()
@@ -2101,8 +2146,24 @@ class Orchestrator:
 
         info = make_gitreview_info(host=host, port=port, project=project)
         log.debug("Resolved Gerrit info: %s", info)
+        self._validate_resolved_gerrit_host(info.host)
         return info
 
+    def _validate_resolved_gerrit_host(self, host: str | None) -> None:
+        """Validate a resolved Gerrit host via DNS unless network is disabled.
+
+        Delegates to :meth:`validate_gerrit_server` for the actual DNS
+        check.  Skipped when ``G2G_DRYRUN_DISABLE_NETWORK`` is set so
+        that offline / test scenarios are not penalised.
+        """
+        if env_bool("G2G_DRYRUN_DISABLE_NETWORK", False):
+            log.debug(
+                "Skipping DNS validation for '%s' (G2G_DRYRUN_DISABLE_NETWORK)",
+                host,
+            )
+            return
+        self.validate_gerrit_server(host)
+
     def _setup_ssh(self, inputs: Inputs, gerrit: GerritInfo) -> None:
         """Set up temporary SSH configuration for Gerrit access.
 
@@ -5772,15 +5833,8 @@ class Orchestrator:
                 )
             return
 
-        # DNS resolution for Gerrit host
-        try:
-            socket.getaddrinfo(gerrit.host, None)
-            log.debug(
-                "DNS resolution for Gerrit host '%s' succeeded", gerrit.host
-            )
-        except Exception as exc:
-            msg = "DNS resolution failed"
-            raise OrchestratorError(msg) from exc
+        # DNS resolution for Gerrit host (reuses validate_gerrit_server)
+        self.validate_gerrit_server(gerrit.host)
 
         # SSH (TCP) reachability on Gerrit port
         try: