Update the SSH Keys.

maximenoel8 · maximenoel8 · commit fe3e98e36ae0 · 2026-04-24T10:38:08.000+12:00
diff --git a/jenkins_pipelines/environments/common/pipeline-build-validation.groovy b/jenkins_pipelines/environments/common/pipeline-build-validation.groovy
@@ -124,8 +124,10 @@ def run(params) {
                         commonArgs += " --inject SERVER_CONTAINER_IMAGE=${server_container_image}"
                         commonArgs += " --inject CUCUMBER_GITREPO=${params.cucumber_gitrepo}"
                         commonArgs += " --inject CUCUMBER_BRANCH=${params.cucumber_ref}"
-                        commonArgs += " --inject PRIVATE_SSH_KEY_PATH=\"/home/jenkins/.ssh/id_ed25519.worker\""
-                        commonArgs += " --inject PUBLIC_SSH_KEY_PATH=\"/home/jenkins/.ssh/id_ed25519.pub.controller\""
+                        if (isNewJenkins) {
+                            commonArgs += " --inject PRIVATE_SSH_KEY_PATH=\"/home/jenkins/.ssh/id_ed25519.worker\""
+                            commonArgs += " --inject PUBLIC_SSH_KEY_PATH=\"/home/jenkins/.ssh/id_ed25519.pub.controller\""
+                        }
                         if (product_version) { commonArgs += " --inject PRODUCT_VERSION=${product_version}" }
                         if (base_os) { commonArgs += " --inject BASE_OS=${base_os}" }
                         if (fileExists('custom_repositories.json')) {
diff --git a/jenkins_pipelines/environments/common/pipeline-personal.groovy b/jenkins_pipelines/environments/common/pipeline-personal.groovy
@@ -74,6 +74,10 @@ def run(params) {
                         if (params.container_repository != '') {
                             sh "echo 'CONTAINER_REPOSITORY=\"${params.container_repository}\"' >> ${resultdir}/sumaform/terraform.tfvars"
                         }
+                        if (isNewJenkins) {
+                            sh "echo PRIVATE_SSH_KEY_PATH=\"/home/jenkins/.ssh/id_ed25519.worker\" >> ${resultdir}/sumaform/terraform.tfvars"
+                            sh "echo PUBLIC_SSH_KEY_PATH=\"/home/jenkins/.ssh/id_ed25519.pub.controller\" >> ${resultdir}/sumaform/terraform.tfvars"
+                        }
                         sh """
                             #!/bin/bash
                             set -e -o pipefail
diff --git a/terracumber_config/tf_files/personal/main_43.tf b/terracumber_config/tf_files/personal/main_43.tf
@@ -30,6 +30,7 @@ module "cucumber_testsuite" {
 
   images = ["rocky8o", "opensuse156o", "sles15sp4o", "ubuntu2204o"]
 
+  ssh_key_path = var.PUBLIC_SSH_KEY_PATH
   use_avahi    = false
   name_prefix  = "${var.ENVIRONMENT}-"
   domain       = "mgr.suse.de"
diff --git a/terracumber_config/tf_files/personal/main_50.tf b/terracumber_config/tf_files/personal/main_50.tf
@@ -36,7 +36,7 @@ module "cucumber_testsuite" {
 
   images = ["rocky8o", "opensuse156o", "ubuntu2404o", "sles15sp7o", "slemicro55o"]
 
-  ssh_key_path = "/home/jenkins/.ssh/id_ed25519.pub.controller"
+  ssh_key_path = var.PUBLIC_SSH_KEY_PATH
   use_avahi    = false
   name_prefix   = "${var.ENVIRONMENT}-"
   domain       = "mgr.suse.de"
@@ -145,7 +145,7 @@ module "cucumber_testsuite" {
       hypervisor = {
         host        = var.ENVIRONMENT_CONFIGURATION[var.ENVIRONMENT].hypervisor
         user        = var.ENVIRONMENT_CONFIGURATION[var.ENVIRONMENT].dhcp_user
-        private_key = file("~/.ssh/id_ed25519")
+        private_key = file(var.PRIVATE_SSH_KEY_PATH)
       }
     }
     kvm_host = {
diff --git a/terracumber_config/tf_files/personal/main_51.tf b/terracumber_config/tf_files/personal/main_51.tf
@@ -37,7 +37,7 @@ module "cucumber_testsuite" {
 
   images = ["rocky8o", "opensuse156o", "ubuntu2404o", "sles15sp7o", "slmicro61o"]
 
-  ssh_key_path = "/home/jenkins/.ssh/id_ed25519.pub"
+  ssh_key_path = var.PUBLIC_SSH_KEY_PATH
   use_avahi    = false
   name_prefix   = "${var.ENVIRONMENT}-"
   domain       = "mgr.suse.de"
@@ -146,7 +146,7 @@ module "cucumber_testsuite" {
       hypervisor = {
         host        = var.ENVIRONMENT_CONFIGURATION[var.ENVIRONMENT].hypervisor
         user        = var.ENVIRONMENT_CONFIGURATION[var.ENVIRONMENT].dhcp_user
-        private_key = file("~/.ssh/id_ed25519")
+        private_key = file(var.PRIVATE_SSH_KEY_PATH)
       }
     }
   }
diff --git a/terracumber_config/tf_files/personal/main_head.tf b/terracumber_config/tf_files/personal/main_head.tf
@@ -36,6 +36,7 @@ module "cucumber_testsuite" {
 
   images = ["rocky8o", "opensuse156o", "ubuntu2404o", "sles15sp7o", "slmicro61o", "slmicro62o"]
 
+  ssh_key_path = var.PUBLIC_SSH_KEY_PATH
   use_avahi    = false
   name_prefix  = "${var.ENVIRONMENT}-"
   domain       = "mgr.suse.de"
@@ -142,7 +143,7 @@ module "cucumber_testsuite" {
       hypervisor  = {
         host        = var.ENVIRONMENT_CONFIGURATION[var.ENVIRONMENT].hypervisor
         user        = var.ENVIRONMENT_CONFIGURATION[var.ENVIRONMENT].dhcp_user
-        private_key = file("~/.ssh/id_ed25519")
+        private_key = file(var.PRIVATE_SSH_KEY_PATH)
       }
     }
   }
diff --git a/terracumber_config/tf_files/personal/main_head_staging.tf b/terracumber_config/tf_files/personal/main_head_staging.tf
@@ -36,6 +36,7 @@ module "cucumber_testsuite" {
 
   images = ["rocky8o", "opensuse156o", "ubuntu2404o", "sles15sp7o", "slmicro61o", "slmicro62o"]
 
+  ssh_key_path = var.PUBLIC_SSH_KEY_PATH
   use_avahi    = false
   name_prefix  = "${var.ENVIRONMENT}-"
   domain       = "mgr.suse.de"
@@ -142,7 +143,7 @@ module "cucumber_testsuite" {
       hypervisor  = {
         host        = var.ENVIRONMENT_CONFIGURATION[var.ENVIRONMENT].hypervisor
         user        = var.ENVIRONMENT_CONFIGURATION[var.ENVIRONMENT].dhcp_user
-        private_key = file("~/.ssh/id_ed25519")
+        private_key = file(var.PRIVATE_SSH_KEY_PATH)
       }
     }
   }
diff --git a/terracumber_config/tf_files/personal/main_rke_head.tf b/terracumber_config/tf_files/personal/main_rke_head.tf
@@ -36,6 +36,7 @@ module "cucumber_testsuite" {
 
   images = ["rocky8o", "opensuse156o", "ubuntu2404o", "sles15sp7o", "slmicro61o"]
 
+  ssh_key_path = var.PUBLIC_SSH_KEY_PATH
   use_avahi    = false
   name_prefix  = "${var.ENVIRONMENT}-"
   domain       = "mgr.suse.de"
@@ -152,7 +153,7 @@ module "cucumber_testsuite" {
       hypervisor  = {
         host        = var.ENVIRONMENT_CONFIGURATION[var.ENVIRONMENT].hypervisor
         user        = var.ENVIRONMENT_CONFIGURATION[var.ENVIRONMENT].dhcp_user
-        private_key = file("~/.ssh/id_ed25519")
+        private_key = file(var.PRIVATE_SSH_KEY_PATH)
       }
     }
   }
diff --git a/terracumber_config/tf_files/personal/main_rke_uyuni.tf b/terracumber_config/tf_files/personal/main_rke_uyuni.tf
@@ -36,6 +36,7 @@ module "cucumber_testsuite" {
 
   images        = ["rocky8o", "opensuse156o", "ubuntu2404o", "sles15sp7o", "tumbleweedo"]
 
+  ssh_key_path  = var.PUBLIC_SSH_KEY_PATH
   use_avahi     = false
   name_prefix   = "${var.ENVIRONMENT}-"
   domain        = "mgr.suse.de"
@@ -142,7 +143,7 @@ module "cucumber_testsuite" {
       hypervisor = {
         host        = var.ENVIRONMENT_CONFIGURATION[var.ENVIRONMENT].hypervisor
         user        = var.ENVIRONMENT_CONFIGURATION[var.ENVIRONMENT].dhcp_user
-        private_key = file("~/.ssh/id_ed25519")
+        private_key = file(var.PRIVATE_SSH_KEY_PATH)
       }
     }
   }
diff --git a/terracumber_config/tf_files/personal/main_uyuni.tf b/terracumber_config/tf_files/personal/main_uyuni.tf
@@ -36,6 +36,7 @@ module "cucumber_testsuite" {
 
   images        = ["rocky8o", "opensuse156o", "ubuntu2404o", "sles15sp7o", "tumbleweedo"]
 
+  ssh_key_path  = var.PUBLIC_SSH_KEY_PATH
   use_avahi     = false
   name_prefix   = "${var.ENVIRONMENT}-"
   domain        = "mgr.suse.de"
@@ -130,7 +131,7 @@ module "cucumber_testsuite" {
       hypervisor = {
         host        = var.ENVIRONMENT_CONFIGURATION[var.ENVIRONMENT].hypervisor
         user        = var.ENVIRONMENT_CONFIGURATION[var.ENVIRONMENT].dhcp_user
-        private_key = file("~/.ssh/id_ed25519")
+        private_key = file(var.PRIVATE_SSH_KEY_PATH)
       }
     }
   }
diff --git a/terracumber_config/tf_files/personal/variables.tf b/terracumber_config/tf_files/personal/variables.tf
@@ -102,3 +102,13 @@ variable "SCC_PTF_PASSWORD" {
   default = null
   // Not needed for master, as PTFs are only build for SUSE Manager / MLM
 }
+
+variable "PUBLIC_SSH_KEY_PATH" {
+  type = string
+  default = "./salt/controller/id_ed25519.pub"
+}
+
+variable "PRIVATE_SSH_KEY_PATH" {
+  type = string
+  default = "~/.ssh/id_ed25519"
+}

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ module "cucumber_testsuite" {`
`37`	`37`
`38`	`38`	`images = ["rocky8o", "opensuse156o", "ubuntu2404o", "sles15sp7o", "slmicro61o"]`
`39`	`39`
`40`		`- ssh_key_path = "/home/jenkins/.ssh/id_ed25519.pub"`
	`40`	`+ ssh_key_path = var.PUBLIC_SSH_KEY_PATH`
`41`	`41`	`use_avahi = false`
`42`	`42`	`name_prefix = "${var.ENVIRONMENT}-"`
`43`	`43`	`domain = "mgr.suse.de"`
`@@ -146,7 +146,7 @@ module "cucumber_testsuite" {`
`146`	`146`	`hypervisor = {`
`147`	`147`	`host = var.ENVIRONMENT_CONFIGURATION[var.ENVIRONMENT].hypervisor`
`148`	`148`	`user = var.ENVIRONMENT_CONFIGURATION[var.ENVIRONMENT].dhcp_user`
`149`		`- private_key = file("~/.ssh/id_ed25519")`
	`149`	`+ private_key = file(var.PRIVATE_SSH_KEY_PATH)`
`150`	`150`	`}`
`151`	`151`	`}`
`152`	`152`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@ module "cucumber_testsuite" {`
`36`	`36`
`37`	`37`	`images = ["rocky8o", "opensuse156o", "ubuntu2404o", "sles15sp7o", "slmicro61o", "slmicro62o"]`
`38`	`38`
	`39`	`+ ssh_key_path = var.PUBLIC_SSH_KEY_PATH`
`39`	`40`	`use_avahi = false`
`40`	`41`	`name_prefix = "${var.ENVIRONMENT}-"`
`41`	`42`	`domain = "mgr.suse.de"`
`@@ -142,7 +143,7 @@ module "cucumber_testsuite" {`
`142`	`143`	`hypervisor = {`
`143`	`144`	`host = var.ENVIRONMENT_CONFIGURATION[var.ENVIRONMENT].hypervisor`
`144`	`145`	`user = var.ENVIRONMENT_CONFIGURATION[var.ENVIRONMENT].dhcp_user`
`145`		`- private_key = file("~/.ssh/id_ed25519")`
	`146`	`+ private_key = file(var.PRIVATE_SSH_KEY_PATH)`
`146`	`147`	`}`
`147`	`148`	`}`
`148`	`149`	`}`