From c6c2a6529b211f357b1b32b7b819f344123c16af Mon Sep 17 00:00:00 2001
From: Justin Cinkelj <justin.cinkelj@xlab.si>
Date: Mon, 20 Mar 2023 04:24:20 +0100
Subject: [PATCH] CI use SMB cleanup variables from integration_config.yml

Signed-off-by: Justin Cinkelj <justin.cinkelj@xlab.si>
---
 .github/workflows/integ-test.yml                  | 14 +++++++++++++-
 tests/integration/integration_config.yml.template |  1 +
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/integ-test.yml b/.github/workflows/integ-test.yml
index ffc855129..36ce9eabb 100644
--- a/.github/workflows/integ-test.yml
+++ b/.github/workflows/integ-test.yml
@@ -239,4 +239,16 @@ jobs:
         uses: actions/checkout@v3
         with:
           path: ${{ env.WORKDIR }}
-      - run: cd tests/integration/cleanup && ./smb_cleanup.sh ${{ secrets.SMB_SERVER }} ${{ secrets.SMB_SHARE }} "${{ secrets.SMB_USERNAME }}" ${{ secrets.SMB_PASSWORD }}
+      - run: |
+          echo "${{ vars.CI_CONFIG_HC_IP50 }}" > tests/integration/integration_config.yml
+          cat tests/integration/integration_config.yml
+          echo "sc_password: ${{ secrets.CI_CONFIG_HC_IP50_SC_PASSWORD }}" >> tests/integration/integration_config.yml
+          echo "smb_password: ${{ secrets.CI_CONFIG_HC_IP50_SMB_PASSWORD }}" >> tests/integration/integration_config.yml
+          echo "sc_replication_dest_password: ${{ secrets.CI_CONFIG_HC_IP50_SC_REPLICATION_DEST_PASSWORD }}" >> tests/integration/integration_config.yml
+          ls -al tests/integration/integration_config.yml
+      - run: |
+          cd tests/integration/cleanup && ./smb_cleanup.sh \
+            "$(cat ../integration_config.yml | yq '.smb_server' | sed -e 's/^"//' -e 's/"$//')" \
+            "$(cat ../integration_config.yml | yq '.smb_share' | sed -e 's/^"//' -e 's/"$//')" \
+            "$(cat ../integration_config.yml | yq '.smb_username' | sed -e 's/^"//' -e 's/"$//')" \
+            "$(cat ../integration_config.yml | yq '.smb_password' | sed -e 's/^"//' -e 's/"$//')"
diff --git a/tests/integration/integration_config.yml.template b/tests/integration/integration_config.yml.template
index e4b91e1dc..f098bbe2e 100644
--- a/tests/integration/integration_config.yml.template
+++ b/tests/integration/integration_config.yml.template
@@ -7,6 +7,7 @@ sc_timeout: 60
 # CI tests for vm_import/vm_export require a SMB server
 smb_server: <example 10.0.0.3>
 smb_share: <example /users>
+# Provide username as "domain;username" or only ";username".
 smb_username: <example myusername>
 smb_password: <example mypassword>
 # Replication cluster needs to be cleaned up.