From 736304d4b64402a02d39fa19a5525de300c28769 Mon Sep 17 00:00:00 2001
From: lpiwowar <lpiwowar@redhat.com>
Date: Tue, 29 Mar 2022 11:32:45 +0200
Subject: [PATCH] Unskip devstack-admin-plugins job

The job was failing because of a bug described in the launchpad [1].
As this bug is resolved and the job is no longer failing we can
start using this job again.

Before enabling the devstack-admin-plugins job we need to fix two
things:

- Put test_manually_trigger_update_secondary_zone_negative designate
  plugin test to exclude_regex as it is currently broken.

- Allow git to read plugins directories. This is necessary because
  of a patch that was recently added to git [2].

[1] https://bugs.launchpad.net/neutron/+bug/1959125
[2] https://github.com/git/git/commit/8959555cee7ec045958f9b6dd62e541affb7e7d9

Change-Id: I5bf3826f0011a9392a38ceceb51c113d38231ad6
---
 .zuul.yaml                            | 8 ++++----
 roles/install-plugins/tasks/main.yaml | 9 +++++++++
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 223fcbe9..2564c309 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -13,8 +13,7 @@
         - python-tempestconf-tempest-devstack-admin-wallaby
         - python-tempestconf-tempest-devstack-admin-xena
         - python-tempestconf-tempest-devstack-demo
-        # TODO(mkopec) temporarily disabled to unblock gates
-        #- python-tempestconf-tempest-devstack-admin-plugins
+        - python-tempestconf-tempest-devstack-admin-plugins
         - python-tempestconf-tempest-packstack-admin:
             voting: false
         - python-tempestconf-tempest-packstack-demo:
@@ -62,8 +61,7 @@
         - python-tempestconf-tempest-devstack-admin-wallaby
         - python-tempestconf-tempest-devstack-admin-xena
         - python-tempestconf-tempest-devstack-demo
-        # TODO(mkopec) temporarily disabled to unblock gates
-        #- python-tempestconf-tempest-devstack-admin-plugins
+        - python-tempestconf-tempest-devstack-admin-plugins
         - refstack-client-devstack-master:
             irrelevant-files: *irrelevant-files
         - tripleo-ci-centos-9-content-provider:
@@ -188,6 +186,8 @@
         - 'designate_tempest_plugin'
         - 'barbican_tempest_plugin'
       exclude_regex:
+        # TODO(lpiwowar) Remove once the test is fixed. (Bug: https://bugs.launchpad.net/designate/+bug/1968717)
+        - 'designate_tempest_plugin.tests.api.v2.test_zone_tasks.ZoneTasksNegative.test_manually_trigger_update_secondary_zone_negative'
         - 'heat_tempest_plugin.tests.functional.test_nova_server_networks.CreateServerTest.test_create_update_server_with_subnet'
         - 'heat_tempest_plugin.tests.scenario.test_volumes.VolumeBackupRestoreIntegrationTest.test_cinder_volume_create_backup_restore'
         - 'heat_tempest_plugin.tests.scenario.test_server_software_config.SoftwareConfigIntegrationTest.test_server_software_config'
diff --git a/roles/install-plugins/tasks/main.yaml b/roles/install-plugins/tasks/main.yaml
index 55ba6716..27dd49e4 100644
--- a/roles/install-plugins/tasks/main.yaml
+++ b/roles/install-plugins/tasks/main.yaml
@@ -2,12 +2,21 @@
   include_role:
     name: ensure-tox
 
+- name: Allow git to read tempest directory
+  become: yes
+  command: git config --system --add safe.directory {{devstack_base_dir}}/tempest
+
 - name: Prepare tempest venv
   become: yes
   command: tox -r --notest -efull
   args:
     chdir: "{{devstack_base_dir}}/tempest"
 
+- name: Allow git to read plugin directories
+  become: yes
+  command: git config --system --add safe.directory {{item}}
+  with_items: "{{plugins_paths}}"
+
 - name: Install plugins
   become: yes
   command: