From 66acf1123133699fd6f36254dc853b2cae7cc944 Mon Sep 17 00:00:00 2001
From: Andrey Kurilin <andr.kurilin@gmail.com>
Date: Thu, 20 Feb 2020 15:13:39 +0200
Subject: [PATCH] Unblock CI

* do not zip results so it can be displayed without downloading them
* turn off seferal glance workloads due.

Change-Id: I34d921228486e63eb43afa593a4c2d1dd38a1985
---
 rally-jobs/keystone-glance-swift.yaml         | 187 +-----------------
 tests/ci/pages/task-index.html                |  17 +-
 .../fetch-rally-task-results/tasks/main.yaml  |   8 -
 3 files changed, 9 insertions(+), 203 deletions(-)

diff --git a/rally-jobs/keystone-glance-swift.yaml b/rally-jobs/keystone-glance-swift.yaml
index ffd82460..4eea107c 100644
--- a/rally-jobs/keystone-glance-swift.yaml
+++ b/rally-jobs/keystone-glance-swift.yaml
@@ -1,4 +1,4 @@
-{%- set cirros_image_url = "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img" %}
+{%- set cirros_image_url = "https://github.com/cirros-dev/cirros/releases/download/0.3.5/cirros-0.3.5-x86_64-disk.img" %}
 ---
   KeystoneBasic.create_user:
     -
@@ -453,132 +453,7 @@
         failure_rate:
           max: 100
 
-  GlanceImages.create_and_get_image:
-    -
-      args:
-        image_location: "{{ cirros_image_url }}"
-        container_format: "bare"
-        disk_format: "qcow2"
-      runner:
-        type: "constant"
-        times: 4
-        concurrency: 2
-      context:
-        users:
-          tenants: 2
-          users_per_tenant: 2
-        api_versions:
-          glance:
-            version: 2
-      sla:
-        failure_rate:
-          max: 100
-
-  GlanceImages.create_and_download_image:
-    -
-      args:
-        image_location: "{{ cirros_image_url }}"
-        container_format: "bare"
-        disk_format: "qcow2"
-      runner:
-        type: "constant"
-        times: 4
-        concurrency: 2
-      context:
-        users:
-          tenants: 2
-          users_per_tenant: 2
-      sla:
-        failure_rate:
-          max: 0
-
-  GlanceImages.create_and_delete_image:
-#    -
-#      args:
-#        image_location: "{{ cirros_image_url }}"
-#        container_format: "bare"
-#        disk_format: "qcow2"
-#      runner:
-#        type: "constant"
-#        times: 1
-#        concurrency: 1
-#      context:
-#        users:
-#          tenants: 2
-#          users_per_tenant: 3
-#        api_versions:
-#          glance:
-#            version: 1
-#      sla:
-#        failure_rate:
-#          max: 0
-#
-
-    -
-      args:
-        image_location: "{{ cirros_image_url }}"
-        container_format: "bare"
-        disk_format: "qcow2"
-      runner:
-        type: "constant"
-        times: 1
-        concurrency: 1
-      context:
-        users:
-          tenants: 2
-          users_per_tenant: 3
-        api_versions:
-          glance:
-            version: 2
-      sla:
-        failure_rate:
-          max: 100
-
-#
-#    -
-#      args:
-#        image_location: "{{ cirros_image_url }}"
-#        container_format: "bare"
-#        disk_format: "qcow2"
-#      runner:
-#        type: "constant"
-#        times: 1
-#        concurrency: 1
-#      context:
-#        users:
-#          tenants: 1
-#          users_per_tenant: 1
-#        api_versions:
-#          glance:
-#            version: 1
-#        roles:
-#          - admin
-#      sla:
-#        failure_rate:
-#          max: 0
-
   GlanceImages.create_and_list_image:
-#    -
-#      args:
-#        image_location: "~/.rally/extra/fake-image.img"
-#        container_format: "bare"
-#        disk_format: "qcow2"
-#      runner:
-#        type: "constant"
-#        times: 1
-#        concurrency: 1
-#      context:
-#        users:
-#          tenants: 1
-#          users_per_tenant: 1
-#        api_versions:
-#          glance:
-#            version: 1
-#      sla:
-#        failure_rate:
-#          max: 0
-#
-
     -
       args:
         image_location: "~/.rally/extra/fake-image.img"
@@ -599,66 +474,6 @@
         failure_rate:
           max: 100
 
-  GlanceImages.create_image_and_boot_instances:
-    -
-      args:
-        image_location: "{{ cirros_image_url }}"
-        container_format: "bare"
-        disk_format: "qcow2"
-        flavor:
-            name: "m1.tiny"
-        number_instances: 2
-        create_image_kwargs:
-          properties:
-            hw_video_model: vga
-      runner:
-        type: "constant"
-        times: 1
-        concurrency: 1
-      context:
-        users:
-          tenants: 3
-          users_per_tenant: 1
-      sla:
-        failure_rate:
-          max: 100
-
-  GlanceImages.create_and_update_image:
-    -
-      args:
-        image_location: "{{ cirros_image_url }}"
-        container_format: "bare"
-        disk_format: "qcow2"
-      runner:
-        type: "constant"
-        times: 4
-        concurrency: 2
-      context:
-        users:
-          tenants: 2
-          users_per_tenant: 2
-      sla:
-        failure_rate:
-          max: 100
-
-  GlanceImages.create_and_deactivate_image:
-    -
-      args:
-        image_location: "{{ cirros_image_url }}"
-        container_format: "bare"
-        disk_format: "qcow2"
-      runner:
-        type: "constant"
-        times: 4
-        concurrency: 2
-      context:
-        users:
-          tenants: 2
-          users_per_tenant: 2
-      sla:
-        failure_rate:
-          max: 100
-
   SwiftObjects.create_container_and_object_then_list_objects:
     -
       args:
diff --git a/tests/ci/pages/task-index.html b/tests/ci/pages/task-index.html
index e1da93b8..d78a4d11 100644
--- a/tests/ci/pages/task-index.html
+++ b/tests/ci/pages/task-index.html
@@ -68,22 +68,21 @@
     
     <h2>Logs and files</h2>
     <ul class="columns">
-      <li><a href="job-output.txt.gz" class="rich check-gz">Rally Task Logs</a> <code>job-output.txt.gz</code>
+      <li><a href="job-output.txt" class="rich">Rally Task Logs</a> <code>job-output.txt</code>
       <li><a href="zuul-info/">Zuul info</a> <code>zuul-info</code>
       <li><a href="controller/logs/">Logs of controller node</a> <code>controller/logs/</code>
-      <li><a href="ara-report/">ARA | Ansible Run Analysis</a>
     </ul>
 
     <h2>Job results, in different formats</h2>
     <ul class="columns">
-      <li><a href="results/report.html.gz" class="rich">HTML report</a> <code>$ rally task report</code>
-      <li><a href="results/detailed.txt.gz">Text report</a> <code>$ rally task detailed</code>
-      <li><a href="results/detailed_with_iterations.txt.gz">Text report detailed</a> <code>$ rally task detailed --iterations-data</code>
+      <li><a href="results/report.html" class="rich">HTML report</a> <code>$ rally task report</code>
+      <li><a href="results/detailed.txt">Text report</a> <code>$ rally task detailed</code>
+      <li><a href="results/detailed_with_iterations.txt">Text report detailed</a> <code>$ rally task detailed --iterations-data</code>
       <li><a href="results/sla.txt">Success criteria (SLA)</a> <code>$ rally task sla_check</code>
-      <li><a href="results/report.json.gz">JSON report</a> <code>$ rally task report --json</code>
-      <li><a href="results/results.json.gz">Old json results</a> <code>$ rally task results</code>
-      <li><a href="results/junit.xml.gz">JUNIT-XML report</a> <code>$ rally task export --type junit-xml</code>
-      <li><a href="results/elasticsearch.txt.gz">ElasticSearch x5 dump file</a> <code>$ rally task export --type elastic</code>
+      <li><a href="results/report.json">JSON report</a> <code>$ rally task report --json</code>
+      <li><a href="results/results.json">Old json results</a> <code>$ rally task results</code>
+      <li><a href="results/junit.xml">JUNIT-XML report</a> <code>$ rally task export --type junit-xml</code>
+      <li><a href="results/elasticsearch.txt">ElasticSearch x5 dump file</a> <code>$ rally task export --type elastic</code>
     </ul>
 
     <h2>About Rally</h2>
diff --git a/tests/ci/playbooks/roles/fetch-rally-task-results/tasks/main.yaml b/tests/ci/playbooks/roles/fetch-rally-task-results/tasks/main.yaml
index 2f35481d..e414d60c 100644
--- a/tests/ci/playbooks/roles/fetch-rally-task-results/tasks/main.yaml
+++ b/tests/ci/playbooks/roles/fetch-rally-task-results/tasks/main.yaml
@@ -18,14 +18,6 @@
     path: '{{ rally_results_dir }}'
   register: results_dir_stat
 
-- name: Gzip results files
-  become: yes
-  become_user: stack
-  shell: "gzip * -9 -q | true"
-  args:
-    chdir: '{{ rally_results_dir }}'
-  when: results_dir_stat.stat.exists == True
-
 - name: Gzip custom plugins
   become: yes
   become_user: stack