From df3f271106e2dedcf025decf909ee9fb61a19cd6 Mon Sep 17 00:00:00 2001
From: Dianjin Wang <wangdianjin@gmail.com>
Date: Mon, 20 Oct 2025 14:39:47 +0800
Subject: [PATCH] CI: fix libssh2-devel installation for gpfdist SFTP protocol

libssh2-devel is introduced as a dependency package for the new feature
in the PR apache#1226.

libssh2-devel is included in rocky-release-hpc, so we need to
rocky-release-hpc before installing libssh2-devel:

```
dnf install rocky-release-hpc
dnf install libssh2-devel
```
---
 devops/deploy/docker/build/rocky8/Dockerfile | 3 ++-
 devops/deploy/docker/build/rocky9/Dockerfile | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/devops/deploy/docker/build/rocky8/Dockerfile b/devops/deploy/docker/build/rocky8/Dockerfile
index 7bcb8c645d5..10519fa69cd 100644
--- a/devops/deploy/docker/build/rocky8/Dockerfile
+++ b/devops/deploy/docker/build/rocky8/Dockerfile
@@ -72,6 +72,7 @@ ENV USER=gpadmin
 RUN dnf makecache && \
     dnf install -y \
         epel-release \
+        rocky-release-hpc \
         git && \
     dnf makecache && \
     dnf config-manager --disable epel && \
@@ -98,6 +99,7 @@ RUN dnf makecache && \
         krb5-devel \
         libcurl-devel \
         libevent-devel \
+        libssh2-devel \
         libuuid-devel \
         libxml2-devel \
         libzstd-devel \
@@ -132,7 +134,6 @@ RUN dnf makecache && \
         zlib-devel && \
     dnf install -y -d0 --enablerepo=devel \
         libuv-devel \
-        libssh2-devel \
         libyaml-devel \
         perl-IPC-Run \
         protobuf-devel && \
diff --git a/devops/deploy/docker/build/rocky9/Dockerfile b/devops/deploy/docker/build/rocky9/Dockerfile
index 6e19b850cbe..0307ae78b94 100644
--- a/devops/deploy/docker/build/rocky9/Dockerfile
+++ b/devops/deploy/docker/build/rocky9/Dockerfile
@@ -72,6 +72,7 @@ ENV USER=gpadmin
 RUN dnf makecache && \
     dnf install -y \
         epel-release \
+        rocky-release-hpc \
         git && \
     dnf config-manager --disable epel-cisco-openh264 && \
     dnf makecache && \
@@ -117,6 +118,7 @@ RUN dnf makecache && \
         java-11-openjdk-devel \
         krb5-devel \
         libcurl-devel \
+        libssh2-devel \
         libevent-devel \
         libxml2-devel \
         libuuid-devel \
@@ -135,7 +137,6 @@ RUN dnf makecache && \
         zlib-devel && \
     dnf install -y --enablerepo=crb \
         libuv-devel \
-        libssh2-devel \
         libyaml-devel \
         perl-IPC-Run \
         protobuf-devel && \