From 30c7a1301dd3925a64e6807642c55d82d1382d12 Mon Sep 17 00:00:00 2001
From: Martin Kopec <mkopec@redhat.com>
Date: Sun, 16 Jan 2022 16:30:28 +0000
Subject: [PATCH] Do not run orchestration program by default and fix lint

Don't run heat tempest tests by default until they're fixed.
Most of them currently fail, it seems, they are incompatible
with the latest gabbi.

The patch fixes 'All tasks should be named' linters error.
and bumps version of the linters which includes a fix for
the linters issue:
ImportError: cannot import name 'render_group'

Install python-manilaclient from source so that it contains
latest (not yet packaged) changes.

Change-Id: Idd9180ecbe396f73a03922982a4e005a84a77d02
---
 .pre-commit-config.yaml            | 2 +-
 .zuul.yaml                         | 2 ++
 defaults/main.yaml                 | 2 +-
 tasks/install-refstack-client.yaml | 3 ++-
 tasks/post-tasks.yaml              | 3 ++-
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index c2016e1..3f862f4 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -21,7 +21,7 @@ repos:
         types: [file, yaml]
         entry: yamllint --strict -f parsable
   - repo: https://github.com/ansible/ansible-lint.git
-    rev: 9da220ae3a11c10c10ee43284ad6cad6d8ba52b7
+    rev: v5.3.2
     hooks:
       - id: ansible-lint
         always_run: true
diff --git a/.zuul.yaml b/.zuul.yaml
index 876fd7f..fe140ad 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -40,6 +40,7 @@
       - openstack/manila-ui
       # NOTE the same as for designate plugin above
       - openstack/manila-tempest-plugin
+      - openstack/python-manilaclient
     roles:
       - zuul: openstack/devstack
     vars:
@@ -54,6 +55,7 @@
         manila: https://opendev.org/openstack/manila
         manila-ui: https://opendev.org/openstack/manila-ui
       devstack_localrc:
+        LIBS_FROM_GIT: python-manilaclient
         SHARE_DRIVER: manila.share.drivers.lvm.LVMShareDriver
         MANILA_ENABLED_BACKENDS: london,paris
         MANILA_BACKEND1_CONFIG_GROUP_NAME: london
diff --git a/defaults/main.yaml b/defaults/main.yaml
index 477c5b9..440dc74 100644
--- a/defaults/main.yaml
+++ b/defaults/main.yaml
@@ -22,8 +22,8 @@ refstack_target_programs:
   - compute
   - object
   - dns
-  - orchestration
   - shared_file_system
+# - orchestration
 refstack_tempest_plugins:
   manila: master
   # pin designate-tempest-plugin as the master version is not compatible
diff --git a/tasks/install-refstack-client.yaml b/tasks/install-refstack-client.yaml
index a11d44c..e0e6fa9 100644
--- a/tasks/install-refstack-client.yaml
+++ b/tasks/install-refstack-client.yaml
@@ -4,7 +4,8 @@
     paths: "{{ refstack_client_source }}"
   register: local_refstack_found
 
-- debug:
+- name: Print refstack_client_source variable
+  debug:
     var: refstack_client_source
 
 - name: Clone refstack-client
diff --git a/tasks/post-tasks.yaml b/tasks/post-tasks.yaml
index c045bba..7fd83f5 100644
--- a/tasks/post-tasks.yaml
+++ b/tasks/post-tasks.yaml
@@ -37,7 +37,8 @@
       when:
         - private_key_path is defined
 
-    - debug:
+    - name: Print output of the upload command
+      debug:
         msg: "{{ upload_out }}"
 
 # this becomes handy when the role is executed on a remote node from