[AI Generated] BugFix: Retry zypper operations on lock contention (exit code 7)

[johnsongeorge-w]

Summary

Zypper exits with code 7 (ZYPPER_EXIT_ERR_ZYPP) when another process holds the system management lock. This is a transient condition, but add_repository(), _install_packages(), and _uninstall_packages() in the Suse class all treated it as a hard failure.

Adds retry logic (up to 5 attempts with 10s delay + wait_running_process) that detects exit code 7, waits for the competing zypper process to finish, then retries the command.

Validation Results

Image	Result
SUSE sles-15-sp6 gen2 2026.01.23	PASSED

[Copilot]

Pull request overview

This PR improves SUSE package management robustness by retrying zypper operations when they fail due to transient lock contention (exit code 7), instead of treating it as a hard failure.

Changes:

• Add SUSE-specific constants for zypper lock exit code, max retries, and retry delay.
• Wrap zypper ar, zypper rm, and zypper in executions with retry logic that waits for competing zypper processes and then retries.

Comments suppressed due to low confidence (1)

lisa/operating_system.py:2496

• After the retry loop, if zypper still returns exit code 7, the code falls into the generic “Unexpected exit_code” path. Consider handling the “lock contention after max retries” case explicitly to produce a clearer, actionable error (include retry count/delay and indicate it was zypper lock contention).

            if install_result.exit_code == self._ZYPPER_EXIT_LOCK:
                self._log.debug(
                    f"zypper lock contention (exit code 7), "
                    f"retry {retry_num + 1}/{self._ZYPPER_LOCK_MAX_RETRIES}"
                )
                self.wait_running_process("zypper")
                time.sleep(self._ZYPPER_LOCK_RETRY_DELAY)
                continue
            break

        # zypper exit codes that indicate dependency/resolution issues:
        # 1: ZYPPER_EXIT_ERR_BUG - Unexpected situation
        # 4: ZYPPER_EXIT_INF_CAP_NOT_FOUND - Capability not found or dependency problem
        # 100: ZYPPER_EXIT_INF_UPDATE_NEEDED - Updates available
        # If installation failed due to dependency conflicts, retry with
        # --force-resolution to allow zypper to automatically resolve conflicts
        if install_result.exit_code in (1, 4, 100):
            self._log.debug(
                f"Installation failed with exit code {install_result.exit_code}, "
                "retrying with --force-resolution to resolve dependency conflicts."
            )
            command_with_force = f"zypper --non-interactive {add_args}"
            if not signed:
                command_with_force += " --no-gpg-checks "
            command_with_force += f" in --force-resolution {' '.join(packages)}"
            install_result = self._node.execute(
                command_with_force, shell=True, sudo=True, timeout=timeout
            )

        if install_result.exit_code in (1, 4, 100):
            raise LisaException(
                f"Failed to install {packages}. exit_code: {install_result.exit_code}, "
                f"stdout: {install_result.stdout}, stderr: {install_result.stderr}"
            )
        elif install_result.exit_code == 0:
            self._log.debug(f"{packages} is/are installed successfully.")
        else:
            raise LisaException(

[LiliDeng]

@copilot no need to change the code format, it brings below CI check error.

nox > flake8 
./lisa/operating_system.py:230:5: E704 multiple statements on one line (def)
./lisa/operating_system.py:230:68: BLK100 Black would make changes.
./lisa/operating_system.py:740:17: E701 multiple statements on one line (colon)
./lisa/operating_system.py:761:19: E701 multiple statements on one line (colon)
./lisa/operating_system.py:1611:19: E701 multiple statements on one line (colon)

[Copilot]

@copilot no need to change the code format, it brings below CI check error.

nox > flake8 

...

Fixed in commit e4194d4. Reverted the four pre-existing lines that Black reformatted (lines 230, 740, 761, 1611) back to their original multi-line form, so those flake8 errors (E704/E701/BLK100) are gone. The actual code changes are untouched.

[Copilot]

Pull request overview

Copilot reviewed 1 out of 1 changed files in this pull request and generated 2 comments.