From 2ed7ab791fb456b5f98ab1c5e62d653e11a559c0 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Sun, 17 Mar 2024 20:09:08 +0100 Subject: [PATCH] Support different container implementations from beaker-docker This adds support for * docker_podman * container * container_swarm * container_podman * container_docker See https://github.com/voxpupuli/gha-puppet/pull/48 --- lib/beaker-hostgenerator/hypervisor.rb | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/beaker-hostgenerator/hypervisor.rb b/lib/beaker-hostgenerator/hypervisor.rb index 30bb69ad..0dbedac5 100644 --- a/lib/beaker-hostgenerator/hypervisor.rb +++ b/lib/beaker-hostgenerator/hypervisor.rb @@ -39,12 +39,16 @@ def self.create(node_info, options) # and their implementations. def self.builtin_hypervisors { - 'vmpooler' => BeakerHostGenerator::Hypervisor::Vmpooler, - 'vagrant' => BeakerHostGenerator::Hypervisor::Vagrant, - 'vagrant_libvirt' => BeakerHostGenerator::Hypervisor::Vagrant, - 'docker' => BeakerHostGenerator::Hypervisor::Docker, 'abs' => BeakerHostGenerator::Hypervisor::ABS, + 'container' => BeakerHostGenerator::Hypervisor::Docker, + 'container_docker' => BeakerHostGenerator::Hypervisor::Docker, + 'container_swarm' => BeakerHostGenerator::Hypervisor::Docker, + 'docker' => BeakerHostGenerator::Hypervisor::Docker, + 'docker_podman' => BeakerHostGenerator::Hypervisor::Docker, 'hcloud' => BeakerHostGenerator::Hypervisor::Hcloud, + 'vagrant' => BeakerHostGenerator::Hypervisor::Vagrant, + 'vagrant_libvirt' => BeakerHostGenerator::Hypervisor::Vagrant, + 'vmpooler' => BeakerHostGenerator::Hypervisor::Vmpooler, } end