From 949551b46306297f7be2064ebd87c65b5df5c155 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20B=C3=A9rtoli?= <javier@netmanagers.com.ar>
Date: Wed, 9 Feb 2022 08:12:45 -0300
Subject: [PATCH] fix(repository): amazonlinux repository url

---
 docker/osmap.yaml                               | 10 ++++++++--
 kitchen.yml                                     |  2 ++
 test/integration/package/controls/repository.rb |  9 ++++++---
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/docker/osmap.yaml b/docker/osmap.yaml
index a9011d55..66d52d6b 100644
--- a/docker/osmap.yaml
+++ b/docker/osmap.yaml
@@ -69,8 +69,9 @@ Raspbian:
 
 
     compose:
-      name: docker-compose  
-      use_upstream: package   
+      name: docker-compose
+      use_upstream: package
+
 Amazon:
   pkg:
     docker:
@@ -85,3 +86,8 @@ Fedora:
       - selinux-policy-minimum
       - python3-dnf-plugin-versionlock
       - python3-docker
+    docker:
+      repo:
+        baseurl: 'https://download.docker.com/linux/fedora/$releasever/$basearch/stable'
+        file: '/etc/yum.repos.d/docker-ce.repo'
+        gpgkey: 'https://download.docker.com/linux/fedora/gpg'
diff --git a/kitchen.yml b/kitchen.yml
index 14c7b41a..44f9d63a 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -533,6 +533,8 @@ suites:
       inspec_tests:
         - path: test/integration/package
   - name: repo
+    excludes:
+      - arch-base-latest-master-py3
     provisioner:
       state_top:
         base:
diff --git a/test/integration/package/controls/repository.rb b/test/integration/package/controls/repository.rb
index 6a5326d0..c8c322cf 100644
--- a/test/integration/package/controls/repository.rb
+++ b/test/integration/package/controls/repository.rb
@@ -1,5 +1,9 @@
 # frozen_string_literal: true
 
+only_if('archlinux does not has a repository') do
+  os[:name] != 'arch'
+end
+
 case platform.family
 when 'redhat', 'fedora', 'suse'
   os_name_repo_file = {
@@ -9,11 +13,10 @@
 
   os_name_repo_url = {
     'amazon' => 'https://download.docker.com/linux/centos/7/$basearch/stable',
+    'fedora' => 'https://download.docker.com/linux/fedora/$releasever/$basearch/stable',
     'opensuse' => 'https://download.docker.com/linux/sles/$releasever/$basearch/stable'
   }
-  # rubocop:disable Metrics/LineLength
-  os_name_repo_url.default = "https://download.docker.com/linux/#{platform.name}/$releasever/$basearch/stable"
-  # rubocop:enable Metrics/LineLength
+  os_name_repo_url.default = "https://download.docker.com/linux/centos/#{platform.release.to_i}/$basearch/stable"
   repo_url = os_name_repo_url[platform.name]
   repo_file = os_name_repo_file[platform.name]