Skip to content

Enable prerequisite pip packages installation #366

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
narasimhan-v merged 1 commit into from
Sep 26, 2025
Merged

Enable prerequisite pip packages installation #366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion avocado-setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -705,6 +705,7 @@ def parse_test_config(test_config_file, avocado_bin, enable_kvm):
globals() ['TEST_REPOS'] = eval(CONFIGFILE.get('tests', 'name'))
globals() ['prescript_dir'] = CONFIGFILE.get('script-dir', 'prescriptdir')
globals() ['postscript_dir'] = CONFIGFILE.get('script-dir', 'postscriptdir')
globals() ['PIP_PACKAGES'] = eval(CONFIGFILE.get('pip-package', 'package'))

if helper.get_machine_type() == 'pHyp':
args.enable_kvm = False
Expand All @@ -720,7 +721,7 @@ def parse_test_config(test_config_file, avocado_bin, enable_kvm):
"as guest tests are requested")
args.enable_kvm = True
pipManager = helper.PipMagager(BASE_FRAMEWORK, OPTIONAL_FRAMEWORK,
KVM_FRAMEWORK, args.enable_kvm)
KVM_FRAMEWORK, PIP_PACKAGES, args.enable_kvm)
if not (args.run_suite and args.install_deps
and args.bootstrap and args.install) and args.clean:
# honor the spl condition, just to deep clean the environment incase needed
Expand Down
2 changes: 1 addition & 1 deletion config/wrapper/env.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ packages =
packages =

[pip-package]
package = configparser,enum
package = [('configparser',''), ('distlib','')]

[script-dir]
prescriptdir = /etc/avocado/scripts/job/pre.d/
Expand Down
6 changes: 3 additions & 3 deletions lib/helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ def remove_file(src, dest):


class PipMagager:
def __init__(self, base_fw=[], opt_fw=[], kvm_fw=[], enable_kvm=False):
def __init__(self, base_fw=[], opt_fw=[], kvm_fw=[],pip_packages=[], enable_kvm=False):
"""
helper class to parse, install, uninstall pip package from user config
"""
Expand All @@ -224,11 +224,11 @@ def __init__(self, base_fw=[], opt_fw=[], kvm_fw=[], enable_kvm=False):
pip_version_split = importlib.metadata.version(f"pip").split(".")
self.pip_vmajor, self.pip_vminor = int(pip_version_split[0]), int(pip_version_split[1])

self.uninstallitems = base_fw + opt_fw + kvm_fw
self.uninstallitems = base_fw + opt_fw + kvm_fw + pip_packages
if enable_kvm:
self.installitems = self.uninstallitems
else:
self.installitems = base_fw + opt_fw
self.installitems = base_fw + opt_fw + pip_packages

self.install_packages = []
self.uninstall_packages = []
Expand Down