From f9711ee6b2102d4c0bcd0a2bb8c571832fb953f4 Mon Sep 17 00:00:00 2001
From: Alfredo Moralejo <amoralej@redhat.com>
Date: Tue, 9 Aug 2022 16:19:54 +0200
Subject: [PATCH] Fix service logs gathering when using RDO puppet package

This is follow-up of [1]. When using puppet package from RDO, default
location for modules is /etc/puppet/modules/.

[1] https://review.opendev.org/c/openstack/puppet-openstack-integration/+/832265

Change-Id: Ic476cb40c375d05d6897d016677fcebd623a4b97
---
 copy_logs.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/copy_logs.sh b/copy_logs.sh
index b77aed2f1..a1afc09df 100755
--- a/copy_logs.sh
+++ b/copy_logs.sh
@@ -37,9 +37,12 @@ LOG_DIR=$WORKSPACE/logs
 if [ -d "${WORKSPACE}/spec/fixtures/modules" ]; then
     # Litmus job
     PUPPET_MODULES_PATH="${WORKSPACE}/spec/fixtures/modules"
-else
+elif [ -d "/etc/puppetlabs/code/modules" ]; then
     # Integration job
     PUPPET_MODULES_PATH='/etc/puppetlabs/code/modules'
+else
+    # Integration tests with RDO puppet package
+    PUPPET_MODULES_PATH='/etc/puppet/modules'
 fi
 
 for project in $PUPPET_MODULES_PATH/*; do