From patchwork Wed Mar 4 15:58:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Pisati X-Patchwork-Id: 1249091 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48Xdpf523Vz9sR4; Thu, 5 Mar 2020 02:58:48 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1j9WQ0-0008Fw-CL; Wed, 04 Mar 2020 15:58:44 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1j9WPw-0008Fd-St for kernel-team@lists.ubuntu.com; Wed, 04 Mar 2020 15:58:40 +0000 Received: from 1.general.ppisati.uk.vpn ([10.172.193.134] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1j9WPw-0004I3-JU for kernel-team@lists.ubuntu.com; Wed, 04 Mar 2020 15:58:40 +0000 From: Paolo Pisati To: kernel-team@lists.ubuntu.com Subject: [PATCH] UBUNTU: SAUCE: adjust btrfs-tool/btrfs-progs installation depending on series Date: Wed, 4 Mar 2020 16:58:39 +0100 Message-Id: <20200304155839.49152-2-paolo.pisati@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200304155839.49152-1-paolo.pisati@canonical.com> References: <20200304155839.49152-1-paolo.pisati@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" Precise, Trusty and Xenial have btrfs-tools, while Bionic, Eoan, Focal, etc will install btrfs-progs Signed-off-by: Paolo Pisati --- iozone-fsync/iozone.py | 6 +++++- iozone-nolazy/iozone.py | 6 +++++- iozone/iozone.py | 6 +++++- tiobench/tiobench.py | 6 +++++- ubuntu_btrfs_kernel_fixes/ubuntu_btrfs_kernel_fixes.py | 6 +++++- ubuntu_ecryptfs/ubuntu_ecryptfs.py | 6 +++++- ubuntu_generic_fstest/ubuntu_generic_fstest.py | 8 +++++++- ubuntu_stress_btrfs/ubuntu_stress_btrfs.py | 6 +++++- ubuntu_stress_btrfs_cmd/ubuntu_stress_btrfs_cmd.py | 6 +++++- xfstests/xfstests.py | 5 ++++- 10 files changed, 51 insertions(+), 10 deletions(-) diff --git a/iozone-fsync/iozone.py b/iozone-fsync/iozone.py index 63a8c3a..9358033 100644 --- a/iozone-fsync/iozone.py +++ b/iozone-fsync/iozone.py @@ -28,10 +28,14 @@ class iozone(test.test): series = platform.dist()[2] pkgs = [ - 'build-essential', 'gnuplot', 'xfsdump', 'xfsprogs', 'btrfs-tools', + 'build-essential', 'gnuplot', 'xfsdump', 'xfsprogs', ] gcc = 'gcc' if arch in ['ppc64le', 'aarch64', 's390x'] else 'gcc-multilib' pkgs.append(gcc) + if series in ['precise', 'trusty', 'xenial']: + pkgs.append('btrfs-tools') + else: + pkgs.append('btrfs-progs') cmd = 'apt-get install --yes --force-yes ' + ' '.join(pkgs) self.results = utils.system_output(cmd, retain_output=True) diff --git a/iozone-nolazy/iozone.py b/iozone-nolazy/iozone.py index 63a8c3a..9358033 100644 --- a/iozone-nolazy/iozone.py +++ b/iozone-nolazy/iozone.py @@ -28,10 +28,14 @@ class iozone(test.test): series = platform.dist()[2] pkgs = [ - 'build-essential', 'gnuplot', 'xfsdump', 'xfsprogs', 'btrfs-tools', + 'build-essential', 'gnuplot', 'xfsdump', 'xfsprogs', ] gcc = 'gcc' if arch in ['ppc64le', 'aarch64', 's390x'] else 'gcc-multilib' pkgs.append(gcc) + if series in ['precise', 'trusty', 'xenial']: + pkgs.append('btrfs-tools') + else: + pkgs.append('btrfs-progs') cmd = 'apt-get install --yes --force-yes ' + ' '.join(pkgs) self.results = utils.system_output(cmd, retain_output=True) diff --git a/iozone/iozone.py b/iozone/iozone.py index 63a8c3a..9358033 100644 --- a/iozone/iozone.py +++ b/iozone/iozone.py @@ -28,10 +28,14 @@ class iozone(test.test): series = platform.dist()[2] pkgs = [ - 'build-essential', 'gnuplot', 'xfsdump', 'xfsprogs', 'btrfs-tools', + 'build-essential', 'gnuplot', 'xfsdump', 'xfsprogs', ] gcc = 'gcc' if arch in ['ppc64le', 'aarch64', 's390x'] else 'gcc-multilib' pkgs.append(gcc) + if series in ['precise', 'trusty', 'xenial']: + pkgs.append('btrfs-tools') + else: + pkgs.append('btrfs-progs') cmd = 'apt-get install --yes --force-yes ' + ' '.join(pkgs) self.results = utils.system_output(cmd, retain_output=True) diff --git a/tiobench/tiobench.py b/tiobench/tiobench.py index e700027..9340a69 100644 --- a/tiobench/tiobench.py +++ b/tiobench/tiobench.py @@ -12,10 +12,14 @@ class tiobench(test.test): series = platform.dist()[2] pkgs = [ - 'build-essential', 'gnuplot', 'xfsdump', 'xfsprogs', 'btrfs-tools', + 'build-essential', 'gnuplot', 'xfsdump', 'xfsprogs', ] gcc = 'gcc' if arch in ['ppc64le', 'aarch64', 's390x'] else 'gcc-multilib' pkgs.append(gcc) + if series in ['precise', 'trusty', 'xenial']: + pkgs.append('btrfs-tools') + else: + pkgs.append('btrfs-progs') cmd = 'apt-get install --yes --force-yes ' + ' '.join(pkgs) self.results = utils.system_output(cmd, retain_output=True) diff --git a/ubuntu_btrfs_kernel_fixes/ubuntu_btrfs_kernel_fixes.py b/ubuntu_btrfs_kernel_fixes/ubuntu_btrfs_kernel_fixes.py index 6765382..41cd50e 100644 --- a/ubuntu_btrfs_kernel_fixes/ubuntu_btrfs_kernel_fixes.py +++ b/ubuntu_btrfs_kernel_fixes/ubuntu_btrfs_kernel_fixes.py @@ -33,10 +33,14 @@ class ubuntu_btrfs_kernel_fixes(test.test): series = platform.dist()[2] pkgs = [ - 'build-essential', 'xfsprogs', 'btrfs-tools', 'git', 'acl', 'libattr1-dev', + 'build-essential', 'xfsprogs', 'git', 'acl', 'libattr1-dev', ] gcc = 'gcc' if arch in ['ppc64le', 'aarch64', 's390x'] else 'gcc-multilib' pkgs.append(gcc) + if series in ['precise', 'trusty', 'xenial']: + pkgs.append('btrfs-tools') + else: + pkgs.append('btrfs-progs') if self.which('sysbench') is None: pkgs.append('sysbench') diff --git a/ubuntu_ecryptfs/ubuntu_ecryptfs.py b/ubuntu_ecryptfs/ubuntu_ecryptfs.py index 4e193ea..e8dcd76 100644 --- a/ubuntu_ecryptfs/ubuntu_ecryptfs.py +++ b/ubuntu_ecryptfs/ubuntu_ecryptfs.py @@ -11,10 +11,14 @@ class ubuntu_ecryptfs(test.test): series = platform.dist()[2] pkgs = [ - 'bzr', 'build-essential', 'libglib2.0-dev', 'intltool', 'keyutils', 'libkeyutils-dev', 'libpam0g-dev', 'libnss3-dev', 'libtool', 'acl', 'xfsprogs', 'btrfs-tools', 'libattr1-dev' + 'bzr', 'build-essential', 'libglib2.0-dev', 'intltool', 'keyutils', 'libkeyutils-dev', 'libpam0g-dev', 'libnss3-dev', 'libtool', 'acl', 'xfsprogs', 'libattr1-dev' ] gcc = 'gcc' if arch in ['ppc64le', 'aarch64', 's390x'] else 'gcc-multilib' pkgs.append(gcc) + if series in ['precise', 'trusty', 'xenial']: + pkgs.append('btrfs-tools') + else: + pkgs.append('btrfs-progs') cmd = 'apt-get install --yes --force-yes ' + ' '.join(pkgs) self.results = utils.system_output(cmd, retain_output=True) diff --git a/ubuntu_generic_fstest/ubuntu_generic_fstest.py b/ubuntu_generic_fstest/ubuntu_generic_fstest.py index 33dd83b..f9dae1e 100644 --- a/ubuntu_generic_fstest/ubuntu_generic_fstest.py +++ b/ubuntu_generic_fstest/ubuntu_generic_fstest.py @@ -4,6 +4,7 @@ import os import glob from autotest.client import test, utils import multiprocessing +import platform from autotest.client.shared import error class ubuntu_generic_fstest(test.test): @@ -17,10 +18,15 @@ class ubuntu_generic_fstest(test.test): # if you change setup, be sure to increment version # def setup(self): + series = platform.dist()[2] self.job.require_gcc() utils.system_output('rm -f /etc/*/S99autotest || true', retain_output=True) - pkgs = [ 'btrfs-tools', 'xfsprogs', 'jfsutils' ] + pkgs = [ 'xfsprogs', 'jfsutils' ] + if series in ['precise', 'trusty', 'xenial']: + pkgs.append('btrfs-tools') + else: + pkgs.append('btrfs-progs') for pkg in pkgs: print "Installing package " + pkg utils.system_output('apt-get install ' + pkg + ' --yes --force-yes ', retain_output=True) diff --git a/ubuntu_stress_btrfs/ubuntu_stress_btrfs.py b/ubuntu_stress_btrfs/ubuntu_stress_btrfs.py index 5b1b74d..fb626fe 100644 --- a/ubuntu_stress_btrfs/ubuntu_stress_btrfs.py +++ b/ubuntu_stress_btrfs/ubuntu_stress_btrfs.py @@ -13,10 +13,14 @@ class ubuntu_stress_btrfs(test.test): series = platform.dist()[2] pkgs = [ - 'build-essential', 'xfsprogs', 'btrfs-tools', 'git', 'acl', 'libattr1-dev', 'libkeyutils-dev', + 'build-essential', 'xfsprogs', 'git', 'acl', 'libattr1-dev', 'libkeyutils-dev', ] gcc = 'gcc' if arch in ['ppc64le', 'aarch64', 's390x'] else 'gcc-multilib' pkgs.append(gcc) + if series in ['precise', 'trusty', 'xenial']: + pkgs.append('btrfs-tools') + else: + pkgs.append('btrfs-progs') cmd = 'apt-get install --yes --force-yes ' + ' '.join(pkgs) self.results = utils.system_output(cmd, retain_output=True) diff --git a/ubuntu_stress_btrfs_cmd/ubuntu_stress_btrfs_cmd.py b/ubuntu_stress_btrfs_cmd/ubuntu_stress_btrfs_cmd.py index 76615a0..e63b3c7 100644 --- a/ubuntu_stress_btrfs_cmd/ubuntu_stress_btrfs_cmd.py +++ b/ubuntu_stress_btrfs_cmd/ubuntu_stress_btrfs_cmd.py @@ -13,10 +13,14 @@ class ubuntu_stress_btrfs_cmd(test.test): series = platform.dist()[2] pkgs = [ - 'build-essential', 'xfsprogs', 'btrfs-tools', 'git', 'acl', 'libattr1-dev', + 'build-essential', 'xfsprogs', 'git', 'acl', 'libattr1-dev', ] gcc = 'gcc' if arch in ['ppc64le', 'aarch64', 's390x'] else 'gcc-multilib' pkgs.append(gcc) + if series in ['precise', 'trusty', 'xenial']: + pkgs.append('btrfs-tools') + else: + pkgs.append('btrfs-progs') cmd = 'apt-get install --yes --force-yes ' + ' '.join(pkgs) self.results = utils.system_output(cmd, retain_output=True) diff --git a/xfstests/xfstests.py b/xfstests/xfstests.py index 1f4bfab..5be0f9c 100644 --- a/xfstests/xfstests.py +++ b/xfstests/xfstests.py @@ -37,7 +37,6 @@ class xfstests(test.test): 'python-xattr', 'quota', 'bc', - 'btrfs-tools', 'attr', 'texinfo', 'texlive', @@ -56,6 +55,10 @@ class xfstests(test.test): if series not in ['precise', 'trusty']: pkgs.append('libtool-bin') + if series in ['precise', 'trusty', 'xenial']: + pkgs.append('btrfs-tools') + else: + pkgs.append('btrfs-progs') cmd = 'apt-get install --yes ' + ' '.join(pkgs) self.results = utils.system_output(cmd, retain_output=True)