From 56c40bec2cea1bc83b41e9bd91a85bb11bc97b70 Mon Sep 17 00:00:00 2001
From: Andrey Kurilin <andr.kurilin@gmail.com>
Date: Mon, 2 Apr 2018 15:07:03 +0300
Subject: [PATCH] [ci] Do not transmit plugins dir as cli argument

Rally base job copies custom plugins to ~/.rally/plugins dir. This
directory should be loaded automatically. Specifing the same dir via
cli argument `--plugin-paths` leads to PluginWithSuchNameExists errors.

Also, this patch extends rally-task-simple-job job to check that there
are no issues related to loading plugins from ~/.rally/plugins dir

Change-Id: I38adfe6868112d9f2919ccc08c0d40d0bc6b1d51
---
 .zuul.d/rally-task-simple-job.yaml                   |  2 +-
 rally-jobs/{simple-cinder.yaml => simple-job.yaml}   | 12 ++++++++++++
 .../playbooks/roles/run-rally-task/tasks/main.yaml   |  2 +-
 3 files changed, 14 insertions(+), 2 deletions(-)
 rename rally-jobs/{simple-cinder.yaml => simple-job.yaml} (61%)

diff --git a/.zuul.d/rally-task-simple-job.yaml b/.zuul.d/rally-task-simple-job.yaml
index acd1f974..ce8400f9 100644
--- a/.zuul.d/rally-task-simple-job.yaml
+++ b/.zuul.d/rally-task-simple-job.yaml
@@ -3,4 +3,4 @@
     description: A simple job which checks Rally integration with Devstack in Zuul V3 env.
     parent: rally-task-at-devstack
     vars:
-      rally_task: rally-jobs/simple-cinder.yaml
+      rally_task: rally-jobs/simple-job.yaml
diff --git a/rally-jobs/simple-cinder.yaml b/rally-jobs/simple-job.yaml
similarity index 61%
rename from rally-jobs/simple-cinder.yaml
rename to rally-jobs/simple-job.yaml
index 16a97a9f..54a36345 100644
--- a/rally-jobs/simple-cinder.yaml
+++ b/rally-jobs/simple-job.yaml
@@ -18,3 +18,15 @@
             users:
               tenants: 2
               users_per_tenant: 2
+    -
+      title: Test a subtask with only one workload
+      description: Check that a fake plugin is loaded from ~/.rally/plugins dir
+      scenario:
+        FakePlugin.testplugin: {}
+      runner:
+        constant:
+          times: 4
+          concurrency: 4
+      sla:
+        failure_rate:
+          max: 0
diff --git a/tests/ci/playbooks/roles/run-rally-task/tasks/main.yaml b/tests/ci/playbooks/roles/run-rally-task/tasks/main.yaml
index a77b033e..2b9b8a0d 100644
--- a/tests/ci/playbooks/roles/run-rally-task/tasks/main.yaml
+++ b/tests/ci/playbooks/roles/run-rally-task/tasks/main.yaml
@@ -7,7 +7,7 @@
       export RALLY_PLUGINS_DIR="{{ rally_home_dir }}/plugins"
       export RALLY_EXTRA_DIR="{{ rally_home_dir }}/extra"
 
-      rally --rally-debug --plugin-paths "{{ rally_home_dir }}/plugins" task start --task {{ rally_home_dir }}/task.yaml #--task-args-file {{ rally_home_dir }}/task_args_file.yaml
+      rally --rally-debug task start --task {{ rally_home_dir }}/task.yaml #--task-args-file {{ rally_home_dir }}/task_args_file.yaml
     executable: /bin/bash
   register: command_result
   ignore_errors: True