From 2fdb95961baccbdc1ab5a5b706d084ba87173a45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gon=C3=A9ri=20Le=20Bouder?= <goneri@lebouder.net>
Date: Fri, 6 May 2022 12:05:24 -0400
Subject: [PATCH] restore playbooks/base/post.yaml from before the RAX problem

Use version from ab2c7f6c02b5b5c6d71ba3d99810940959ecc393.
---
 playbooks/base/post.yaml | 49 ++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 27 deletions(-)

diff --git a/playbooks/base/post.yaml b/playbooks/base/post.yaml
index 89db8c4..63add4f 100644
--- a/playbooks/base/post.yaml
+++ b/playbooks/base/post.yaml
@@ -7,9 +7,6 @@
       become: true
       ignore_errors: yes
 
-
-- hosts: all
-  tasks:
     - block:
         - include_role: name=fetch-output
       when:
@@ -24,30 +21,28 @@
       when: ansible_user_dir is defined
 
 - hosts: localhost
-  roles:
-    - role: add-fileserver
-      fileserver: "{{ site_ansiblelogs }}"
-    - role: generate-zuul-manifest
-    - role: ara-report
-      # This depends-on https://review.openstack.org/577675
-      ara_report_run: True
-      ara_report_type: database
-      ara_report_path: "{{ zuul.executor.log_root }}/ara-report"
-    - role: log-classify
-      logclassify_model_store_url: https://ansible.softwarefactory-project.io/logs/classifiers
-      logclassify_zuul_web: https://ansible.softwarefactory-project.io/zuul/api
-      logclassify_model_dir: /var/lib/log-classify
-      logclassify_local_dir: "{{ zuul.executor.log_root }}"
-
-- hosts: "ansible.softwarefactory-project.io"
   gather_facts: false
   tasks:
-    # Use a block because play vars doesn't take precedence on roles vars
-    - block:
-        - import_role: name=upload-log-classify-model
-        - import_role: name=upload-logs
-        - import_role: name=buildset-artifacts-location
+    - name: Run Zuul manifest role
+      include_role:
+        name: generate-zuul-manifest
+
+    - name: Set zuul-log-path fact
+      include_role:
+        name: set-zuul-log-path-fact
+      vars:
+        zuul_log_path_shard_build: true
+
+    - name: Run upload-logs-swift role
+      no_log: true
+      include_role:
+        name: upload-logs-swift
       vars:
-        zuul_log_compress: true
-        zuul_log_url: "https://ansible.softwarefactory-project.io/logs"
-        zuul_logserver_root: /var/www/logs
+        zuul_log_partition: true
+        zuul_log_container: ansible
+        zuul_log_cloud_config: "{{ item }}"
+        zuul_log_delete_after: 7776000
+      with_random_choice:
+        - "{{ rackspace_dfw_clouds_yaml }}"
+        - "{{ rackspace_iad_clouds_yaml }}"
+        - "{{ rackspace_ord_clouds_yaml }}"