From 96355f85dd3a798784905b798490af98e8eccd8c Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Fri, 12 Mar 2021 22:23:47 +0000 Subject: [PATCH] Updated from OpenStack Ansible Tests Change-Id: I7718a3bafc31a95b9f3a42ab29c5cd2ab2e09d39 --- Vagrantfile | 25 +++++++------------------ bindep.txt | 7 ++----- run_tests.sh | 8 +------- 3 files changed, 10 insertions(+), 30 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 7691c3c..e02fdbb 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -35,28 +35,17 @@ Vagrant.configure(2) do |config| centos8.vm.box = "centos/8" end - config.vm.define "debian8" do |debian8| - debian8.vm.box = "debian/jessie64" - end - - config.vm.define "debian9" do |debian9| - debian9.vm.box = "debian/stretch64" - end - - config.vm.define "gentoo" do |gentoo| - gentoo.vm.box = "generic/gentoo" - end - - config.vm.define "opensuse150" do |leap150| - leap150.vm.box = "opensuse/openSUSE-15.0-x86_64" - end - - config.vm.define "opensuse151" do |leap151| - leap151.vm.box = "opensuse/openSUSE-15.1-x86_64" + config.vm.define "debian10" do |debian10| + debian10.vm.box = "debian/buster64" end config.vm.define "ubuntu1804" do |bionic| bionic.disksize.size = "40GB" bionic.vm.box = "ubuntu/bionic64" end + + config.vm.define "ubuntu2004" do |focal| + bionic.disksize.size = "40GB" + bionic.vm.box = "ubuntu/focal64" + end end diff --git a/bindep.txt b/bindep.txt index bb77692..3db7d13 100644 --- a/bindep.txt +++ b/bindep.txt @@ -26,7 +26,7 @@ gcc # Base requirements for Ubuntu -git-core [platform:dpkg platform:suse] +git-core [platform:dpkg] libssl-dev [platform:dpkg] libffi-dev [platform:dpkg] python3 [platform:dpkg] @@ -35,15 +35,12 @@ python3-dev [platform:dpkg] # Base requirements for RPM distros gcc-c++ [platform:rpm] -git [platform:rpm !platform:suse] +git [platform:rpm] libffi-devel [platform:rpm] openssl-devel [platform:rpm] python3-dnf [platform:fedora] python3-devel [platform:rpm] -# Base requirements for Gentoo -git [platform:gentoo] - # For SELinux libselinux-python3 [platform:redhat] libsemanage-python3 [platform:redhat] diff --git a/run_tests.sh b/run_tests.sh index 93e91dd..221a098 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -53,19 +53,13 @@ source /etc/os-release || source /usr/lib/os-release # Figure out the appropriate package install command case ${ID,,} in - *suse*) pkg_mgr_cmd="zypper -n in" ;; centos|rhel|fedora) pkg_mgr_cmd="dnf install -y" ;; ubuntu|debian) pkg_mgr_cmd="apt-get install -y" ;; - # Gentoo needs to have version set since it's rolling - gentoo) pkg_mgr_cmd="emerge --jobs=4"; VERSION="rolling" ;; *) echo "unsupported distribution: ${ID,,}"; exit 1 ;; esac # Install git so that we can clone the tests repo if git is not available -case ${ID,,} in - gentoo) which git &>/dev/null || eval sudo "${pkg_mgr_cmd}" dev-vcs/git ;; - *) which git &>/dev/null || eval sudo "${pkg_mgr_cmd}" git ;; -esac +which git &>/dev/null || eval sudo "${pkg_mgr_cmd}" git # Clone the tests repo for access to the common test script if [[ ! -d "${COMMON_TESTS_PATH}" ]]; then