From 34ae90aad9e5457bfc65a59c85e40afb4ef486b5 Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Fri, 3 Aug 2018 15:47:56 -0700 Subject: [PATCH] Un-wip upload-logs-swift I think we've reached our minimal API, we should be able to iterate forward from here as needed. Change-Id: Ia7a0d6051c42c6e97a88e22f4b7e9275cf6234b2 --- .../README.rst | 4 ---- .../defaults/main.yaml | 0 .../library/__init__.py | 0 .../library/test-fixtures/artifacts/foo.tar.gz | Bin .../library/test-fixtures/artifacts/foo.tgz | Bin .../test-fixtures/links/controller/service_log.txt | 0 .../library/test-fixtures/links/job-output.json | 0 .../test-fixtures/links/symlink_loop/placeholder | 0 .../test-fixtures/logs/controller/compressed.gz | Bin .../test-fixtures/logs/controller/cpu-load.svg | 0 .../test-fixtures/logs/controller/journal.xz | Bin .../test-fixtures/logs/controller/service_log.txt | 0 .../test-fixtures/logs/controller/subdir/subdir.txt | 0 .../library/test-fixtures/logs/controller/syslog | 0 .../library/test-fixtures/logs/job-output.json | 0 .../test-fixtures/logs/zuul-info/inventory.yaml | 0 .../logs/zuul-info/zuul-info.controller.txt | 0 .../library/test_zuul_swift_upload.py | 0 .../library/zuul_swift_upload.py | 0 .../tasks/main.yaml | 0 20 files changed, 4 deletions(-) rename roles/{wip-upload-logs-swift => upload-logs-swift}/README.rst (96%) rename roles/{wip-upload-logs-swift => upload-logs-swift}/defaults/main.yaml (100%) rename roles/{wip-upload-logs-swift => upload-logs-swift}/library/__init__.py (100%) rename roles/{wip-upload-logs-swift => upload-logs-swift}/library/test-fixtures/artifacts/foo.tar.gz (100%) rename roles/{wip-upload-logs-swift => upload-logs-swift}/library/test-fixtures/artifacts/foo.tgz (100%) rename roles/{wip-upload-logs-swift => upload-logs-swift}/library/test-fixtures/links/controller/service_log.txt (100%) rename roles/{wip-upload-logs-swift => upload-logs-swift}/library/test-fixtures/links/job-output.json (100%) rename roles/{wip-upload-logs-swift => upload-logs-swift}/library/test-fixtures/links/symlink_loop/placeholder (100%) rename roles/{wip-upload-logs-swift => upload-logs-swift}/library/test-fixtures/logs/controller/compressed.gz (100%) rename roles/{wip-upload-logs-swift => upload-logs-swift}/library/test-fixtures/logs/controller/cpu-load.svg (100%) rename roles/{wip-upload-logs-swift => upload-logs-swift}/library/test-fixtures/logs/controller/journal.xz (100%) rename roles/{wip-upload-logs-swift => upload-logs-swift}/library/test-fixtures/logs/controller/service_log.txt (100%) rename roles/{wip-upload-logs-swift => upload-logs-swift}/library/test-fixtures/logs/controller/subdir/subdir.txt (100%) rename roles/{wip-upload-logs-swift => upload-logs-swift}/library/test-fixtures/logs/controller/syslog (100%) rename roles/{wip-upload-logs-swift => upload-logs-swift}/library/test-fixtures/logs/job-output.json (100%) rename roles/{wip-upload-logs-swift => upload-logs-swift}/library/test-fixtures/logs/zuul-info/inventory.yaml (100%) rename roles/{wip-upload-logs-swift => upload-logs-swift}/library/test-fixtures/logs/zuul-info/zuul-info.controller.txt (100%) rename roles/{wip-upload-logs-swift => upload-logs-swift}/library/test_zuul_swift_upload.py (100%) rename roles/{wip-upload-logs-swift => upload-logs-swift}/library/zuul_swift_upload.py (100%) rename roles/{wip-upload-logs-swift => upload-logs-swift}/tasks/main.yaml (100%) diff --git a/roles/wip-upload-logs-swift/README.rst b/roles/upload-logs-swift/README.rst similarity index 96% rename from roles/wip-upload-logs-swift/README.rst rename to roles/upload-logs-swift/README.rst index 7f0411f47..d5d3a4972 100644 --- a/roles/wip-upload-logs-swift/README.rst +++ b/roles/upload-logs-swift/README.rst @@ -2,10 +2,6 @@ Upload logs to a swift container This uploads logs to an OpenStack Object Store (Swift) container. -.. warning:: - - Do not use this role, the API is not complete. - **Role Variables** .. zuul:rolevar:: zuul_site_upload_logs diff --git a/roles/wip-upload-logs-swift/defaults/main.yaml b/roles/upload-logs-swift/defaults/main.yaml similarity index 100% rename from roles/wip-upload-logs-swift/defaults/main.yaml rename to roles/upload-logs-swift/defaults/main.yaml diff --git a/roles/wip-upload-logs-swift/library/__init__.py b/roles/upload-logs-swift/library/__init__.py similarity index 100% rename from roles/wip-upload-logs-swift/library/__init__.py rename to roles/upload-logs-swift/library/__init__.py diff --git a/roles/wip-upload-logs-swift/library/test-fixtures/artifacts/foo.tar.gz b/roles/upload-logs-swift/library/test-fixtures/artifacts/foo.tar.gz similarity index 100% rename from roles/wip-upload-logs-swift/library/test-fixtures/artifacts/foo.tar.gz rename to roles/upload-logs-swift/library/test-fixtures/artifacts/foo.tar.gz diff --git a/roles/wip-upload-logs-swift/library/test-fixtures/artifacts/foo.tgz b/roles/upload-logs-swift/library/test-fixtures/artifacts/foo.tgz similarity index 100% rename from roles/wip-upload-logs-swift/library/test-fixtures/artifacts/foo.tgz rename to roles/upload-logs-swift/library/test-fixtures/artifacts/foo.tgz diff --git a/roles/wip-upload-logs-swift/library/test-fixtures/links/controller/service_log.txt b/roles/upload-logs-swift/library/test-fixtures/links/controller/service_log.txt similarity index 100% rename from roles/wip-upload-logs-swift/library/test-fixtures/links/controller/service_log.txt rename to roles/upload-logs-swift/library/test-fixtures/links/controller/service_log.txt diff --git a/roles/wip-upload-logs-swift/library/test-fixtures/links/job-output.json b/roles/upload-logs-swift/library/test-fixtures/links/job-output.json similarity index 100% rename from roles/wip-upload-logs-swift/library/test-fixtures/links/job-output.json rename to roles/upload-logs-swift/library/test-fixtures/links/job-output.json diff --git a/roles/wip-upload-logs-swift/library/test-fixtures/links/symlink_loop/placeholder b/roles/upload-logs-swift/library/test-fixtures/links/symlink_loop/placeholder similarity index 100% rename from roles/wip-upload-logs-swift/library/test-fixtures/links/symlink_loop/placeholder rename to roles/upload-logs-swift/library/test-fixtures/links/symlink_loop/placeholder diff --git a/roles/wip-upload-logs-swift/library/test-fixtures/logs/controller/compressed.gz b/roles/upload-logs-swift/library/test-fixtures/logs/controller/compressed.gz similarity index 100% rename from roles/wip-upload-logs-swift/library/test-fixtures/logs/controller/compressed.gz rename to roles/upload-logs-swift/library/test-fixtures/logs/controller/compressed.gz diff --git a/roles/wip-upload-logs-swift/library/test-fixtures/logs/controller/cpu-load.svg b/roles/upload-logs-swift/library/test-fixtures/logs/controller/cpu-load.svg similarity index 100% rename from roles/wip-upload-logs-swift/library/test-fixtures/logs/controller/cpu-load.svg rename to roles/upload-logs-swift/library/test-fixtures/logs/controller/cpu-load.svg diff --git a/roles/wip-upload-logs-swift/library/test-fixtures/logs/controller/journal.xz b/roles/upload-logs-swift/library/test-fixtures/logs/controller/journal.xz similarity index 100% rename from roles/wip-upload-logs-swift/library/test-fixtures/logs/controller/journal.xz rename to roles/upload-logs-swift/library/test-fixtures/logs/controller/journal.xz diff --git a/roles/wip-upload-logs-swift/library/test-fixtures/logs/controller/service_log.txt b/roles/upload-logs-swift/library/test-fixtures/logs/controller/service_log.txt similarity index 100% rename from roles/wip-upload-logs-swift/library/test-fixtures/logs/controller/service_log.txt rename to roles/upload-logs-swift/library/test-fixtures/logs/controller/service_log.txt diff --git a/roles/wip-upload-logs-swift/library/test-fixtures/logs/controller/subdir/subdir.txt b/roles/upload-logs-swift/library/test-fixtures/logs/controller/subdir/subdir.txt similarity index 100% rename from roles/wip-upload-logs-swift/library/test-fixtures/logs/controller/subdir/subdir.txt rename to roles/upload-logs-swift/library/test-fixtures/logs/controller/subdir/subdir.txt diff --git a/roles/wip-upload-logs-swift/library/test-fixtures/logs/controller/syslog b/roles/upload-logs-swift/library/test-fixtures/logs/controller/syslog similarity index 100% rename from roles/wip-upload-logs-swift/library/test-fixtures/logs/controller/syslog rename to roles/upload-logs-swift/library/test-fixtures/logs/controller/syslog diff --git a/roles/wip-upload-logs-swift/library/test-fixtures/logs/job-output.json b/roles/upload-logs-swift/library/test-fixtures/logs/job-output.json similarity index 100% rename from roles/wip-upload-logs-swift/library/test-fixtures/logs/job-output.json rename to roles/upload-logs-swift/library/test-fixtures/logs/job-output.json diff --git a/roles/wip-upload-logs-swift/library/test-fixtures/logs/zuul-info/inventory.yaml b/roles/upload-logs-swift/library/test-fixtures/logs/zuul-info/inventory.yaml similarity index 100% rename from roles/wip-upload-logs-swift/library/test-fixtures/logs/zuul-info/inventory.yaml rename to roles/upload-logs-swift/library/test-fixtures/logs/zuul-info/inventory.yaml diff --git a/roles/wip-upload-logs-swift/library/test-fixtures/logs/zuul-info/zuul-info.controller.txt b/roles/upload-logs-swift/library/test-fixtures/logs/zuul-info/zuul-info.controller.txt similarity index 100% rename from roles/wip-upload-logs-swift/library/test-fixtures/logs/zuul-info/zuul-info.controller.txt rename to roles/upload-logs-swift/library/test-fixtures/logs/zuul-info/zuul-info.controller.txt diff --git a/roles/wip-upload-logs-swift/library/test_zuul_swift_upload.py b/roles/upload-logs-swift/library/test_zuul_swift_upload.py similarity index 100% rename from roles/wip-upload-logs-swift/library/test_zuul_swift_upload.py rename to roles/upload-logs-swift/library/test_zuul_swift_upload.py diff --git a/roles/wip-upload-logs-swift/library/zuul_swift_upload.py b/roles/upload-logs-swift/library/zuul_swift_upload.py similarity index 100% rename from roles/wip-upload-logs-swift/library/zuul_swift_upload.py rename to roles/upload-logs-swift/library/zuul_swift_upload.py diff --git a/roles/wip-upload-logs-swift/tasks/main.yaml b/roles/upload-logs-swift/tasks/main.yaml similarity index 100% rename from roles/wip-upload-logs-swift/tasks/main.yaml rename to roles/upload-logs-swift/tasks/main.yaml