From 66c7721ced4304388a9616f7ea89a84f9d74f732 Mon Sep 17 00:00:00 2001
From: lewis_yan <lewis_yan@avc.co>
Date: Tue, 31 Mar 2026 19:22:14 +0800
Subject: [PATCH] fix: use usernamePassword instead of sshUserPrivateKey for
 deploy

---
 backend/Jenkinsfile | 12 ++++++------
 web/Jenkinsfile     | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/backend/Jenkinsfile b/backend/Jenkinsfile
index d062ee7..95581e8 100644
--- a/backend/Jenkinsfile
+++ b/backend/Jenkinsfile
@@ -52,16 +52,16 @@ pipeline {
         stage('Deploy') {
             steps {
                 script {
-                    withCredentials([sshUserPrivateKey(
-                        credentialsId: SSH_CREDENTIALS_ID,
+                    withCredentials([usernamePassword(
+                        credentialsId: 'server-ssh-creds',
                         usernameVariable: 'SSH_USER',
-                        privateKeyVariable: 'SSH_KEY'
+                        passwordVariable: 'SSH_PASS'
                     )]) {
                         sh """
-                            ssh -o StrictHostKeyChecking=no ${SSH_USER}@${SERVER_HOST} << 'EOF'
+                            sshpass -p "${SSH_PASS}" ssh -o StrictHostKeyChecking=no ${SSH_USER}@${SERVER_HOST} << 'EOF'
                             cd ${COMPOSE_PATH}
-                            docker-compose pull dvadmin3-django
-                            docker-compose up -d --no-deps dvadmin3-django
+                            docker-compose pull pis-backend
+                            docker-compose up -d --no-deps pis-backend
                             EOF
                         """
                     }
diff --git a/web/Jenkinsfile b/web/Jenkinsfile
index dbc4f10..c0acde6 100644
--- a/web/Jenkinsfile
+++ b/web/Jenkinsfile
@@ -68,16 +68,16 @@ pipeline {
         stage('Deploy') {
             steps {
                 script {
-                    withCredentials([sshUserPrivateKey(
-                        credentialsId: SSH_CREDENTIALS_ID,
+                    withCredentials([usernamePassword(
+                        credentialsId: 'server-ssh-creds',
                         usernameVariable: 'SSH_USER',
-                        privateKeyVariable: 'SSH_KEY'
+                        passwordVariable: 'SSH_PASS'
                     )]) {
                         sh """
-                            ssh -o StrictHostKeyChecking=no ${SSH_USER}@${SERVER_HOST} << 'EOF'
+                            sshpass -p "${SSH_PASS}" ssh -o StrictHostKeyChecking=no ${SSH_USER}@${SERVER_HOST} << 'EOF'
                             cd ${COMPOSE_PATH}
-                            docker-compose pull dvadmin3-web
-                            docker-compose up -d --no-deps dvadmin3-web
+                            docker-compose pull pis-web
+                            docker-compose up -d --no-deps pis-web
                             EOF
                         """
                     }