From be03aa4abf09780fa7a1f4276a0b8bd294240039 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Fri, 6 Mar 2020 22:24:59 +0000
Subject: [PATCH] maintainer-test: re-add ppc64le-test, using a donated vm in
 cz.

Once we get cloud power8's back online we can bring this back up ourselves.

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
---
 inventory/cloud                      |  4 ++--
 inventory/inventory                  |  1 +
 playbooks/groups/maintainer-test.yml | 18 ++----------------
 3 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/inventory/cloud b/inventory/cloud
index bbae3ad137..bc1b8c930b 100644
--- a/inventory/cloud
+++ b/inventory/cloud
@@ -49,8 +49,8 @@ iddev.fedorainfracloud.org
 # koji simple ci development - ticket 6419
 simple-koji-ci-prod.fedorainfracloud.org
 retrace-stg.aws.fedoraproject.org
-
-
+# This is not in aws, but here is good enough for now
+ppc64le-test.fedorainfracloud.org
 
 [cloud:children]
 cloud_phx2
diff --git a/inventory/inventory b/inventory/inventory
index a2c4352449..dc10e0e788 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -952,6 +952,7 @@ f32-test.fedorainfracloud.org
 rawhide-test.fedorainfracloud.org
 el6-test.fedorainfracloud.org
 el7-test.fedorainfracloud.org
+ppc64le-test.fedorainfracloud.org
 
 [aarch64_test]
 aarch64-test01.fedorainfracloud.org
diff --git a/playbooks/groups/maintainer-test.yml b/playbooks/groups/maintainer-test.yml
index eef6779794..27a067af4b 100644
--- a/playbooks/groups/maintainer-test.yml
+++ b/playbooks/groups/maintainer-test.yml
@@ -1,23 +1,9 @@
-- name: Spin up maintainertest cloud instances
-  hosts: maintainer_test_oldcloud
-  gather_facts: False
-
-  vars_files:
-   - /srv/web/infra/ansible/vars/global.yml
-   - /srv/private/ansible/vars.yml
-   - /srv/web/infra/ansible/vars/fedora-cloud.yml
-   - /srv/private/ansible/files/openstack/passwords.yml
-
-  tasks:
-  - import_tasks: "{{ tasks_path }}/persistent_cloud.yml"
-
 - name: Do some basic cloud setup on them
-  hosts: maintainer_test:maintainer_test_oldcloud
+  hosts: maintainer_test:aarch64_test
   gather_facts: True
   vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - /srv/private/ansible/vars.yml
-   - /srv/private/ansible/files/openstack/passwords.yml
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
 
   pre_tasks:
@@ -26,7 +12,7 @@
     hostname: name="{{inventory_hostname}}"
 
 - name: Setup maintainer test hosts
-  hosts: maintainer_test:aarch64_test:maintainer_test_oldcloud
+  hosts: maintainer_test:aarch64_test
   gather_facts: True
   tags:
    - maintainer-test