From 6b0a2e65f5f1a02c56ecc92f62562553ed112f22 Mon Sep 17 00:00:00 2001 From: William Bradford Clark Date: Wed, 10 Feb 2021 13:40:02 -0500 Subject: [PATCH] (BKR-1698) Use generic vagrant box for centos6 The centos organization on vagrant cloud (htttps://app.vagrantup.com/centos) no longer provides a centos/6 box. This commit switches to the generic base boxes for centos which are still available and kept up to date. --- lib/beaker-hostgenerator/hypervisor/vagrant.rb | 2 +- test/fixtures/per-host-settings/vagrant-hypervisor.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/beaker-hostgenerator/hypervisor/vagrant.rb b/lib/beaker-hostgenerator/hypervisor/vagrant.rb index 20958d7f..4d880934 100644 --- a/lib/beaker-hostgenerator/hypervisor/vagrant.rb +++ b/lib/beaker-hostgenerator/hypervisor/vagrant.rb @@ -8,7 +8,7 @@ class Vagrant < BeakerHostGenerator::Hypervisor::Interface include BeakerHostGenerator::Data def generate_node(node_info, base_config, bhg_version) - if node_info['ostype'] =~ /^centos/ + if node_info['ostype'] =~ /^centos/ and not node_info['ostype'] =~ /6/ base_config['box'] = node_info['ostype'].sub(/(\d)/, '/\1') elsif node_info['ostype'] =~ /^fedora/ base_config['box'] = node_info['ostype'].sub(/(\d)/, '/\1') + '-cloud-base' diff --git a/test/fixtures/per-host-settings/vagrant-hypervisor.yaml b/test/fixtures/per-host-settings/vagrant-hypervisor.yaml index 0662d2e9..3bc12805 100644 --- a/test/fixtures/per-host-settings/vagrant-hypervisor.yaml +++ b/test/fixtures/per-host-settings/vagrant-hypervisor.yaml @@ -8,7 +8,7 @@ expected_hash: pe_ver: pe_upgrade_dir: pe_upgrade_ver: - box: centos/6 + box: generic/centos6 synced_folder: disabled platform: el-6-x86_64 packaging_platform: el-6-x86_64