diff --git a/ansible/Jenkinsfile b/ansible/Jenkinsfile index 80fc48b..0245be9 100644 --- a/ansible/Jenkinsfile +++ b/ansible/Jenkinsfile @@ -18,9 +18,14 @@ pipeline { ) string( - name: 'ADDITIONAL_CONTENT', + name: 'ADDITIONAL_CONTENT_H2', defaultValue: 'Новое сообщение', - description: 'Дополнительный параграф' + description: 'Дополнительный

контент' + ) + string( + name: 'ADDITIONAL_CONTENT_P', + defaultValue: 'Дополнительный параграф', + description: 'Дополнительный

контент' ) } @@ -56,34 +61,34 @@ pipeline { switch(params.DEPLOY_TARGET) { case 'SiteA': - selectedHosts = 'SiteA' - extraVars.siteA_h2 = params.ADDITIONAL_CONTENT - extraVars.siteA_p = params.ADDITIONAL_CONTENT + selectedHosts = 'SiteA,proxy' + extraVars.siteA_h2 = params.ADDITIONAL_CONTENT_H2 + extraVars.siteA_p = params.ADDITIONAL_CONTENT_P break case 'SiteB': - selectedHosts = 'SiteB' - extraVars.siteB_h2 = params.ADDITIONAL_CONTENT - extraVars.siteB_p = params.ADDITIONAL_CONTENT + selectedHosts = 'SiteB,proxy' + extraVars.siteB_h2 = params.ADDITIONAL_CONTENT_H2 + extraVars.siteB_p = params.ADDITIONAL_CONTENT_P break case 'proxy': selectedHosts = 'proxy' break case 'SiteA&proxy': selectedHosts = 'SiteA,proxy' - extraVars.siteA_h2 = params.ADDITIONAL_CONTENT - extraVars.siteA_p = params.ADDITIONAL_CONTENT + extraVars.siteA_h2 = params.ADDITIONAL_CONTENT_H2 + extraVars.siteA_p = params.ADDITIONAL_CONTENT_P break case 'SiteB&proxy': selectedHosts = 'SiteB,proxy' - extraVars.siteB_h2 = params.ADDITIONAL_CONTENT - extraVars.siteB_p = params.ADDITIONAL_CONTENT + extraVars.siteB_h2 = params.ADDITIONAL_CONTENT_H2 + extraVars.siteB_p = params.ADDITIONAL_CONTENT_P break case 'All': selectedHosts = 'SiteA,SiteB,proxy' - extraVars.siteA_h2 = params.ADDITIONAL_CONTENT - extraVars.siteA_p = params.ADDITIONAL_CONTENT - extraVars.siteB_h2 = params.ADDITIONAL_CONTENT - extraVars.siteB_p = params.ADDITIONAL_CONTENT + extraVars.siteA_h2 = params.ADDITIONAL_CONTENT_H2 + extraVars.siteA_p = params.ADDITIONAL_CONTENT_P + extraVars.siteB_h2 = params.ADDITIONAL_CONTENT_H2 + extraVars.siteB_p = params.ADDITIONAL_CONTENT_P break default: error "Неизвестный DEPLOY_TARGET: ${params.DEPLOY_TARGET}"