PMM-14287: Add PMM_IP environment variable to openshift-cluster-create job (#3517)

* Add PMM_IP environment variable to openshift-cluster-create job

- Modified deployPMM function to retrieve PMM service IP address
- Added logic to get IP from monitoring-service LoadBalancer or ClusterIP
- Export PMM_IP as environment variable in the pipeline
- Display PMM IP address in post-creation output
- Store PMM IP in cluster metadata for reference

* 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

* Move OpenShift cluster management jobs to pmm/openshift directory

- Moved all OpenShift cluster management files from cloud/jenkins to pmm/openshift
- Updated script paths in YAML files to reflect new location
- Aligns with organizational structure changes from PR #3504

* Update Jenkins job configurations to use master branch and official repository

- Changed branch from 'feature/openshift-shared-libraries' to 'master'
- Updated repository URL from personal fork to official Percona-Lab repository

* Fix PMM IP retrieval to use public ingress IP instead of internal ClusterIP

The monitoring-service in PMM namespace is a ClusterIP service (internal only),
not a LoadBalancer. The actual public access goes through the OpenShift ingress
controller (router-default service in openshift-ingress namespace).

This fix:
- Gets the public IP from the ingress controller LoadBalancer
- Resolves the hostname to IP address for external access
- Removes the incorrect fallback to ClusterIP which returns internal IPs

Testing confirmed:
- Old approach returned 172.30.x.x (internal, not accessible)
- New approach returns actual public IP (e.g., 3.129.202.84)
- External tools can now connect to PMM using the correct IP

* Remove trailing whitespace

* Fix fallback logic: only resolve hostname if no direct IP available

The previous logic was flawed - it would try hostname first and only fall back
to IP if hostname wasn't available. But if a provider gives us a direct IP,
we should just use it without DNS resolution.

New logic:
1. First check if LoadBalancer provides direct IP (GCP, some bare metal)
2. If no IP, check for hostname (AWS, Azure) and resolve it
3. If neither, try to get external IP from worker node (on-prem setups)

This ensures we get a working IP address across all cloud providers and
deployment scenarios.

* Simplify PMM IP retrieval for AWS-only environment

Since this is entirely AWS, remove unnecessary fallback logic:
- Remove check for direct IP (AWS always provides hostname)
- Remove worker node external IP fallback (not applicable to AWS)
- Keep only the AWS ELB hostname resolution logic

This makes the code cleaner and more maintainable by focusing only
on the AWS use case that actually applies.

* Use getent for DNS resolution with nslookup fallback

- getent is available by default on Oracle Linux 9 Jenkins agents
- nslookup requires bind-utils package which may not be installed
- Added fallback to nslookup if getent fails for any reason
- Tested with real AWS ELB hostnames and confirmed working

This ensures DNS resolution works reliably on Jenkins agents without requiring additional packages.

Author: nogueiraanderson

cloud/jenkins/openshift-cluster-create.yml renamed to pmm/openshift/openshift-cluster-create.yml

@@ -159,12 +159,12 @@
       pipeline-scm:
           scm:
               - git:
-                    url: https://github.com/nogueiraanderson/jenkins-pipelines.git
+                    url: https://github.com/Percona-Lab/jenkins-pipelines.git
                     branches:
-                        - "feature/openshift-shared-libraries"
+                        - "master"
                     wipe-workspace: false
           lightweight-checkout: true
-          script-path: cloud/jenkins/openshift_cluster_create.groovy
+          script-path: pmm/openshift/openshift_cluster_create.groovy
 
       concurrent: true
 

cloud/jenkins/openshift-cluster-destroy.yml renamed to pmm/openshift/openshift-cluster-destroy.yml

@@ -41,12 +41,12 @@
     pipeline-scm:
       scm:
         - git:
-            url: https://github.com/nogueiraanderson/jenkins-pipelines.git
+            url: https://github.com/Percona-Lab/jenkins-pipelines.git
             branches:
-            - 'feature/openshift-shared-libraries'
+            - 'master'
             wipe-workspace: false
       lightweight-checkout: true
-      script-path: cloud/jenkins/openshift_cluster_destroy.groovy
+      script-path: pmm/openshift/openshift_cluster_destroy.groovy
 
     concurrent: true
 

cloud/jenkins/openshift-cluster-list.yml renamed to pmm/openshift/openshift-cluster-list.yml

@@ -20,10 +20,10 @@
     pipeline-scm:
       scm:
         - git:
-            url: https://github.com/nogueiraanderson/jenkins-pipelines.git
+            url: https://github.com/Percona-Lab/jenkins-pipelines.git
             branches:
-              - feature/openshift-shared-libraries
-      script-path: cloud/jenkins/openshift_cluster_list.groovy
+              - master
+      script-path: pmm/openshift/openshift_cluster_list.groovy
       lightweight-checkout: true
 
     concurrent: true

cloud/jenkins/openshift_cluster_create.groovy renamed to pmm/openshift/openshift_cluster_create.groovy

@@ -388,6 +388,7 @@ Starting cluster creation process...
 
                         if (clusterInfo.pmm) {
                             env.PMM_URL = clusterInfo.pmm.url
+                            env.PMM_IP = clusterInfo.pmm.ip ?: 'N/A'
                             env.PMM_PASSWORD = clusterInfo.pmm.password
                             env.PMM_PASSWORD_GENERATED = clusterInfo.pmm.passwordGenerated.toString()
                         }
@@ -458,6 +459,7 @@ Starting cluster creation process...
                         echo "Helm Chart:           ${params.PMM_HELM_CHART_VERSION}"
                         echo "Namespace:            pmm-monitoring"
                         echo "Access URL:           ${env.PMM_URL}"
+                        echo "IP Address:           ${env.PMM_IP}"
                         echo "Username:             admin"
                         echo "Password:             ${passwordInfo}"
                         echo ""
@@ -517,22 +519,23 @@ Starting cluster creation process...
                     if (env.PMM_URL) {
                         descriptionHtml.append("<b>PMM Monitoring:</b><br/>")
                         descriptionHtml.append("• URL: <a href='${env.PMM_URL}'>${env.PMM_URL}</a><br/>")
+                        descriptionHtml.append("• IP: <code>${env.PMM_IP}</code><br/>")
                         descriptionHtml.append("• User: <code>admin</code><br/>")
-                        descriptionHtml.append("• Password: <code>${env.PMM_ADMIN_PASSWORD ?: 'Check deployment logs'}</code><br/>")
+                        descriptionHtml.append("• Password: <code>${env.PMM_PASSWORD ?: 'Check deployment logs'}</code><br/>")
                         descriptionHtml.append("• Version: ${params.PMM_IMAGE_TAG}<br/>")
                         descriptionHtml.append("<br/>")
                     }
 
                     // Cluster resources
                     descriptionHtml.append("<b>Resources:</b><br/>")
-                    descriptionHtml.append("• Masters: ${params.MASTER_NODES} × ${params.MASTER_INSTANCE_TYPE}<br/>")
-                    descriptionHtml.append("• Workers: ${params.WORKER_NODES} × ${params.WORKER_INSTANCE_TYPE}<br/>")
+                    descriptionHtml.append("• Masters: 3 × ${params.MASTER_INSTANCE_TYPE}<br/>")
+                    descriptionHtml.append("• Workers: ${params.WORKER_COUNT} × ${params.WORKER_INSTANCE_TYPE}<br/>")
                     descriptionHtml.append("<br/>")
 
                     // Lifecycle details
                     descriptionHtml.append("<b>Lifecycle:</b><br/>")
-                    descriptionHtml.append("• Auto-delete: ${params.AUTO_DELETE_HOURS} hours<br/>")
-                    descriptionHtml.append("• Team: ${params.TEAM}<br/>")
+                    descriptionHtml.append("• Auto-delete: ${params.DELETE_AFTER_HOURS} hours<br/>")
+                    descriptionHtml.append("• Team: ${params.TEAM_NAME}<br/>")
                     descriptionHtml.append("• S3 Backup: <code>s3://${env.S3_BUCKET}/${env.FINAL_CLUSTER_NAME}/</code><br/>")
 
                     currentBuild.description = descriptionHtml.toString()

cloud/jenkins/openshift_cluster_destroy.groovy renamed to pmm/openshift/openshift_cluster_destroy.groovy

@@ -217,6 +217,7 @@ def create(Map config) {
             metadata.pmmDeployed = true
             metadata.pmmImageTag = params.pmmImageTag
             metadata.pmmUrl = pmmInfo.url
+            metadata.pmmIp = pmmInfo.ip
             metadata.pmmNamespace = pmmInfo.namespace
 
             // Update metadata in S3 with PMM information
@@ -706,6 +707,29 @@ def deployPMM(Map params) {
         returnStdout: true
     ).trim()
 
+    // Get the public IP address from the OpenShift ingress controller
+    // The monitoring-service is a ClusterIP (internal only), so we need the ingress IP
+    def pmmIp = sh(
+        script: """
+            export PATH="\$HOME/.local/bin:\$PATH"
+
+            # AWS provides hostname in LoadBalancer status, not direct IP
+            INGRESS_HOSTNAME=\$(oc get service -n openshift-ingress router-default \
+                -o jsonpath='{.status.loadBalancer.ingress[0].hostname}' 2>/dev/null)
+            
+            if [[ -n "\$INGRESS_HOSTNAME" ]]; then
+                # Resolve AWS ELB hostname to IP address
+                # Use getent (available by default on Oracle Linux) with nslookup fallback
+                getent hosts "\$INGRESS_HOSTNAME" 2>/dev/null | awk '{print \$1; exit}' || \
+                    nslookup "\$INGRESS_HOSTNAME" 2>/dev/null | grep -A 1 "^Name:" | grep "Address" | head -1 | awk '{print \$2}'
+            else
+                # No hostname found - ingress might not be ready yet
+                echo ''
+            fi
+        """,
+        returnStdout: true
+    ).trim()
+
     // Get the actual password from the secret (either set or generated)
     def actualPassword = sh(
         script: """
@@ -717,6 +741,7 @@ def deployPMM(Map params) {
 
     return [
         url: "https://${pmmUrl}",
+        ip: pmmIp ?: 'N/A',  // Return 'N/A' if we couldn't determine the IP
         username: 'admin',
         password: actualPassword,
         namespace: params.pmmNamespace,