From 33291dee587f24cd53ff834f83b15f29c2823408 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Mon, 1 Oct 2018 21:37:06 +0000
Subject: [PATCH] test more

---
 playbooks/groups/maintainer-test.yml            | 10 ++++++----
 vars/all/FedoraBranchedNumber.yaml              |  2 +-
 vars/all/FedoraPreviousPreviousCycleNumber.yaml |  2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/playbooks/groups/maintainer-test.yml b/playbooks/groups/maintainer-test.yml
index 50d01ecc1c..57dfbca057 100644
--- a/playbooks/groups/maintainer-test.yml
+++ b/playbooks/groups/maintainer-test.yml
@@ -24,6 +24,12 @@
   - import_tasks: "{{ tasks_path }}/cloud_setup_basic.yml"
   - name: set hostname (required by some services, at least postfix need it)
     hostname: name="{{inventory_hostname}}"
+  - include_vars: dir=/srv/web/infra/ansible/vars/all/ ignore_files=README
+  - debug: var=FedoraRawhideNumber
+  - debug: var=FedoraBranchedNumber
+  - debug: var=FedoraCycleNumber
+  - debug: var=FedoraPreviousCycleNumber
+  - debug: var=FedoraPreviousPreviousCycleNumber
 
 - import_playbook: "/srv/web/infra/ansible/playbooks/include/happy_birthday.yml myhosts=arm-packager"
 
@@ -40,10 +46,6 @@
 
   pre_tasks:
   - import_tasks: "{{ tasks_path }}/yumrepos.yml"
-  - include_vars: dir=/srv/web/infra/ansible/vars/all/ ignore_files=README
-  - debug: var=FedoraRawhideNumber
-  - debug: var=FedoraBranchedNumber
-  - debug: var=FedoraOldCycleNumber
 
   roles:
   - base
diff --git a/vars/all/FedoraBranchedNumber.yaml b/vars/all/FedoraBranchedNumber.yaml
index 9410cdaaa0..a203c73131 100644
--- a/vars/all/FedoraBranchedNumber.yaml
+++ b/vars/all/FedoraBranchedNumber.yaml
@@ -1 +1 @@
-FedoraBranchedNumber: "{{ FedoraCycleNumber|int + 1 }}"
+FedoraBranchedNumber: "{{ FedoraCycleNumber|int + 1 if FedoraBranched else 0 }}"
diff --git a/vars/all/FedoraPreviousPreviousCycleNumber.yaml b/vars/all/FedoraPreviousPreviousCycleNumber.yaml
index 43548604e4..e1854b215b 100644
--- a/vars/all/FedoraPreviousPreviousCycleNumber.yaml
+++ b/vars/all/FedoraPreviousPreviousCycleNumber.yaml
@@ -1 +1 @@
-FedoraPreviousPreviousCycleNumber: "{{ FedoraCycleNumber|int - 1 }}"
+FedoraPreviousPreviousCycleNumber: "{{ FedoraCycleNumber|int - 2 if FedoraPreviousPrevious else 0 }}"