dev #22

Merged
mpavlov merged 28 commits from dev into master 2024-10-04 00:59:30 +03:00
2 changed files with 26 additions and 17 deletions
Showing only changes of commit cdcc770592 - Show all commits

4
Jenkinsfile vendored
View File

@@ -23,7 +23,7 @@ pipeline {
// return params.rproxy_install // return params.rproxy_install
// } // }
// } // }
steps { // steps {
// script { // script {
def AskCerts = input message: 'Upload RootCA certificate and key', parameters: [base64File(name: 'rootca'), base64File(name: 'rootca_key')] def AskCerts = input message: 'Upload RootCA certificate and key', parameters: [base64File(name: 'rootca'), base64File(name: 'rootca_key')]
// RootCA = AskCerts[rootca] // RootCA = AskCerts[rootca]
@@ -36,7 +36,7 @@ pipeline {
// sh 'echo "${ask_for_certs["rootca"]}" > roles/rproxy/files/RootCA.crt' // sh 'echo "${ask_for_certs["rootca"]}" > roles/rproxy/files/RootCA.crt'
// sh 'echo "${ask_for_certs["rootca_key"]}" > roles/rproxy/files/RootCA.key' // sh 'echo "${ask_for_certs["rootca_key"]}" > roles/rproxy/files/RootCA.key'
// } // }
} // }
} }
stage('Install Rproxy') { stage('Install Rproxy') {
when { when {