Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove SLES 12 SP4 #1095

Merged
merged 1 commit into from
Jan 26, 2024
Merged

Remove SLES 12 SP4 #1095

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions jenkins_pipelines/environments/manager-4.3-qe-build-validation-AWS
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
#!/usr/bin/env groovy

node('sumaform-cucumber-provo') {
def minionList = 'sle12sp4_client, sle12sp4_minion, sle12sp4_ssh_minion, ' +
'sle12sp5_client, sle12sp5_minion, sle12sp5_ssh_minion, sle12sp5_paygo_minion, ' +
def minionList = 'sle12sp5_client, sle12sp5_minion, sle12sp5_ssh_minion, sle12sp5_paygo_minion, ' +
'sle15sp1_client, sle15sp1_minion, sle15sp1_ssh_minion, ' +
'sle15sp2_client, sle15sp2_minion, sle15sp2_ssh_minion, ' +
'sle15sp3_client, sle15sp3_minion, sle15sp3_ssh_minion, ' +
Expand Down Expand Up @@ -63,7 +62,7 @@ node('sumaform-cucumber-provo') {
string(name: 'key_file', defaultValue: '/home/jenkins/.ssh/testing-suma.pem', description: 'Path to SSH private key to access instance in AWS'),
string(name: 'key_name', defaultValue: 'testing-suma', description: 'SSH key name in AWS'),
text(name: 'allowed_IPS', defaultValue: '65.132.116.252', description: 'Add the public IPs to add to AWS ingress security group ( keep default Jenkins address ) separated by new line' ),
text(name: 'custom_repositories', defaultValue: '{"server":{"server_stack":"","salt15sp3_base":"","salt15sp3_python2_module":"","salt15sp3_server_apps_module":"","extra_sle_that_affects_suma_srv":""},"proxy":{"salt":"","tools":"","salt15sp3":"","extra_sle_that_affects_suma_proxy":""},"sle12sp4_minion":{"salt":"","tools":""},"sle12sp4_client":{"tools":""},"sle12sp5_minion":{"salt":"","tools":""},"sle12sp5_client":{"tools":""},"sle15_minion":{"salt":"","tools":""},"sle15_client":{"tools":""},"sle15sp1_minion":{"salt":"","tools":"","python":"","server_apps":""},"sle15sp1_client":{"tools":""},"sle15sp2_minion":{"salt":"","tools":"","python":"","server_apps":""},"sle15sp2_client":{"tools":""},"sle15sp3_minion":{"salt":"","tools":"","python":"","server_apps":""},"sle15sp3_client":{"tools":""},"debian10_minion":{"salt":"","tools":""},"ubuntu2004_minion":{"salt":"","tools":""},"ceos7_minion":{"salt":"","tools":""},"ceos7_client":{"tools":""},"rocky8_minion":{"salt":"","tools":""},"rocky8_client":{"tools":""},"opensuse154arm_minion":{"salt":"","tools":""}}', description: 'Salt & Client Tools MU Repositories for each client, in json format'),
text(name: 'custom_repositories', defaultValue: '{"server":{"server_stack":"","salt15sp3_base":"","salt15sp3_python2_module":"","salt15sp3_server_apps_module":"","extra_sle_that_affects_suma_srv":""},"proxy":{"salt":"","tools":"","salt15sp3":"","extra_sle_that_affects_suma_proxy":""},"sle12sp5_minion":{"salt":"","tools":""},"sle12sp5_client":{"tools":""},"sle15_minion":{"salt":"","tools":""},"sle15_client":{"tools":""},"sle15sp1_minion":{"salt":"","tools":"","python":"","server_apps":""},"sle15sp1_client":{"tools":""},"sle15sp2_minion":{"salt":"","tools":"","python":"","server_apps":""},"sle15sp2_client":{"tools":""},"sle15sp3_minion":{"salt":"","tools":"","python":"","server_apps":""},"sle15sp3_client":{"tools":""},"debian10_minion":{"salt":"","tools":""},"ubuntu2004_minion":{"salt":"","tools":""},"ceos7_minion":{"salt":"","tools":""},"ceos7_client":{"tools":""},"rocky8_minion":{"salt":"","tools":""},"rocky8_client":{"tools":""},"opensuse154arm_minion":{"salt":"","tools":""}}', description: 'Salt & Client Tools MU Repositories for each client, in json format'),
booleanParam(name: 'use_latest_ami_image', defaultValue: false, description: 'Use latest ami image')
])
])
Expand Down
3 changes: 1 addition & 2 deletions jenkins_pipelines/environments/manager-4.3-qe-build-validation-NUE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
#!/usr/bin/env groovy

node('sumaform-cucumber') {
def minionList = 'sle12sp4_client, sle12sp4_minion, sle12sp4_ssh_minion, ' +
'sle12sp5_client, sle12sp5_minion, sle12sp5_ssh_minion, ' +
def minionList = 'sle12sp5_client, sle12sp5_minion, sle12sp5_ssh_minion, ' +
'sle15sp1_client, sle15sp1_minion, sle15sp1_ssh_minion, ' +
'sle15sp2_client, sle15sp2_minion, sle15sp2_ssh_minion, ' +
'sle15sp3_client, sle15sp3_minion, sle15sp3_ssh_minion, ' +
Expand Down
3 changes: 1 addition & 2 deletions jenkins_pipelines/environments/manager-4.3-qe-build-validation-PRV
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
#!/usr/bin/env groovy

node('sumaform-cucumber-provo') {
def minionList = 'sle12sp4_client, sle12sp4_minion, sle12sp4_ssh_minion, ' +
'sle12sp5_client, sle12sp5_minion, sle12sp5_ssh_minion, ' +
def minionList = 'sle12sp5_client, sle12sp5_minion, sle12sp5_ssh_minion, ' +
'sle15sp1_client, sle15sp1_minion, sle15sp1_ssh_minion, ' +
'sle15sp2_client, sle15sp2_minion, sle15sp2_ssh_minion, ' +
'sle15sp3_client, sle15sp3_minion, sle15sp3_ssh_minion, ' +
Expand Down
3 changes: 1 addition & 2 deletions jenkins_pipelines/environments/manager-5.0-qe-build-validation-NUE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
#!/usr/bin/env groovy

node('sumaform-cucumber') {
def minionList = 'sle12sp4_minion, sle12sp4_ssh_minion, ' +
'sle12sp5_minion, sle12sp5_ssh_minion, ' +
def minionList = 'sle12sp5_minion, sle12sp5_ssh_minion, ' +
'sle15sp1_minion, sle15sp1_ssh_minion, ' +
'sle15sp2_minion, sle15sp2_ssh_minion, ' +
'sle15sp3_minion, sle15sp3_ssh_minion, ' +
Expand Down
3 changes: 1 addition & 2 deletions jenkins_pipelines/environments/manager-5.0-qe-build-validation-PRV
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
#!/usr/bin/env groovy

node('sumaform-cucumber') {
def minionList = 'sle12sp4_minion, sle12sp4_ssh_minion, ' +
'sle12sp5_minion, sle12sp5_ssh_minion, ' +
def minionList = 'sle12sp5_minion, sle12sp5_ssh_minion, ' +
'sle15sp1_minion, sle15sp1_ssh_minion, ' +
'sle15sp2_minion, sle15sp2_ssh_minion, ' +
'sle15sp3_minion, sle15sp3_ssh_minion, ' +
Expand Down
3 changes: 1 addition & 2 deletions jenkins_pipelines/environments/uyuni-master-qe-build-validation-NUE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
#!/usr/bin/env groovy

node('sumaform-cucumber') {
def minionList = 'sle12sp4_minion, sle12sp4_ssh_minion, ' +
'sle12sp5_minion, sle12sp5_ssh_minion, ' +
def minionList = 'sle12sp5_minion, sle12sp5_ssh_minion, ' +
'sle15sp1_minion, sle15sp1_ssh_minion, ' +
'sle15sp2_minion, sle15sp2_ssh_minion, ' +
'sle15sp3_minion, sle15sp3_ssh_minion, ' +
Expand Down
3 changes: 1 addition & 2 deletions jenkins_pipelines/environments/uyuni-master-qe-build-validation-PRV
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
#!/usr/bin/env groovy

node('sumaform-cucumber-provo') {
def minionList = 'sle12sp4_minion, sle12sp4_ssh_minion, ' +
'sle12sp5_minion, sle12sp5_ssh_minion, ' +
def minionList = 'sle12sp5_minion, sle12sp5_ssh_minion, ' +
'sle15sp1_minion, sle15sp1_ssh_minion, ' +
'sle15sp2_minion, sle15sp2_ssh_minion, ' +
'sle15sp3_minion, sle15sp3_ssh_minion, ' +
Expand Down
2 changes: 0 additions & 2 deletions jenkins_pipelines/scripts/maintenance_json_generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@

# Default dictionary for client tools, essentially anything that is common between SUMA versions
defaultdict = {
"sle12sp4_client": "/SUSE_Updates_SLE-Manager-Tools_12_x86_64/",
"sle12sp4_minion": "/SUSE_Updates_SLE-Manager-Tools_12_x86_64/",
"sle12sp5_client": "/SUSE_Updates_SLE-Manager-Tools_12_x86_64/",
"sle12sp5_minion": "/SUSE_Updates_SLE-Manager-Tools_12_x86_64/",
"sle15_client": ["/SUSE_Updates_SLE-Manager-Tools_15_x86_64/",
Expand Down
51 changes: 0 additions & 51 deletions terracumber_config/tf_files/SUSEManager-4.3-build-validation-AWS.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,22 +223,6 @@ module "proxy" {
}


module "sles12sp4-client" {
source = "./modules/client"
base_configuration = module.base.configuration
product_version = "4.3-released"
name = "cli-sles12sp4"
image = "sles12sp4"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there no image list array where you also need to remove it?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No. I suppose that in the cloud you don't need to download the images? Ping @maximenoel8 .

server_configuration = module.server.configuration
sles_registration_code = var.SLES_REGISTRATION_CODE
auto_register = false
use_os_released_updates = false
ssh_key_path = "./salt/controller/id_rsa.pub"
provider_settings = {
instance_type = "t3a.medium"
}
}

module "sles12sp5-client" {
source = "./modules/client"
base_configuration = module.base.configuration
Expand Down Expand Up @@ -378,22 +362,6 @@ module "rocky8-minion" {
}
}

module "sles12sp4-minion" {
source = "./modules/minion"
base_configuration = module.base.configuration
product_version = "4.3-released"
name = "min-sles12sp4"
image = "sles12sp4"
server_configuration = module.server.configuration
sles_registration_code = var.SLES_REGISTRATION_CODE
auto_connect_to_master = false
use_os_released_updates = false
ssh_key_path = "./salt/controller/id_rsa.pub"
provider_settings = {
instance_type = "t3a.medium"
}
}

module "sles12sp5-minion" {
source = "./modules/minion"
base_configuration = module.base.configuration
Expand Down Expand Up @@ -527,21 +495,6 @@ module "rocky8-sshminion" {

}

module "sles12sp4-sshminion" {
source = "./modules/sshminion"
base_configuration = module.base.configuration
product_version = "4.3-released"
name = "minssh-sles12sp4"
image = "sles12sp4"
use_os_released_updates = false
sles_registration_code = var.SLES_REGISTRATION_CODE
ssh_key_path = "./salt/controller/id_rsa.pub"
gpg_keys = ["default/gpg_keys/galaxy.key"]
provider_settings = {
instance_type = "t3a.medium"
}
}

module "sles12sp5-sshminion" {
source = "./modules/sshminion"
base_configuration = module.base.configuration
Expand Down Expand Up @@ -675,10 +628,6 @@ module "controller" {
server_configuration = module.server.configuration
proxy_configuration = module.proxy.configuration

sle12sp4_client_configuration = module.sles12sp4-client.configuration
sle12sp4_minion_configuration = module.sles12sp4-minion.configuration
sle12sp4_sshminion_configuration = module.sles12sp4-sshminion.configuration

sle12sp5_client_configuration = module.sles12sp5-client.configuration
sle12sp5_minion_configuration = module.sles12sp5-minion.configuration
sle12sp5_sshminion_configuration = module.sles12sp5-sshminion.configuration
Expand Down
58 changes: 1 addition & 57 deletions terracumber_config/tf_files/SUSEManager-4.3-build-validation-NUE.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ module "base_core" {
name_prefix = "suma-bv-43-"
use_avahi = false
domain = "mgr.suse.de"
images = [ "sles12sp4o", "sles12sp5o", "sles15sp1o", "sles15sp2o", "sles15sp3o", "sles15sp4o", "sles15sp5o", "slemicro51-ign", "slemicro52-ign", "slemicro53-ign", "slemicro54-ign", "slemicro55-ign", "almalinux9o", "centos7o", "libertylinux9o", "oraclelinux9o", "rocky8o", "rocky9o", "ubuntu2004o", "ubuntu2204o", "debian10o", "debian11o", "debian12o", "opensuse155o" ]
images = [ "sles12sp5o", "sles15sp1o", "sles15sp2o", "sles15sp3o", "sles15sp4o", "sles15sp5o", "slemicro51-ign", "slemicro52-ign", "slemicro53-ign", "slemicro54-ign", "slemicro55-ign", "almalinux9o", "centos7o", "libertylinux9o", "oraclelinux9o", "rocky8o", "rocky9o", "ubuntu2004o", "ubuntu2204o", "debian10o", "debian11o", "debian12o", "opensuse155o" ]

mirror = "minima-mirror-ci-bv.mgr.suse.de"
use_mirror_images = true
Expand Down Expand Up @@ -228,24 +228,6 @@ module "proxy" {
ssh_key_path = "./salt/controller/id_rsa.pub"
}

module "sles12sp4-client" {
source = "./modules/client"
base_configuration = module.base_core.configuration
product_version = "4.3-released"
name = "cli-sles12sp4"
image = "sles12sp4o"
provider_settings = {
mac = "aa:b2:92:42:00:a8"
memory = 4096
}
server_configuration = {
hostname = "suma-bv-43-pxy.mgr.suse.de"
}
auto_register = false
use_os_released_updates = false
ssh_key_path = "./salt/controller/id_rsa.pub"
}

module "sles12sp5-client" {
source = "./modules/client"
base_configuration = module.base_core.configuration
Expand Down Expand Up @@ -375,24 +357,6 @@ module "centos7-client" {
install_salt_bundle = true
}

module "sles12sp4-minion" {
source = "./modules/minion"
base_configuration = module.base_core.configuration
product_version = "4.3-released"
name = "min-sles12sp4"
image = "sles12sp4o"
provider_settings = {
mac = "aa:b2:92:42:00:b0"
memory = 4096
}
server_configuration = {
hostname = "suma-bv-43-pxy.mgr.suse.de"
}
auto_connect_to_master = false
use_os_released_updates = false
ssh_key_path = "./salt/controller/id_rsa.pub"
}

module "sles12sp5-minion" {
source = "./modules/minion"
base_configuration = module.base_core.configuration
Expand Down Expand Up @@ -918,22 +882,6 @@ module "slemicro55-minion" {
ssh_key_path = "./salt/controller/id_rsa.pub"
}

module "sles12sp4-sshminion" {
source = "./modules/sshminion"
base_configuration = module.base_core.configuration
product_version = "4.3-released"
name = "minssh-sles12sp4"
image = "sles12sp4o"
provider_settings = {
mac = "aa:b2:92:42:00:d0"
memory = 4096
}

use_os_released_updates = false
ssh_key_path = "./salt/controller/id_rsa.pub"
gpg_keys = ["default/gpg_keys/galaxy.key"]
}

module "sles12sp5-sshminion" {
source = "./modules/sshminion"
base_configuration = module.base_core.configuration
Expand Down Expand Up @@ -1438,10 +1386,6 @@ module "controller" {
server_configuration = module.server.configuration
proxy_configuration = module.proxy.configuration

sle12sp4_client_configuration = module.sles12sp4-client.configuration
sle12sp4_minion_configuration = module.sles12sp4-minion.configuration
sle12sp4_sshminion_configuration = module.sles12sp4-sshminion.configuration

sle12sp5_client_configuration = module.sles12sp5-client.configuration
sle12sp5_minion_configuration = module.sles12sp5-minion.configuration
sle12sp5_sshminion_configuration = module.sles12sp5-sshminion.configuration
Expand Down
68 changes: 1 addition & 67 deletions terracumber_config/tf_files/SUSEManager-4.3-build-validation-PRV.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ module "base_old_sle" {
name_prefix = "suma-bv-43-"
use_avahi = false
domain = "mgr.prv.suse.net"
images = [ "sles12sp4o", "sles12sp5o" ]
images = [ "sles12sp5o" ]

mirror = "minima-mirror-ci-bv.mgr.prv.suse.net"
use_mirror_images = true
Expand Down Expand Up @@ -377,27 +377,6 @@ module "proxy" {
ssh_key_path = "./salt/controller/id_rsa.pub"
}

module "sles12sp4-client" {
providers = {
libvirt = libvirt.endor
}
source = "./modules/client"
base_configuration = module.base_old_sle.configuration
product_version = "4.3-released"
name = "cli-sles12sp4"
image = "sles12sp4o"
provider_settings = {
mac = "aa:b2:92:42:00:a8"
memory = 4096
}
server_configuration = {
hostname = "suma-bv-43-pxy.mgr.prv.suse.net"
}
auto_register = false
use_os_released_updates = false
ssh_key_path = "./salt/controller/id_rsa.pub"
}

module "sles12sp5-client" {
providers = {
libvirt = libvirt.endor
Expand Down Expand Up @@ -548,27 +527,6 @@ module "centos7-client" {
install_salt_bundle = true
}

module "sles12sp4-minion" {
providers = {
libvirt = libvirt.endor
}
source = "./modules/minion"
base_configuration = module.base_old_sle.configuration
product_version = "4.3-released"
name = "min-sles12sp4"
image = "sles12sp4o"
provider_settings = {
mac = "aa:b2:92:42:00:b0"
memory = 4096
}
server_configuration = {
hostname = "suma-bv-43-pxy.mgr.prv.suse.net"
}
auto_connect_to_master = false
use_os_released_updates = false
ssh_key_path = "./salt/controller/id_rsa.pub"
}

module "sles12sp5-minion" {
providers = {
libvirt = libvirt.endor
Expand Down Expand Up @@ -1160,26 +1118,6 @@ module "slemicro55-minion" {
ssh_key_path = "./salt/controller/id_rsa.pub"
}


module "sles12sp4-sshminion" {
providers = {
libvirt = libvirt.endor
}
source = "./modules/sshminion"
base_configuration = module.base_old_sle.configuration
product_version = "4.3-released"
name = "minssh-sles12sp4"
image = "sles12sp4o"
provider_settings = {
mac = "aa:b2:92:42:00:d0"
memory = 4096
}

use_os_released_updates = false
ssh_key_path = "./salt/controller/id_rsa.pub"
gpg_keys = ["default/gpg_keys/galaxy.key"]
}

module "sles12sp5-sshminion" {
providers = {
libvirt = libvirt.endor
Expand Down Expand Up @@ -1765,10 +1703,6 @@ module "controller" {
server_configuration = module.server.configuration
proxy_configuration = module.proxy.configuration

sle12sp4_client_configuration = module.sles12sp4-client.configuration
sle12sp4_minion_configuration = module.sles12sp4-minion.configuration
sle12sp4_sshminion_configuration = module.sles12sp4-sshminion.configuration

sle12sp5_client_configuration = module.sles12sp5-client.configuration
sle12sp5_minion_configuration = module.sles12sp5-minion.configuration
sle12sp5_sshminion_configuration = module.sles12sp5-sshminion.configuration
Expand Down
Loading
Loading