From 01773c5338830935ea366ab96ad26fd1dae1e4f8 Mon Sep 17 00:00:00 2001
From: "patchback[bot]" <45432694+patchback[bot]@users.noreply.github.com>
Date: Sat, 1 May 2021 14:37:29 +0200
Subject: [PATCH] Add Fedora 34 to CI (#2384) (#2390)

* Add fedora 34 and fix typo

* Remove Fedora 32 from devel testing

* Use one newer version of Fedora for fixed ansible versions

* Revert "Use one newer version of Fedora for fixed ansible versions"

This reverts commit cbd006bd385865905c18b87655bd98b0610d4abc.

* Try to skip task.

* Revert "Try to skip task."

This reverts commit ff0c899a8650e78967a1933b93fd8015695a6a61.

* Temporary disable Fedora 34 on setup_postgresql_db

Co-authored-by: Felix Fontein <felix@fontein.de>
(cherry picked from commit ae21af882075948f9e427919776e5c155b263ea2)

Co-authored-by: Amin Vakil <info@aminvakil.com>
---
 .azure-pipelines/azure-pipelines.yml                        | 6 +++---
 .../integration/targets/setup_postgresql_db/tasks/main.yml  | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml
index b95e0e6201..ed744c5c19 100644
--- a/.azure-pipelines/azure-pipelines.yml
+++ b/.azure-pipelines/azure-pipelines.yml
@@ -256,10 +256,10 @@ stages:
               test: centos7
             - name: CentOS 8
               test: centos8
-            - name: Fedora 32
-              test: fedora32
             - name: Fedora 33
               test: fedora33
+            - name: Fedora 34
+              test: fedora34
             - name: openSUSE 15 py2
               test: opensuse15py2
             - name: openSUSE 15 py3
@@ -282,7 +282,7 @@ stages:
           targets:
             - name: CentOS 8
               test: centos8
-            - name: Fedora 32
+            - name: Fedora 33
               test: fedora33
             - name: openSUSE 15 py3
               test: opensuse15
diff --git a/tests/integration/targets/setup_postgresql_db/tasks/main.yml b/tests/integration/targets/setup_postgresql_db/tasks/main.yml
index 2322ee2cbf..f535ecdcf9 100644
--- a/tests/integration/targets/setup_postgresql_db/tasks/main.yml
+++ b/tests/integration/targets/setup_postgresql_db/tasks/main.yml
@@ -11,6 +11,10 @@
 - meta: end_play
   when: ansible_facts.distribution == 'CentOS' and ansible_facts.distribution_major_version == '8'
 
+# Temporary disable Fedora 34
+- meta: end_play
+  when: ansible_facts.distribution == 'Fedora' and ansible_facts.distribution_major_version == '34'
+
 - name: python 2
   set_fact:
     python_suffix: ''