From 4f7ab6733d2b7ba60c47dbe7735fe9c53f630ec3 Mon Sep 17 00:00:00 2001
From: Felix Fontein <felix@fontein.de>
Date: Fri, 22 Jan 2021 21:39:53 +0100
Subject: [PATCH] Add Ubuntu 20.04 to CI (#176)

* Add Ubuntu 20.04 to CI.

* Also use longer keys for Ubuntu 20.04.

* Fix condition.
---
 .azure-pipelines/azure-pipelines.yml                  | 2 ++
 tests/integration/targets/setup_openssl/vars/main.yml | 8 +++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml
index f561c1df..70f31cd9 100644
--- a/.azure-pipelines/azure-pipelines.yml
+++ b/.azure-pipelines/azure-pipelines.yml
@@ -106,6 +106,8 @@ stages:
               test: ubuntu1604
             - name: Ubuntu 18.04
               test: ubuntu1804
+            - name: Ubuntu 20.04
+              test: ubuntu2004
   - stage: Docker_2_10
     displayName: Docker 2.10
     dependsOn: []
diff --git a/tests/integration/targets/setup_openssl/vars/main.yml b/tests/integration/targets/setup_openssl/vars/main.yml
index 37ae9578..f2b772af 100644
--- a/tests/integration/targets/setup_openssl/vars/main.yml
+++ b/tests/integration/targets/setup_openssl/vars/main.yml
@@ -1,3 +1,9 @@
 ---
 default_rsa_key_size: 1024
-default_rsa_key_size_certifiates: '{{ 2048 if ansible_os_family == "RedHat" and ansible_facts.distribution_major_version | int >= 8 else 1024 }}'
+default_rsa_key_size_certifiates: >-
+  {{
+      2048 if
+        (ansible_os_family == "RedHat" and ansible_facts.distribution_major_version | int >= 8) or
+        (ansible_distribution == "Ubuntu" and ansible_facts.distribution_major_version | int >= 20)
+      else 1024
+  }}