From 27cb81039e08473f29d93f85b66ec72b8d922fc3 Mon Sep 17 00:00:00 2001
From: "Endi S. Dewata" <edewata@redhat.com>
Date: Fri, 6 Sep 2024 10:43:29 -0500
Subject: [PATCH] Fix CA cloning test with secure DS connection

The tests for CA with secure DS connection (including
cloning) have been updated to use DS containers instead
of DS RPM packages from Fedora to avoid DS issue #6316.

https://github.com/389ds/389-ds-base/issues/6316
---
 .github/workflows/ca-clone-secure-ds-test.yml | 16 ++++++++--------
 .github/workflows/ca-secure-ds-test.yml       |  8 ++++----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/ca-clone-secure-ds-test.yml b/.github/workflows/ca-clone-secure-ds-test.yml
index df31e67a96b..c758b4dec2a 100644
--- a/.github/workflows/ca-clone-secure-ds-test.yml
+++ b/.github/workflows/ca-clone-secure-ds-test.yml
@@ -32,7 +32,7 @@ jobs:
       - name: Set up primary DS container
         run: |
           tests/bin/ds-create.sh \
-              --image=pki-runner \
+              --image=${{ env.DB_IMAGE }} \
               --hostname=primaryds.example.com \
               --password=Secret.123 \
               primaryds
@@ -98,17 +98,17 @@ jobs:
           sudo chmod go+r primaryds_server.p12
 
           tests/bin/ds-certs-import.sh \
-              --image=pki-runner \
+              --image=${{ env.DB_IMAGE }} \
               --input=primaryds_server.p12 \
               --password=Secret.123 \
               primaryds
 
           tests/bin/ds-stop.sh \
-              --image=pki-runner \
+              --image=${{ env.DB_IMAGE }} \
               primaryds
 
           tests/bin/ds-start.sh \
-              --image=pki-runner \
+              --image=${{ env.DB_IMAGE }} \
               primaryds
 
       - name: Install CA in primary PKI container
@@ -152,7 +152,7 @@ jobs:
       - name: Set up secondary DS container
         run: |
           tests/bin/ds-create.sh \
-              --image=pki-runner \
+              --image=${{ env.DB_IMAGE }} \
               --hostname=secondaryds.example.com \
               --password=Secret.123 \
               secondaryds
@@ -218,17 +218,17 @@ jobs:
           sudo chmod go+r secondaryds_server.p12
 
           tests/bin/ds-certs-import.sh \
-              --image=pki-runner \
+              --image=${{ env.DB_IMAGE }} \
               --input=secondaryds_server.p12 \
               --password=Secret.123 \
               secondaryds
 
           tests/bin/ds-stop.sh \
-              --image=pki-runner \
+              --image=${{ env.DB_IMAGE }} \
               secondaryds
 
           tests/bin/ds-start.sh \
-              --image=pki-runner \
+              --image=${{ env.DB_IMAGE }} \
               secondaryds
 
       - name: Install CA in secondary PKI container
diff --git a/.github/workflows/ca-secure-ds-test.yml b/.github/workflows/ca-secure-ds-test.yml
index 0fc0de71cbf..009a046b137 100644
--- a/.github/workflows/ca-secure-ds-test.yml
+++ b/.github/workflows/ca-secure-ds-test.yml
@@ -31,7 +31,7 @@ jobs:
       - name: Set up DS container
         run: |
           tests/bin/ds-create.sh \
-              --image=pki-runner \
+              --image=${{ env.DB_IMAGE }} \
               --hostname=ds.example.com \
               --password=Secret.123 \
               ds
@@ -97,18 +97,18 @@ jobs:
           sudo chmod go+r ds_server.p12
 
           tests/bin/ds-certs-import.sh \
-              --image=pki-runner \
+              --image=${{ env.DB_IMAGE }} \
               --input=ds_server.p12 \
               --password=Secret.123 \
               --debug \
               ds
 
           tests/bin/ds-stop.sh \
-              --image=pki-runner \
+              --image=${{ env.DB_IMAGE }} \
               ds
 
           tests/bin/ds-start.sh \
-              --image=pki-runner \
+              --image=${{ env.DB_IMAGE }} \
               ds
 
       - name: Install CA