From e3ca04efd04d9410615ebc290ce6e88f02334b3b Mon Sep 17 00:00:00 2001 From: mpavlov Date: Sun, 29 Sep 2024 01:50:06 +0300 Subject: [PATCH] fix jenkinsfile --- Jenkinsfile | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8fa9942..c8d20a6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,17 +1,22 @@ pipeline { agent any + options { + buildDiscarder logRotator ( + numToKeepStr: '5', + daysToKeepStr: '7', + artifactNumToKeepStr: '10', + artifactDaysToKeepStr: '7' + ) + } parameters { string(name: "target_host", defaultValue: "", trim: true, description: "Target host") - string(name: "username", defaultValue: "", trim: true, description: "Ansible user") - password(name: "password", defaultValue: "", description: "Ansible password") booleanParam(name: "rproxy_install", defaultValue: true, description: "Install Rproxy") base64File(name: "rootca", description: "RootCA (only for 'Install Rproxy')") base64File(name: "rootca_key", description: "RootCA key (only for 'Install Rproxy')") booleanParam(name: "config_add", defaultValue: true, description: "Add config") - string(name: "rproxy_service_name", defaultValue: "", trim: true, description: "Service name, ex. jenkins (for 'Add config' job only)") + string(name: "rproxy_service_name", defaultValue: "", trim: true, description: "Service name (for 'Add config' job only)") string(name: "rproxy_service_port", defaultValue: "", trim: true, description: "Service port (for 'Add config' job only)") string(name: "rproxy_service_address", defaultValue: "", trim: true, description: "Service address (for 'Add config' job only)") - } stages { stage('Save certs') { @@ -37,8 +42,13 @@ pipeline { } steps { script { - wrap([$class: 'MaskPasswordsBuildWrapper', varPasswordPairs: [[password: params.password]]]) { - sh 'ansible-playbook rproxy.yml -i ${target_host}, -t install -u ${username} -e "ansible_password=${password} rproxy_service_name=${rproxy_service_name} rproxy_service_port=${rproxy_service_port} rproxy_service_address=${rproxy_service_address}"' + withCredentials([ + sshUserPrivateKey(credentialsId: 'JENKINS_DEPLOYER_KEY', keyFileVariable: 'SSH_KEY'), + usernamePassword(credentialsId:'JENKINS_DEPLOYER_PASS', usernameVariable: 'username', passwordVariable: 'password') + ]) { + wrap([$class: 'MaskPasswordsBuildWrapper', varPasswordPairs: [[password: env.password]]]) { + sh 'ansible-playbook rproxy.yml -i ${target_host}, -t install --private-key ${SSH_KEY} -u ${username} -e "ansible_password=${password} rproxy_service_name=${rproxy_service_name} rproxy_service_port=${rproxy_service_port} rproxy_service_address=${rproxy_service_address}"' + } } } } @@ -51,8 +61,13 @@ pipeline { } steps { script { - wrap([$class: 'MaskPasswordsBuildWrapper', varPasswordPairs: [[password: params.password]]]) { - sh 'ansible-playbook rproxy.yml -i ${target_host}, -t add_config -u ${username} -e "ansible_password=${password} rproxy_service_name=${rproxy_service_name} rproxy_service_port=${rproxy_service_port} rproxy_service_address=${rproxy_service_address}"' + withCredentials([ + sshUserPrivateKey(credentialsId: 'JENKINS_DEPLOYER_KEY', keyFileVariable: 'SSH_KEY'), + usernamePassword(credentialsId:'JENKINS_DEPLOYER_PASS', usernameVariable: 'username', passwordVariable: 'password') + ]) { + wrap([$class: 'MaskPasswordsBuildWrapper', varPasswordPairs: [[password: env.password]]]) { + sh 'ansible-playbook rproxy.yml -i ${target_host}, -t add_config --private-key ${SSH_KEY} -u ${username} -e "ansible_password=${password} rproxy_service_name=${rproxy_service_name} rproxy_service_port=${rproxy_service_port} rproxy_service_address=${rproxy_service_address}"' + } } } }