External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-02-01 01:28:11 -03:30
Code Issues Packages Projects Releases Wiki Activity

Move fedora30 jobs to fedora32 (#6426)

Browse Source
This commit is contained in:
Florian Ruynat
2020-07-31 08:31:07 +02:00
committed by GitHub
parent a78e861a89
commit bf6168fca8
13 changed files with 44 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
roles/container-engine/docker/defaults/main.yml
View File

@@ -28,7 +28,9 @@ yum_repo_dir: /etc/yum.repos.d
docker_yum_conf: /etc/yum_docker.conf
# Fedora docker-ce repo
docker_fedora_repo_base_url: 'https://download.docker.com/linux/fedora/$releasever/$basearch/stable'
# TODO Remove the line below as soon as docker rpm are available for f32
docker_fedora_release: "{{ '31' if (ansible_distribution_major_version | int) > 31 else ansible_distribution_major_version }}"
docker_fedora_repo_base_url: 'https://download.docker.com/linux/fedora/{{ docker_fedora_release }}/$basearch/stable'
docker_fedora_repo_gpgkey: 'https://download.docker.com/linux/fedora/gpg'
# CentOS/RedHat docker-ce repo
docker_rh_repo_base_url: 'https://download.docker.com/linux/centos/7/$basearch/stable'

20
roles/container-engine/docker/vars/fedora.yml
View File

@@ -1,22 +1,24 @@
---
docker_kernel_min_version: '0'
# TODO Remove the line below as soon as docker rpm are available for f32
fedora_distribution_package: "{{ '31' if (ansible_distribution_major_version | int) > 31 else ansible_distribution_major_version }}"
# https://docs.docker.com/install/linux/docker-ce/fedora/
# https://download.docker.com/linux/fedora/<fedora-version>/x86_64/stable/Packages/
docker_versioned_pkg:
'latest': docker-ce
'18.03': docker-ce-18.03.1.ce-3.fc{{ ansible_distribution_major_version }}
'18.06': docker-ce-18.06.2.ce-3.fc{{ ansible_distribution_major_version }}
'18.09': docker-ce-18.09.7-3.fc{{ ansible_distribution_major_version }}
'19.03': docker-ce-19.03.12-3.fc{{ ansible_distribution_major_version }}
'stable': docker-ce-19.03.12-3.fc{{ ansible_distribution_major_version }}
'edge': docker-ce-19.03.12-3.fc{{ ansible_distribution_major_version }}
'18.03': docker-ce-18.03.1.ce-3.fc{{ fedora_distribution_package }}
'18.06': docker-ce-18.06.2.ce-3.fc{{ fedora_distribution_package }}
'18.09': docker-ce-18.09.7-3.fc{{ fedora_distribution_package }}
'19.03': docker-ce-19.03.12-3.fc{{ fedora_distribution_package }}
'stable': docker-ce-19.03.12-3.fc{{ fedora_distribution_package }}
'edge': docker-ce-19.03.12-3.fc{{ fedora_distribution_package }}
docker_cli_versioned_pkg:
'latest': docker-ce-cli
'18.09': docker-ce-cli-19.03.12-3.fc{{ ansible_distribution_major_version }}
'19.03': docker-ce-cli-19.03.12-3.fc{{ ansible_distribution_major_version }}
'18.09': docker-ce-cli-19.03.12-3.fc{{ fedora_distribution_package }}
'19.03': docker-ce-cli-19.03.12-3.fc{{ fedora_distribution_package }}
docker_package_info:
pkg_mgr: dnf