From acea35661f223f12e05aceabd0987bc09420a39f Mon Sep 17 00:00:00 2001 From: Tim Serong Date: Fri, 21 Apr 2023 16:40:03 +1000 Subject: [PATCH] k3s: Add support for deploying on sles-15-sp4 and sles-15-sp5 Signed-off-by: Tim Serong --- sesdev/__init__.py | 2 ++ seslib/constant.py | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/sesdev/__init__.py b/sesdev/__init__.py index 5b365385..ed874344 100644 --- a/sesdev/__init__.py +++ b/sesdev/__init__.py @@ -147,6 +147,8 @@ def common_create_options(func): 'sles-15-sp1', 'sles-15-sp2', 'sles-15-sp3', + 'sles-15-sp4', + 'sles-15-sp5', 'ubuntu-bionic']), default=None, help='OS (open)SUSE distro'), click.option('--provision/--no-provision', diff --git a/seslib/constant.py b/seslib/constant.py index 232cffa3..fb44db7a 100644 --- a/seslib/constant.py +++ b/seslib/constant.py @@ -235,6 +235,10 @@ class Constant(): 'images/SLES15-SP2-Vagrant.x86_64-libvirt.box', 'sles-15-sp3': 'http://download.nue.suse.com/ibs/Virtualization:/Vagrant:/SLE-15-SP3/' 'images/SLES15-SP3-Vagrant.x86_64-libvirt.box', + 'sles-15-sp4': 'http://download.nue.suse.com/ibs/Virtualization:/Vagrant:/SLE-15-SP4/' + 'images/SLES15-SP4-Vagrant.x86_64-libvirt.box', + 'sles-15-sp5': 'http://download.nue.suse.com/ibs/Virtualization:/Vagrant:/SLE-15-SP5/' + 'images/SLES15-SP5-Vagrant.x86_64-libvirt.box', 'generic/ubuntu1804': 'generic/ubuntu1804', 'leap-15.4': 'https://download.opensuse.org/repositories/Virtualization:/' 'Appliances:/Images:/openSUSE-Leap-15.4/images/' @@ -290,6 +294,8 @@ class Constant(): 'sles-15-sp1': 'zypper', 'sles-15-sp2': 'zypper', 'sles-15-sp3': 'zypper', + 'sles-15-sp4': 'zypper', + 'sles-15-sp5': 'zypper', 'leap-15.1': 'zypper', 'leap-15.2': 'zypper', 'leap-15.3': 'zypper', @@ -302,6 +308,8 @@ class Constant(): 'sles-15-sp1': 'http://download.nue.suse.com/ibs/SUSE:/CA/SLE_15_SP1/SUSE:CA.repo', 'sles-15-sp2': 'http://download.nue.suse.com/ibs/SUSE:/CA/SLE_15_SP2/SUSE:CA.repo', 'sles-15-sp3': 'http://download.nue.suse.com/ibs/SUSE:/CA/SLE_15_SP3/SUSE:CA.repo', + 'sles-15-sp4': 'http://download.nue.suse.com/ibs/SUSE:/CA/SLE_15_SP4/SUSE:CA.repo', + 'sles-15-sp5': 'http://download.nue.suse.com/ibs/SUSE:/CA/SLE_15_SP5/SUSE:CA.repo', } OS_REPOS = { @@ -356,6 +364,34 @@ class Constant(): 'storage-update': 'http://download.nue.suse.com/ibs/SUSE/Updates/Storage/7.1/x86_64/' 'update/', }, + 'sles-15-sp4': { + 'product': 'http://dist.suse.de/ibs/SUSE/Products/SLE-Product-SLES/15-SP4/x86_64/' + 'product/', + 'product-update': 'http://dist.suse.de/ibs/SUSE/Updates/SLE-Product-SLES/15-SP4/' + 'x86_64/update/', + 'base': 'http://download.nue.suse.com/ibs/SUSE/Products/SLE-Module-Basesystem/15-SP4/' + 'x86_64/product/', + 'update': 'http://download.nue.suse.com/ibs/SUSE/Updates/SLE-Module-Basesystem/15-SP4/' + 'x86_64/update/', + 'server-apps': 'http://download.nue.suse.com/ibs/SUSE/Products/' + 'SLE-Module-Server-Applications/15-SP4/x86_64/product/', + 'server-apps-update': 'http://download.nue.suse.com/ibs/SUSE/Updates/' + 'SLE-Module-Server-Applications/15-SP4/x86_64/update/', + }, + 'sles-15-sp5': { + 'product': 'http://dist.suse.de/ibs/SUSE/Products/SLE-Product-SLES/15-SP5/x86_64/' + 'product/', + 'product-update': 'http://dist.suse.de/ibs/SUSE/Updates/SLE-Product-SLES/15-SP5/' + 'x86_64/update/', + 'base': 'http://download.nue.suse.com/ibs/SUSE/Products/SLE-Module-Basesystem/15-SP5/' + 'x86_64/product/', + 'update': 'http://download.nue.suse.com/ibs/SUSE/Updates/SLE-Module-Basesystem/15-SP5/' + 'x86_64/update/', + 'server-apps': 'http://download.nue.suse.com/ibs/SUSE/Products/' + 'SLE-Module-Server-Applications/15-SP5/x86_64/product/', + 'server-apps-update': 'http://download.nue.suse.com/ibs/SUSE/Updates/' + 'SLE-Module-Server-Applications/15-SP5/x86_64/update/', + }, } REASONABLE_TIMEOUT_IN_SECONDS = 3200 @@ -505,6 +541,8 @@ class Constant(): }, 'k3s': { 'sles-15-sp3': [], + 'sles-15-sp4': [], + 'sles-15-sp5': [], 'tumbleweed': [], }, 'makecheck': {