diff options
| author | Ryan Egesdahl <ryan.egesdahl@mongodb.com> | 2023-01-31 19:14:56 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2023-02-01 02:58:17 +0000 |
| commit | abf903ba3ba186de7dc4471cb63bbea212cc8330 (patch) | |
| tree | ce71a45441d08575562326d74f380aa7a9922dbd /buildscripts/package_test.py | |
| parent | 46370d450a43b0664a2ee0d160d8e7ef1165973b (diff) | |
| download | mongo-abf903ba3ba186de7dc4471cb63bbea212cc8330.tar.gz | |
SERVER-73123 Make package tests compatible with older distros
Diffstat (limited to 'buildscripts/package_test.py')
| -rw-r--r-- | buildscripts/package_test.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/buildscripts/package_test.py b/buildscripts/package_test.py index 4a258d17f0a..d927bbda49c 100644 --- a/buildscripts/package_test.py +++ b/buildscripts/package_test.py @@ -12,7 +12,7 @@ import uuid from concurrent import futures from pathlib import Path -from typing import Any, Dict, Generator, List, Optional, Tuple, Set +from typing import Any, Dict, Generator, List, Optional, Set, Tuple import docker import docker.errors @@ -21,8 +21,7 @@ import requests from docker.client import DockerClient from docker.models.containers import Container from docker.models.images import Image - -from simple_report import Result, Report +from simple_report import Report, Result root = logging.getLogger() root.setLevel(logging.DEBUG) @@ -114,9 +113,10 @@ OS_DOCKER_LOOKUP = { 'ubuntu1204': None, 'ubuntu1404': None, 'ubuntu1604': ('ubuntu:16.04', "apt", - frozenset( - ["python", "python3", "wget", "pkg-config", "systemd", "procps", "file"]), - "python3"), + frozenset([ + "apt-utils", "python", "python3", "wget", "pkg-config", "systemd", "procps", + "file" + ]), "python3"), 'ubuntu1804': ('ubuntu:18.04', "apt", frozenset( ["python", "python3", "wget", "pkg-config", "systemd", "procps", "file"]), @@ -215,7 +215,7 @@ def run_test(test: Test, client: DockerClient) -> Result: logging.debug(test_external_root) log_external_path = Path.joinpath(test_external_root, log_name) - commands: List[str] = [] + commands: List[str] = ["export PYTHONIOENCODING=UTF-8"] if test.os_name.startswith('rhel'): if test.os_name.startswith('rhel7'): @@ -224,7 +224,7 @@ def run_test(test: Test, client: DockerClient) -> Result: "yum -y install centos-release-scl", "yum-config-manager --enable centos-sclo-rh", ] - # RHEL distros need EPEL for Compass dependencies + # RHEL distros need EPEL for Compass dependencies commands += [ "yum -y install yum-utils epel-release", "yum-config-manager --enable epel", |