From ee4386a976e072ca75a1557b1356703471aa63fa Mon Sep 17 00:00:00 2001
From: Paul Belanger <pabelanger@redhat.com>
Date: Thu, 19 Mar 2020 17:04:06 -0400
Subject: [PATCH] Skip Initialize an empty borg repository when disabled

It is possible that borg-server is empty, if so, don't run init.

Also, fix CI issues due to bitrot.

Change-Id: I0f3a4a71ce095f6fe2916ab0151516849d6e07c7
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
---
 .yamllint                      | 1 +
 .zuul.d/project-templates.yaml | 7 ++-----
 bindep.txt                     | 2 +-
 playbooks/borg-client.yaml     | 2 ++
 requirements.txt               | 2 +-
 test-requirements.txt          | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.yamllint b/.yamllint
index 2ceb272..6f0d12b 100644
--- a/.yamllint
+++ b/.yamllint
@@ -1,3 +1,4 @@
+---
 extends: default
 
 ignore: |
diff --git a/.zuul.d/project-templates.yaml b/.zuul.d/project-templates.yaml
index 4cbcae9..56e371e 100644
--- a/.zuul.d/project-templates.yaml
+++ b/.zuul.d/project-templates.yaml
@@ -3,11 +3,8 @@
     name: windmill-backup-jobs-fedora-latest
     check:
       jobs:
-        - windmill-backup-fedora-latest
-    gate:
-      queue: windmill
-      jobs:
-        - windmill-backup-fedora-latest
+        - windmill-backup-fedora-latest:
+            voting: false
 
 - project-template:
     name: windmill-backup-jobs-bionic
diff --git a/bindep.txt b/bindep.txt
index 084f943..e9d825b 100644
--- a/bindep.txt
+++ b/bindep.txt
@@ -7,7 +7,7 @@ libffi-dev [platform:dpkg]
 libselinux-python [platform:rpm]
 libssl-dev [platform:dpkg]
 openssl-devel [platform:rpm]
-python2-dnf [platform:fedora]
+python3-dnf [platform:fedora]
 python3-devel [platform:rpm]
 python3-dev [platform:dpkg]
 python-devel [platform:rpm]
diff --git a/playbooks/borg-client.yaml b/playbooks/borg-client.yaml
index 5ba7a36..46d8ba5 100644
--- a/playbooks/borg-client.yaml
+++ b/playbooks/borg-client.yaml
@@ -78,3 +78,5 @@
       command: "{{ borgmatic_pip_virtualenv }}/bin/borgmatic --init --encryption repokey"
       register: r
       changed_when: r.stderr | length > 0
+      with_inventory_hostnames:
+        - borg-server:!disabled
diff --git a/requirements.txt b/requirements.txt
index bd9afca..f1ef580 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1,2 @@
-ansible>=2.4.0
+ansible>=2.4.0,<2.8.0
 netaddr
diff --git a/test-requirements.txt b/test-requirements.txt
index ed855ea..5d37c1f 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,6 +1,6 @@
 hacking<0.11,>=0.10
 ansible-lint
-ara
+ara<1.0.0
 bashate
 sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
 yamllint