From e19559097d1d50e0a422f6d8d0154823b0416192 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 4ae26adb6fd..a73be4fd8a7 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.DS_IMAGE }} \
               --hostname=primaryds.example.com \
               --password=Secret.123 \
               primaryds
@@ -100,17 +100,17 @@ jobs:
           sudo chmod go+r primaryds_server.p12
 
           tests/bin/ds-certs-import.sh \
-              --image=pki-runner \
+              --image=${{ env.DS_IMAGE }} \
               --input=primaryds_server.p12 \
               --password=Secret.123 \
               primaryds
 
           tests/bin/ds-stop.sh \
-              --image=pki-runner \
+              --image=${{ env.DS_IMAGE }} \
               primaryds
 
           tests/bin/ds-start.sh \
-              --image=pki-runner \
+              --image=${{ env.DS_IMAGE }} \
               primaryds
 
       - name: Install CA in primary PKI container
@@ -159,7 +159,7 @@ jobs:
       - name: Set up secondary DS container
         run: |
           tests/bin/ds-create.sh \
-              --image=pki-runner \
+              --image=${{ env.DS_IMAGE }} \
               --hostname=secondaryds.example.com \
               --password=Secret.123 \
               secondaryds
@@ -224,17 +224,17 @@ jobs:
           sudo chmod go+r secondaryds_server.p12
 
           tests/bin/ds-certs-import.sh \
-              --image=pki-runner \
+              --image=${{ env.DS_IMAGE }} \
               --input=secondaryds_server.p12 \
               --password=Secret.123 \
               secondaryds
 
           tests/bin/ds-stop.sh \
-              --image=pki-runner \
+              --image=${{ env.DS_IMAGE }} \
               secondaryds
 
           tests/bin/ds-start.sh \
-              --image=pki-runner \
+              --image=${{ env.DS_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 e09bb7d9475..6b1057f4ccf 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.DS_IMAGE }} \
               --hostname=ds.example.com \
               --password=Secret.123 \
               ds
@@ -99,18 +99,18 @@ jobs:
           sudo chmod go+r ds_server.p12
 
           tests/bin/ds-certs-import.sh \
-              --image=pki-runner \
+              --image=${{ env.DS_IMAGE }} \
               --input=ds_server.p12 \
               --password=Secret.123 \
               --debug \
               ds
 
           tests/bin/ds-stop.sh \
-              --image=pki-runner \
+              --image=${{ env.DS_IMAGE }} \
               ds
 
           tests/bin/ds-start.sh \
-              --image=pki-runner \
+              --image=${{ env.DS_IMAGE }} \
               ds
 
       - name: Install CA