From ed1571eece0030e84b827ef6c038813c8f863809 Mon Sep 17 00:00:00 2001 From: Michal Berger Date: Fri, 24 Feb 2023 01:24:50 +0100 Subject: [PATCH] pkgpdep: Remove unsupported pieces We no longer support ubuntu's Xenial and Bionic flavors so they can be removed. swupd, Clearlinux's package manager, is also no longer supported. Signed-off-by: Michal Berger Change-Id: I526a89f4d3b3078949f235e46f8bb3a39b2a24b6 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/16926 Reviewed-by: Pawel Piatek Community-CI: Mellanox Build Bot Reviewed-by: Karol Latecki Reviewed-by: Jim Harris Reviewed-by: Ben Walker Tested-by: SPDK CI Jenkins --- scripts/pkgdep/clear-linux-os.sh | 40 ----------------------- scripts/pkgdep/debian.sh | 49 ++++++----------------------- test/common/config/pkgdep/os/ubuntu | 30 +++++------------- test/common/config/pkgdep/swupd | 21 ------------- test/common/config/vm_setup.sh | 3 +- 5 files changed, 18 insertions(+), 125 deletions(-) delete mode 100755 scripts/pkgdep/clear-linux-os.sh delete mode 100644 test/common/config/pkgdep/swupd diff --git a/scripts/pkgdep/clear-linux-os.sh b/scripts/pkgdep/clear-linux-os.sh deleted file mode 100755 index a815802b7..000000000 --- a/scripts/pkgdep/clear-linux-os.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/usr/bin/env bash -# SPDX-License-Identifier: BSD-3-Clause -# Copyright (C) 2020 Intel Corporation -# All rights reserved. -# -# Install main dependencies -swupd bundle-add -y c-basic make dev-utils openssl devpkg-libiscsi \ - devpkg-ncurses python3-basic python-extras devpkg-open-iscsi devpkg-json-c \ - storage-utils -# Additional dependencies for ISA-L used in compression -swupd bundle-add -y dev-utils-dev -# Additional dependencies for DPDK -swupd bundle-add -y nasm sysadmin-basic -# Additional dependencies for SPDK CLI -pip3 install pexpect -pip3 install configshell_fb -pip3 install pyelftools -if [[ $INSTALL_DEV_TOOLS == "true" ]]; then - swupd bundle-add -y git os-testsuite-0day -fi -if [[ $INSTALL_PMEM == "true" ]]; then - # Additional dependencies for building pmem based backends - swupd bundle-add -y devpkg-pmdk -fi -if [[ $INSTALL_FUSE == "true" ]]; then - # Additional dependencies for FUSE and NVMe-CUSE - swupd bundle-add -y devpkg-fuse -fi -if [[ $INSTALL_RBD == "true" ]]; then - # Additional dependencies for RBD bdev in NVMe over Fabrics - swupd bundle-add -y librados-devel librbd-devel -fi -if [[ $INSTALL_RDMA == "true" ]]; then - # Additional dependencies for RDMA transport in NVMe over Fabrics - swupd bundle-add -y devpkg-rdma-core network-basic-dev -fi -if [[ $INSTALL_DOCS == "true" ]]; then - # Additional dependencies for building docs - swupd bundle-add -y doxygen graphviz -fi diff --git a/scripts/pkgdep/debian.sh b/scripts/pkgdep/debian.sh index 2f6784598..d6b3b1f0b 100755 --- a/scripts/pkgdep/debian.sh +++ b/scripts/pkgdep/debian.sh @@ -6,70 +6,39 @@ # Copyright (c) 2022 Dell Inc, or its subsidiaries. # -VERSION_ID_NUM=$(sed 's/\.//g' <<< $VERSION_ID) -# Includes Ubuntu, Debian -# Minimal install apt-get install -y gcc g++ make libcunit1-dev libaio-dev libssl-dev libjson-c-dev libcmocka-dev uuid-dev libiscsi-dev -if [[ $NAME == "Ubuntu" ]] && [[ $VERSION_ID_NUM -ge 2204 ]]; then - # there is no python package in Ubuntu 22.04 - apt-get install -y python3 -else - apt-get install -y python -fi -apt-get install -y libncurses5-dev libncursesw5-dev python3-pip python3-dev +apt-get install -y libncurses5-dev libncursesw5-dev python3 python3-pip python3-dev pip3 install ninja -if ! pip3 install meson; then - # After recent updates pip3 on ubuntu1604 provides meson version which requires python >= 3.6. - # Unfortunately, the latest available version of python3 there is 3.5.2. In case pip3 fails to - # install meson fallback to packaged version of it ubuntu1604's repos may provide. - apt-get install -y meson -fi +pip3 install meson pip3 install pyelftools pip3 install ijson pip3 install python-magic pip3 install grpcio pip3 install grpcio-tools pip3 install pyyaml -# Additional dependencies for SPDK CLI - not available on older Ubuntus -apt-get install -y python3-configshell-fb python3-pexpect || echo \ - "Note: Some SPDK CLI dependencies could not be installed." +# Additional dependencies for SPDK CLI +apt-get install -y python3-configshell-fb python3-pexpect # Additional dependencies for DPDK -if [[ $NAME == "Ubuntu" ]] && [[ $VERSION_ID_NUM -lt 1900 ]]; then - echo "Ubuntu $VERSION_ID needs NASM version 2.14 for DPDK but is not in the mainline repository." - echo "You can install it manually" -else - apt-get install -y nasm -fi -apt-get install -y libnuma-dev +apt-get install -y nasm libnuma-dev # Additional dependencies for ISA-L used in compression apt-get install -y autoconf automake libtool help2man # Additional dependencies for USDT apt-get install -y systemtap-sdt-dev if [[ $INSTALL_DEV_TOOLS == "true" ]]; then # Tools for developers - apt-get install -y git astyle pep8 lcov clang sg3-utils pciutils shellcheck \ - abigail-tools bash-completion ruby-dev - # Additional python style checker not available on ubuntu 16.04 or earlier. - apt-get install -y pycodestyle || true + apt-get install -y git astyle lcov clang sg3-utils pciutils shellcheck \ + abigail-tools bash-completion ruby-dev pycodestyle # Additional dependencies for nvmf performance test script apt-get install -y python3-paramiko fi if [[ $INSTALL_PMEM == "true" ]]; then # Additional dependencies for building pmem based backends - if [[ $NAME == "Ubuntu" ]] && [[ $VERSION_ID_NUM -gt 1800 ]]; then - apt-get install -y libpmem-dev - apt-get install -y libpmemobj-dev - fi + apt-get install -y libpmem-dev libpmemblk-dev libpmemobj-dev fi if [[ $INSTALL_FUSE == "true" ]]; then # Additional dependencies for FUSE and NVMe-CUSE - if [[ $NAME == "Ubuntu" ]] && ((VERSION_ID_NUM > 1400 && VERSION_ID_NUM < 1900)); then - echo "Ubuntu $VERSION_ID does not have libfuse3-dev in mainline repository." - echo "You can install it manually" - else - apt-get install -y libfuse3-dev - fi + apt-get install -y libfuse3-dev fi if [[ $INSTALL_RBD == "true" ]]; then # Additional dependencies for RBD bdev in NVMe over Fabrics diff --git a/test/common/config/pkgdep/os/ubuntu b/test/common/config/pkgdep/os/ubuntu index eea362860..616c202ec 100644 --- a/test/common/config/pkgdep/os/ubuntu +++ b/test/common/config/pkgdep/os/ubuntu @@ -1,22 +1,8 @@ -case "$VERSION_CODENAME" in - xenial) # 16.04 - packages+=(btrfs-tools) - packages+=(targetcli) - ;; - *) - packages+=( - rdma-core - libpmempool1 - clang-tools - targetcli-fb - open-isns-utils - ) - - if [[ $VERSION_CODENAME == bionic ]]; then - packages+=(btrfs-tools) - else - # On Ubuntu 20.04 (focal) btrfs-tools are available under different name - btrfs-progs - packages+=(btrfs-progs) - fi - ;; -esac +packages+=( + rdma-core + libpmempool1 + clang-tools + targetcli-fb + open-isns-utils + btrfs-progs +) diff --git a/test/common/config/pkgdep/swupd b/test/common/config/pkgdep/swupd deleted file mode 100644 index 4129328cb..000000000 --- a/test/common/config/pkgdep/swupd +++ /dev/null @@ -1,21 +0,0 @@ -package_manager=swupd - -upgrade() { - sudo "$package_manager" update -y -} - -install() { - (($#)) || return 0 - - sudo "$package_manager" bundle-add -y "$@" -} - -packages=( - jq -) - -pre_install() { - if [[ $INSTALL_TSOCKS == true ]]; then - "tsocks package not present in clearlinux, proxy may not be available" - fi -} diff --git a/test/common/config/vm_setup.sh b/test/common/config/vm_setup.sh index e6b74b2af..53d4e6c5e 100755 --- a/test/common/config/vm_setup.sh +++ b/test/common/config/vm_setup.sh @@ -5,8 +5,7 @@ # # The purpose of this script is to provide a simple procedure for spinning up a new -# test environment capable of running our whole test suite. This script will install -# all of the necessary dependencies to run almost the complete test suite. +# test environment capable of running most autotest test suites. sudo() { "$(type -P sudo)" -E "$@"