[2.13] Backport recent bugfixes and mainly docker-cli issue (#6179)

* Reorder tests in packet file (#6067)

* Skip molecule tests for Ubuntu 18.04 (#6077)

* Fix kubernetes-dashboard template identation (#6066)

The 98e7a07fba commit udpates the
dashboard version to 2.0.0 but it enable skip login flag wasn't
updated. This change updates its identation to avoid issues when
dashboard_skip_login is enabled.

* Disable OVH CI (#6114)

* Create namespace when dashboard deployment uses customized namespace. (#6107)

* Create namespace when dashboard deployment uses customized namespace.

* Fix syntax.

* Fix apiserver port when upgrading (#6136)

* Fix docker fedora packages (#6097)

* Match docker-cli version with docker-engine version (when available)

* Disable upgrade jobs to allow release 2.13.1 (docker-cli bug)

Co-authored-by: Maxime Guyot <Miouge1@users.noreply.github.com>
Co-authored-by: Victor Morales <electrocucaracha@gmail.com>
Co-authored-by: petruha <5363545+p37ruh4@users.noreply.github.com>
Co-authored-by: Mateus Caruccio <mateus.caruccio@getupcloud.com>

roles/container-engine/docker/defaults/main.yml

@@ -1,5 +1,6 @@
 ---
 docker_version: '18.09'
+docker_cli_version: "{{ 'latest' if docker_version != 'latest' and docker_version is version('18.09', '<') else docker_version }}"
 docker_selinux_version: '17.03'
 
 docker_package_info:

roles/container-engine/docker/vars/debian.yml

@@ -16,9 +16,16 @@ docker_versioned_pkg:
   'stable': docker-ce=5:18.09.7~3-0~debian-{{ ansible_distribution_release|lower }}
   'edge': docker-ce=5:19.03.7~3-0~debian-{{ ansible_distribution_release|lower }}
 
+docker_cli_versioned_pkg:
+  'latest': docker-ce-cli
+  '18.09': docker-ce-cli=5:18.09.9~3-0~debian-{{ ansible_distribution_release|lower }}
+  '19.03': docker-ce-cli=5:19.03.9~3-0~debian-{{ ansible_distribution_release|lower }}
+
 docker_package_info:
   pkg_mgr: apt
   pkgs:
+    - name: "{{ docker_cli_versioned_pkg[docker_cli_version | string] }}"
+      force: yes
     - name: "{{ docker_versioned_pkg[docker_version | string] }}"
       force: yes
 

roles/container-engine/docker/vars/fedora.yml

@@ -2,21 +2,26 @@
 docker_kernel_min_version: '0'
 
 # https://docs.docker.com/install/linux/docker-ce/fedora/
-# https://download.docker.com/linux/fedora/28/x86_64/stable/Packages/
+# 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.fc28
-  '18.06': docker-ce-18.06.2.ce-3.fc28
-  '18.09': docker-ce-18.09.7-3.fc28
+  '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.8-3.fc{{ ansible_distribution_major_version }}
 
-#
-# This is due to the fact that the docker
-# packages available on Fedora are too recent
-#
-docker_version: "latest"
+docker_cli_versioned_pkg:
+  'latest': docker-ce-cli
+  '18.09': docker-ce-cli-19.03.8-3.fc{{ ansible_distribution_major_version }}
+  '19.03': docker-ce-cli-19.03.9-3.fc{{ ansible_distribution_major_version }}
+
+# Fedora 30/31 don't provide packages for docker 18.0x ...
+docker_version: "19.03"
+docker_cli_version: "19.03"
 
 docker_package_info:
   pkg_mgr: dnf
   pkgs:
+    - name: "{{ docker_cli_versioned_pkg[docker_cli_version | string] }}"
     - name: "{{ docker_versioned_pkg[docker_version | string] }}"

roles/container-engine/docker/vars/redhat.yml

@@ -16,6 +16,11 @@ docker_versioned_pkg:
   'stable': docker-ce-18.09.9-3.el7
   'edge': docker-ce-19.03.8-3.el7
 
+docker_cli_versioned_pkg:
+  'latest': docker-ce-cli
+  '18.09': docker-ce-cli-18.09.9-3.el7
+  '19.03': docker-ce-cli-19.03.9-3.el7
+
 docker_selinux_versioned_pkg:
   'latest': docker-ce-selinux-17.03.3.ce-1.el7
   '17.03': docker-ce-selinux-17.03.3.ce-1.el7
@@ -30,13 +35,15 @@ docker_pkgs_use_docker_ce:
     yum_conf: "{{ docker_yum_conf }}"
 
 docker_pkgs:
+  - name: "{{ docker_cli_versioned_pkg[docker_cli_version | string] }}"
+    yum_conf: "{{ docker_yum_conf }}"
   - name: "{{ docker_versioned_pkg[docker_version | string] }}"
     yum_conf: "{{ docker_yum_conf }}"
 
 docker_package_info:
   pkg_mgr: yum
   pkgs: |-
-    {%- if docker_version is version('17.04', '<') -%}
+    {%- if docker_version != "latest" and docker_version is version('17.04', '<') -%}
     {{ docker_pkgs_use_docker_ce }}
     {%- else -%}
     {{ docker_pkgs }}

roles/container-engine/docker/vars/ubuntu-amd64.yml

@@ -16,9 +16,16 @@ docker_versioned_pkg:
   'stable': docker-ce=5:18.09.7~3-0~ubuntu-{{ ansible_distribution_release|lower }}
   'edge': docker-ce=5:19.03.7~3-0~ubuntu-{{ ansible_distribution_release|lower }}
 
+docker_cli_versioned_pkg:
+  'latest': docker-ce-cli
+  '18.09': docker-ce-cli=5:18.09.9~3-0~ubuntu-{{ ansible_distribution_release|lower }}
+  '19.03': docker-ce-cli=5:19.03.9~3-0~ubuntu-{{ ansible_distribution_release|lower }}
+
 docker_package_info:
   pkg_mgr: apt
   pkgs:
+    - name: "{{ docker_cli_versioned_pkg[docker_cli_version | string] }}"
+      force: yes
     - name: "{{ docker_versioned_pkg[docker_version | string] }}"
       force: yes
 

roles/container-engine/docker/vars/ubuntu-arm64.yml

@@ -12,9 +12,16 @@ docker_versioned_pkg:
   'stable': docker-ce=5:18.09.7~3-0~ubuntu-{{ ansible_distribution_release|lower }}
   'edge': docker-ce=5:19.03.7~3-0~ubuntu-{{ ansible_distribution_release|lower }}
 
+docker_cli_versioned_pkg:
+  'latest': docker-ce-cli
+  '18.09': docker-ce-cli=5:18.09.9~3-0~ubuntu-{{ ansible_distribution_release|lower }}
+  '19.03': docker-ce-cli=5:19.03.9~3-0~ubuntu-{{ ansible_distribution_release|lower }}
+
 docker_package_info:
   pkg_mgr: apt
   pkgs:
+    - name: "{{ docker_cli_versioned_pkg[docker_cli_version | string] }}"
+      force: yes
     - name: "{{ docker_versioned_pkg[docker_version | string] }}"
       force: yes