Skip to content

Commit

Permalink
BV: add entries for Salt migration minion
Browse files Browse the repository at this point in the history
  • Loading branch information
@NamelessOne91
NamelessOne91 committed Jan 3, 2024
1 parent b28e708 commit f976aff
Show file tree
Hide file tree
Showing 10 changed files with 98 additions and 5 deletions.
3 changes: 2 additions & 1 deletion jenkins_pipelines/environments/manager-4.3-qe-build-validation-AWS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ node('sumaform-cucumber-provo') {
'debian10_minion, debian10_ssh_minion, debian11_minion, debian11_ssh_minion, debian12_minion, debian12_ssh_minion, ' +
'opensuse154arm_minion, opensuse154arm_ssh_minion, ' +
'slemicro51_minion, slemicro51_ssh_minion, slemicro52_minion, slemicro52_ssh_minion, slemicro53_minion, slemicro53_ssh_minion, slemicro54_minion, slemicro54_ssh_minion, ' +
'slemicro55_minion, slemicro55_ssh_minion'
'slemicro55_minion, slemicro55_ssh_minion, ' +
'salt_migration_minion'
properties([
buildDiscarder(logRotator(numToKeepStr: '5', daysToKeepStr: '30', artifactNumToKeepStr: '3')),
disableConcurrentBuilds(),
Expand Down
3 changes: 2 additions & 1 deletion jenkins_pipelines/environments/manager-4.3-qe-build-validation-NUE
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ node('sumaform-cucumber') {
'slemicro52_minion, slemicro52_ssh_minion, ' +
'slemicro53_minion, slemicro53_ssh_minion, ' +
'slemicro54_minion, slemicro54_ssh_minion, ' +
'slemicro55_minion, slemicro55_ssh_minion'
'slemicro55_minion, slemicro55_ssh_minion, ' +
'salt_migration_minion'
properties([
buildDiscarder(logRotator(numToKeepStr: '5', daysToKeepStr: '30', artifactNumToKeepStr: '3')),
disableConcurrentBuilds(),
Expand Down
3 changes: 2 additions & 1 deletion jenkins_pipelines/environments/manager-4.3-qe-build-validation-PRV
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ node('sumaform-cucumber-provo') {
'slemicro52_minion, slemicro52_ssh_minion, ' +
'slemicro53_minion, slemicro53_ssh_minion, ' +
'slemicro54_minion, slemicro54_ssh_minion, ' +
'slemicro55_minion, slemicro55_ssh_minion'
'slemicro55_minion, slemicro55_ssh_minion, ' +
'salt_migration_minion'
properties([
buildDiscarder(logRotator(numToKeepStr: '5', daysToKeepStr: '30', artifactNumToKeepStr: '3')),
disableConcurrentBuilds(),
Expand Down
3 changes: 2 additions & 1 deletion jenkins_pipelines/environments/uyuni-master-qe-build-validation-NUE
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ node('sumaform-cucumber') {
'slemicro52_minion, slemicro52_ssh_minion, ' +
'slemicro53_minion, slemicro53_ssh_minion, ' +
'slemicro54_minion, slemicro54_ssh_minion, ' +
'slemicro55_minion, slemicro55_ssh_minion'
'slemicro55_minion, slemicro55_ssh_minion, ' +
'salt_migration_minion'
properties([
buildDiscarder(logRotator(numToKeepStr: '5', daysToKeepStr: '30', artifactNumToKeepStr: '3')),
disableConcurrentBuilds(),
Expand Down
3 changes: 2 additions & 1 deletion jenkins_pipelines/environments/uyuni-master-qe-build-validation-PRV
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ node('sumaform-cucumber-provo') {
'slemicro52_minion, slemicro52_ssh_minion, ' +
'slemicro53_minion, slemicro53_ssh_minion, ' +
'slemicro54_minion, slemicro54_ssh_minion, ' +
'slemicro55_minion, slemicro55_ssh_minion'
'slemicro55_minion, slemicro55_ssh_minion, ' +
'salt_migration_minion'
properties([
buildDiscarder(logRotator(numToKeepStr: '5', daysToKeepStr: '30', artifactNumToKeepStr: '3')),
disableConcurrentBuilds(),
Expand Down
3 changes: 3 additions & 0 deletions jenkins_pipelines/scripts/maintenance_json_generator.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,9 @@
"slemicro55_minion": ["/SUSE_Updates_SLE-Manager-Tools-For-Micro_5_x86_64/",
"/SUSE_Updates_SUSE-MicroOS_5.5_x86_64/",
"/SUSE_Updates_SLE-Micro_5.5_x86_64/"],
"salt_migration_minion": ["/SUSE_Updates_SLE-Manager-Tools_15_x86_64/",
"/SUSE_Updates_SLE-Module-Basesystem_15-SP5_x86_64/",
"/SUSE_Updates_SLE-Module-Server-Applications_15-SP5_x86_64/"],
}

# Dictionary for SUMA 4.3 Server and Proxy, which is then added together with the common dictionary for client tools
Expand Down
21 changes: 21 additions & 0 deletions terracumber_config/tf_files/SUSEManager-4.3-build-validation-NUE.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -804,6 +804,25 @@ module "sles15sp5s390-minion" {
ssh_key_path = "./salt/controller/id_rsa.pub"
}

module "salt-migration-minion" {
source = "./modules/minion"
base_configuration = module.base.configuration
name = "min-salt-migration"
product_version = "4.3-released"
image = "sles15sp5o"
provider_settings = {
mac = "aa:b2:92:42:00:cf"
memory = 4096
}

server_configuration = {
hostname = "suma-bv-43-pxy.mgr.suse.de"
}
auto_connect_to_master = true
use_os_released_updates = false
ssh_key_path = "./salt/controller/id_rsa.pub"
}

module "slemicro51-minion" {
source = "./modules/minion"
base_configuration = module.base_core.configuration
Expand Down Expand Up @@ -1490,6 +1509,8 @@ module "controller" {
sle15sp5s390_minion_configuration = module.sles15sp5s390-minion.configuration
sle15sp5s390_sshminion_configuration = module.sles15sp5s390-sshminion.configuration

salt_migration_minion_configuration = module.salt-migration-minion.configuration

slemicro51_minion_configuration = module.slemicro51-minion.configuration
slemicro51_sshminion_configuration = module.slemicro51-sshminion.configuration

Expand Down
21 changes: 21 additions & 0 deletions terracumber_config/tf_files/SUSEManager-4.3-build-validation-PRV.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1031,6 +1031,25 @@ module "sles15sp5s390-minion" {
ssh_key_path = "./salt/controller/id_rsa.pub"
}

module "salt-migration-minion" {
source = "./modules/minion"
base_configuration = module.base.configuration
name = "min-salt-migration"
product_version = "4.3-released"
image = "sles15sp5o"
provider_settings = {
mac = "aa:b2:92:42:00:cf"
memory = 4096
}

server_configuration = {
hostname = "suma-bv-43-pxy.mgr.prv.suse.net"
}
auto_connect_to_master = true
use_os_released_updates = false
ssh_key_path = "./salt/controller/id_rsa.pub"
}

module "slemicro51-minion" {
providers = {
libvirt = libvirt.giediprime
Expand Down Expand Up @@ -1817,6 +1836,8 @@ module "controller" {
sle15sp5s390_minion_configuration = module.sles15sp5s390-minion.configuration
sle15sp5s390_sshminion_configuration = module.sles15sp5s390-sshminion.configuration

salt_migration_minion_configuration = module.salt-migration-minion.configuration

slemicro51_minion_configuration = module.slemicro51-minion.configuration
slemicro51_sshminion_configuration = module.slemicro51-sshminion.configuration

Expand Down
21 changes: 21 additions & 0 deletions terracumber_config/tf_files/Uyuni-Master-build-validation-NUE.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -637,6 +637,25 @@ module "sles15sp5s390-minion" {
ssh_key_path = "./salt/controller/id_rsa.pub"
}

module "salt-migration-minion" {
source = "./modules/minion"
base_configuration = module.base.configuration
name = "min-salt-migration"
product_version = "uyuni-master"
image = "sles15sp5o"
provider_settings = {
mac = "aa:b2:93:02:01:cf"
memory = 4096
}

server_configuration = {
hostname = "uyuni-bv-master-pxy.mgr.suse.de"
}
auto_connect_to_master = true
use_os_released_updates = false
ssh_key_path = "./salt/controller/id_rsa.pub"
}

module "slemicro51-minion" {
source = "./modules/minion"
base_configuration = module.base_core.configuration
Expand Down Expand Up @@ -1293,6 +1312,8 @@ module "controller" {
sle15sp5s390_minion_configuration = module.sles15sp5s390-minion.configuration
sle15sp5s390_sshminion_configuration = module.sles15sp5s390-sshminion.configuration

salt_migration_minion_configuration = module.salt-migration-minion.configuration

slemicro51_minion_configuration = module.slemicro51-minion.configuration
slemicro51_sshminion_configuration = module.slemicro51-sshminion.configuration

Expand Down
22 changes: 22 additions & 0 deletions terracumber_config/tf_files/Uyuni-Master-build-validation-PRV.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -839,6 +839,26 @@ module "sles15sp5s390-minion" {
ssh_key_path = "./salt/controller/id_rsa.pub"
}

module "salt-migration-minion" {
source = "./modules/minion"
base_configuration = module.base.configuration
name = "min-salt-migration"
product_version = "uyuni-master"
image = "sles15sp5o"
provider_settings = {
mac = "aa:b2:93:02:01:9b"
memory = 4096
}

server_configuration = {
hostname = "uyuni-bv-master-pxy.mgr.prv.suse.net"
}
auto_connect_to_master = true
use_os_released_updates = false
ssh_key_path = "./salt/controller/id_rsa.pub"
}


module "slemicro51-minion" {
providers = {
libvirt = libvirt.ginfizz
Expand Down Expand Up @@ -1594,6 +1614,8 @@ module "controller" {
sle15sp5s390_minion_configuration = module.sles15sp5s390-minion.configuration
sle15sp5s390_sshminion_configuration = module.sles15sp5s390-sshminion.configuration

salt_migration_minion_configuration = module.salt-migration-minion.configuration

slemicro51_minion_configuration = module.slemicro51-minion.configuration
slemicro51_sshminion_configuration = module.slemicro51-sshminion.configuration

Expand Down

0 comments on commit f976aff

Please sign in to comment.