wip bintar deps step2

Author: cvicentiu

runtime_config/bintar_deps/deps_11.8.yaml

@@ -48,6 +48,17 @@ files:
   - libm.so.6
   - libpthread.so.0
   - libstdc++.so.6
+  bin/garbd:
+  - ld-linux-x86-64.so.2
+  - libboost_program_options.so.1.52.0
+  - libc.so.6
+  - libcrypto.so.1.0.0
+  - libgcc_s.so.1
+  - libm.so.6
+  - libpthread.so.0
+  - librt.so.1
+  - libssl.so.1.0.0
+  - libstdc++.so.6
   bin/innochecksum:
   - ld-linux-x86-64.so.2
   - libc.so.6
@@ -306,6 +317,16 @@ files:
   - libpthread.so.0
   - libsnappy.so.1
   - libstdc++.so.6
+  lib/libgalera_smm.so:
+  - ld-linux-x86-64.so.2
+  - libc.so.6
+  - libcrypto.so.1.0.0
+  - libgcc_s.so.1
+  - libm.so.6
+  - libpthread.so.0
+  - librt.so.1
+  - libssl.so.1.0.0
+  - libstdc++.so.6
   lib/libmariadb.so.3:
   - ld-linux-x86-64.so.2
   - libc.so.6
@@ -325,7 +346,6 @@ files:
   - libc.so.6
   - libgssapi_krb5.so.2
   - libkrb5.so.3
-  - libpthread.so.0
   lib/plugin/auth_gssapi_client.so:
   - libc.so.6
   - libcom_err.so.2
@@ -522,6 +542,10 @@ files:
   lib/plugin/mysql_clear_password.so:
   - libc.so.6
   - libpthread.so.0
+  lib/plugin/parsec.so:
+  - ld-linux-x86-64.so.2
+  - libc.so.6
+  - libpthread.so.0
   lib/plugin/password_reuse_check.so:
   - libc.so.6
   - libpthread.so.0

scripts/bintars/common.py

@@ -59,14 +59,14 @@ def run_command(command):
         return None
 
 
-def _unpack_archive(tarball_path: str, dst_path: str):
+def _unpack_archive(tarball_path: Path, dst_path: Path):
     logging.info(f"Extracting archive {tarball_path}")
-    with tarfile.open(tarball_path, 'r:*') as tar:
-        tar.extractall(path=dst_path, filter='fully_trusted')
+    with tarfile.open(str(tarball_path), 'r:*') as tar:
+        tar.extractall(path=str(dst_path), filter='fully_trusted')
 
 
-def _parse_archive_path(archive_path: str) -> Tuple[str, str]:
-    archive_name = os.path.basename(archive_path)
+def _parse_archive_path(archive_path: Path) -> Tuple[str, str]:
+    archive_name = archive_path.name
 
     # Removes the last extension (e.g., .gz)
     base_name = Path(archive_name).stem
@@ -89,23 +89,23 @@ def _parse_archive_path(archive_path: str) -> Tuple[str, str]:
     return base_name, major_minor
 
 
-def prepare_test_directory(archive_path: str, tests_path: str):
+def prepare_test_directory(archive_path: Path, tests_path: Path) -> Tuple[Path, str]:
 
     base_name, major_minor = _parse_archive_path(archive_path)
     # The archive contains a folder with the same name as the archive.
     # We are interested in the contents within that folder, as thats where
     # the files are.
-    files_path = os.path.join(tests_path, base_name)
+    files_path = tests_path / base_name
 
     # Cleanup any previous run.
     shutil.rmtree(files_path, ignore_errors=True)
 
     # Create the test directory.
-    Path(tests_path).mkdir(parents=True, exist_ok=True)
+    tests_path.mkdir(parents=True, exist_ok=True)
 
     _unpack_archive(archive_path, tests_path)
 
     # Sanity check that the archive has maintained its format.
-    assert os.path.isdir(files_path)
+    assert files_path.is_dir()
 
     return files_path, major_minor

scripts/bintars/deps_test.py

@@ -10,6 +10,7 @@
 import yaml
 
 from common import run_command, setup_logging, prepare_test_directory
+from pathlib import Path
 
 
 def check_file_is_elf_binary_callback(file_path: str) -> str | None:
@@ -121,10 +122,10 @@ def remove_base_path_from_files(dependencies: dict[str, list[str]],
 def dependencies_to_canonical_repr(
         dependencies: dict[str, set[str]],
         version: str,
-        base_path: str
+        base_path: Path
 ) -> dict[str, dict[str, list[str]]]:
 
-    dependencies = remove_base_path_from_files(dependencies, base_path)
+    dependencies = remove_base_path_from_files(dependencies, base_path.as_posix())
     result = {
         'version': version,
         'files': {},
@@ -194,9 +195,9 @@ def compare_dependencies(archive_deps, standard_deps):
     return error
 
 
-def main(archive_path: str,
-         tests_path: str,
-         deps_file: str,
+def main(archive_path: Path,
+         tests_path: Path,
+         deps_file: Path,
          record: bool,
          allow_cross_version: bool):
     error = False  # track any errors so we can return properly.
@@ -248,8 +249,8 @@ def main(archive_path: str,
     args = parser.parse_args()
 
     setup_logging(logging.INFO)
-    main(archive_path=args.archive,
-         tests_path=args.test_directory,
-         deps_file=args.deps_file,
+    main(archive_path=Path(args.archive),
+         tests_path=Path(args.test_directory),
+         deps_file=Path(args.deps_file),
          record=args.record,
          allow_cross_version=args.allow_cross_version)