diff options
| -rw-r--r-- | coin/instructions/common_environment.yaml | 15 | ||||
| -rw-r--r-- | coin/instructions/execute_desktop_instructions.yaml | 11 | ||||
| -rw-r--r-- | coin/instructions_utils.py | 11 | ||||
| -rw-r--r-- | coin/module_config.yaml | 8 |
4 files changed, 19 insertions, 26 deletions
diff --git a/coin/instructions/common_environment.yaml b/coin/instructions/common_environment.yaml index 406007315..7663014e2 100644 --- a/coin/instructions/common_environment.yaml +++ b/coin/instructions/common_environment.yaml @@ -248,21 +248,6 @@ instructions: - condition: property property: host.os equals_value: Linux - - type: ExecuteCommand - command: "python3 -m pip install -r requirements-coin.txt" - maxTimeInSeconds: 14400 - maxTimeBetweenOutput: 1200 - enable_if: - condition: and - conditions: - - condition: property - property: host.os - equals_value: Linux - - condition: property - property: host.arch - equals_value: AARCH64 - userMessageOnFailure: > - Failed to install requirements-coin.txt on Linux (aarch64) - type: EnvironmentVariable variableName: interpreter variableValue: "python3.11" diff --git a/coin/instructions/execute_desktop_instructions.yaml b/coin/instructions/execute_desktop_instructions.yaml index 8362a11a1..bece46b2b 100644 --- a/coin/instructions/execute_desktop_instructions.yaml +++ b/coin/instructions/execute_desktop_instructions.yaml @@ -52,9 +52,14 @@ instructions: maxTimeInSeconds: 14400 maxTimeBetweenOutput: 1200 enable_if: - condition: property - property: host.os - equals_value: Linux + condition: and + conditions: + - condition: property + property: host.os + equals_value: Linux + - condition: property + property: host.osVersion + not_equals_value: Ubuntu_24_04 userMessageOnFailure: > Failed to install requirements-coin.txt dependencies on Linux - type: ExecuteCommand diff --git a/coin/instructions_utils.py b/coin/instructions_utils.py index fe2a5f957..f8ea5a593 100644 --- a/coin/instructions_utils.py +++ b/coin/instructions_utils.py @@ -143,10 +143,13 @@ def remove_variables(vars): def setup_virtualenv(python, exe, env, pip, log): - run_instruction( - [str(python), "-m", "pip", "install", "--user", "virtualenv==20.7.2"], - "Failed to pin virtualenv", - ) + # Within Ubuntu 24.04 one can't install anything with pip to outside of + # virtual env. Trust that we already have proper virtualenv installed. + if os.environ.get("HOST_OSVERSION_COIN") != "ubuntu_24_04": + run_instruction( + [str(python), "-m", "pip", "install", "--user", "virtualenv==20.7.2"], + "Failed to pin virtualenv", + ) # installing to user base might not be in PATH by default. env_path = Path(str(site.USER_BASE)) / "bin" v_env = env_path / "virtualenv" diff --git a/coin/module_config.yaml b/coin/module_config.yaml index 94dc0f17e..450365ca8 100644 --- a/coin/module_config.yaml +++ b/coin/module_config.yaml @@ -57,14 +57,14 @@ accept_configuration: - condition: and # Restore LoA config conditions: - condition: property - property: host.osVersion - equals_value: Debian_11_6 + property: host.os + equals_value: Linux - condition: property property: host.arch equals_value: AARCH64 - condition: property - property: features - not_contains_value: DebianPackaging + property: target.arch + equals_value: AARCH64 - condition: property property: features contains_value: Packaging |