Merge pull request #371 from StatensPensjonskasse/fix-opensuse-leap-d…

…ocker-image Don't prepend amd64/ for opensuse images
voxpupuli · Jun 2, 2024 · a02abc3 · a02abc3
2 parents 54ac49e + 49526d1
commit a02abc3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/lib/beaker-hostgenerator/hypervisor/docker.rb b/lib/beaker-hostgenerator/hypervisor/docker.rb
@@ -17,7 +17,10 @@ def generate_node(node_info, base_config, bhg_version)
         end
 
         base_config['image'] = image(ostype)
-        base_config['image'].prepend('amd64/') if node_info['bits'] == '64' && !base_config['image'].start_with?('quay.io/')
+        base_config['image'].prepend('amd64/') if
+          node_info['bits'] == '64' &&
+          !base_config['image'].start_with?('quay.io/') &&
+          !base_config['image'].start_with?('opensuse/')
 
         base_generate_node(node_info, base_config, bhg_version, :docker)
       end

diff --git a/test/fixtures/per-host-settings/docker-regex-validation.yaml b/test/fixtures/per-host-settings/docker-regex-validation.yaml
@@ -16,7 +16,7 @@ expected_hash:
     opensuse15-64-1:
       docker_cmd:
       - "/sbin/init"
-      image: amd64/opensuse/leap:15
+      image: opensuse/leap:15
       platform: opensuse-15-x86_64
       docker_image_commands:
       - cp /bin/true /sbin/agetty