Skip to content

Commit 2a8a27d

Browse files
Add PMM IP to job description and fix parameter references
- Display PMM IP in the Jenkins job description HTML - Fix incorrect parameter references (MASTER_NODES -> 3, WORKER_NODES -> WORKER_COUNT, etc.) - Fix password reference to use env.PMM_PASSWORD instead of env.PMM_ADMIN_PASSWORD
1 parent 2113054 commit 2a8a27d

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

cloud/jenkins/openshift_cluster_create.groovy

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -519,22 +519,23 @@ Starting cluster creation process...
519519
if (env.PMM_URL) {
520520
descriptionHtml.append("<b>PMM Monitoring:</b><br/>")
521521
descriptionHtml.append("• URL: <a href='${env.PMM_URL}'>${env.PMM_URL}</a><br/>")
522+
descriptionHtml.append("• IP: <code>${env.PMM_IP}</code><br/>")
522523
descriptionHtml.append("• User: <code>admin</code><br/>")
523-
descriptionHtml.append("• Password: <code>${env.PMM_ADMIN_PASSWORD ?: 'Check deployment logs'}</code><br/>")
524+
descriptionHtml.append("• Password: <code>${env.PMM_PASSWORD ?: 'Check deployment logs'}</code><br/>")
524525
descriptionHtml.append("• Version: ${params.PMM_IMAGE_TAG}<br/>")
525526
descriptionHtml.append("<br/>")
526527
}
527528

528529
// Cluster resources
529530
descriptionHtml.append("<b>Resources:</b><br/>")
530-
descriptionHtml.append("• Masters: ${params.MASTER_NODES} × ${params.MASTER_INSTANCE_TYPE}<br/>")
531-
descriptionHtml.append("• Workers: ${params.WORKER_NODES} × ${params.WORKER_INSTANCE_TYPE}<br/>")
531+
descriptionHtml.append("• Masters: 3 × ${params.MASTER_INSTANCE_TYPE}<br/>")
532+
descriptionHtml.append("• Workers: ${params.WORKER_COUNT} × ${params.WORKER_INSTANCE_TYPE}<br/>")
532533
descriptionHtml.append("<br/>")
533534

534535
// Lifecycle details
535536
descriptionHtml.append("<b>Lifecycle:</b><br/>")
536-
descriptionHtml.append("• Auto-delete: ${params.AUTO_DELETE_HOURS} hours<br/>")
537-
descriptionHtml.append("• Team: ${params.TEAM}<br/>")
537+
descriptionHtml.append("• Auto-delete: ${params.DELETE_AFTER_HOURS} hours<br/>")
538+
descriptionHtml.append("• Team: ${params.TEAM_NAME}<br/>")
538539
descriptionHtml.append("• S3 Backup: <code>s3://${env.S3_BUCKET}/${env.FINAL_CLUSTER_NAME}/</code><br/>")
539540

540541
currentBuild.description = descriptionHtml.toString()

0 commit comments

Comments
 (0)