rpms/leapp-repository
5
0
Fork 1
Code Issues Pull Requests Releases Activity

Update ELevate vendors patch: drop EuroLinux support #15

Merged
eabdullin merged 1 commits from ykohut/leapp-repository:a8-elevate-0210 into a8-elevate-0210 2024-12-11 14:13:33 +00:00
Conversation 0 Commits 1 Files Changed 2 +71 -235
2 changed files with 71 additions and 235 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

300
SOURCES/leapp-repository-0.21.0-elevate.patch
View File

@ -506,10 +506,10 @@ index 00000000..b24df080
+# vars file for minimal +# vars file for minimal
diff --git a/ci/jenkins/ELevate_el7toel8_Development.jenkinsfile b/ci/jenkins/ELevate_el7toel8_Development.jenkinsfile diff --git a/ci/jenkins/ELevate_el7toel8_Development.jenkinsfile b/ci/jenkins/ELevate_el7toel8_Development.jenkinsfile
new file mode 100644 new file mode 100644
index 00000000..f60a74df index 00000000..317209ef
--- /dev/null --- /dev/null
+++ b/ci/jenkins/ELevate_el7toel8_Development.jenkinsfile +++ b/ci/jenkins/ELevate_el7toel8_Development.jenkinsfile
@@ -0,0 +1,258 @@ @@ -0,0 +1,249 @@
+RETRY = params.RETRY +RETRY = params.RETRY
+TIMEOUT = params.TIMEOUT +TIMEOUT = params.TIMEOUT
+ +
@ -522,7 +522,7 @@ index 00000000..f60a74df
+ parallelsAlwaysFailFast() + parallelsAlwaysFailFast()
+ } + }
+ parameters { + parameters {
+ choice(name: 'TARGET_DISTRO_FILTER', choices: ['almalinux-8', 'centos-stream-8', 'eurolinux-8', 'oraclelinux-8', 'rocky-8', 'all'], description: 'Select a target distro or all for ELevation') + choice(name: 'TARGET_DISTRO_FILTER', choices: ['almalinux-8', 'centos-stream-8', 'oraclelinux-8', 'rocky-8', 'all'], description: 'Select a target distro or all for ELevation')
+ choice(name: 'CONF_FILTER', choices: ['minimal', 'docker-ce'], description: 'Select a configuration') + choice(name: 'CONF_FILTER', choices: ['minimal', 'docker-ce'], description: 'Select a configuration')
+ string(name: 'LEAPP_SRC_GIT_USER', defaultValue: 'AlmaLinux', description: 'Input name of Git user of LEAPP source', trim: true) + string(name: 'LEAPP_SRC_GIT_USER', defaultValue: 'AlmaLinux', description: 'Input name of Git user of LEAPP source', trim: true)
+ string(name: 'LEAPP_SRC_GIT_BRANCH', defaultValue: 'almalinux', description: 'Input name of Git branch of LEAPP source', trim: true) + string(name: 'LEAPP_SRC_GIT_BRANCH', defaultValue: 'almalinux', description: 'Input name of Git branch of LEAPP source', trim: true)
@ -588,7 +588,7 @@ index 00000000..f60a74df
+ axes { + axes {
+ axis { + axis {
+ name 'TARGET_DISTRO' + name 'TARGET_DISTRO'
+ values 'almalinux-8', 'centos-stream-8', 'eurolinux-8', 'oraclelinux-8', 'rocky-8' + values 'almalinux-8', 'centos-stream-8', 'oraclelinux-8', 'rocky-8'
+ } + }
+ } + }
+ stages { + stages {
@ -732,15 +732,6 @@ index 00000000..f60a74df
+ leappData: ldata + leappData: ldata
+ ] + ]
+ break + break
+ case 'eurolinux-8':
+ vm = 'eurolinux_8'
+ ldata = 'eurolinux'
+
+ spec = [
+ vmName: vm,
+ leappData: ldata
+ ]
+ break
+ case 'oraclelinux-8': + case 'oraclelinux-8':
+ vm = 'oraclelinux_8' + vm = 'oraclelinux_8'
+ ldata = 'oraclelinux' + ldata = 'oraclelinux'
@ -770,10 +761,10 @@ index 00000000..f60a74df
+} +}
diff --git a/ci/jenkins/ELevate_el7toel8_Internal.jenkinsfile b/ci/jenkins/ELevate_el7toel8_Internal.jenkinsfile diff --git a/ci/jenkins/ELevate_el7toel8_Internal.jenkinsfile b/ci/jenkins/ELevate_el7toel8_Internal.jenkinsfile
new file mode 100644 new file mode 100644
index 00000000..0f5ab44d index 00000000..97f900fe
--- /dev/null --- /dev/null
+++ b/ci/jenkins/ELevate_el7toel8_Internal.jenkinsfile +++ b/ci/jenkins/ELevate_el7toel8_Internal.jenkinsfile
@@ -0,0 +1,239 @@ @@ -0,0 +1,230 @@
+RETRY = params.RETRY +RETRY = params.RETRY
+TIMEOUT = params.TIMEOUT +TIMEOUT = params.TIMEOUT
+ +
@ -786,7 +777,7 @@ index 00000000..0f5ab44d
+ parallelsAlwaysFailFast() + parallelsAlwaysFailFast()
+ } + }
+ parameters { + parameters {
+ choice(name: 'TARGET_DISTRO_FILTER', choices: ['almalinux-8', 'centos-stream-8', 'eurolinux-8', 'oraclelinux-8', 'rocky-8', 'all'], description: 'Select a target distro or all for ELevation') + choice(name: 'TARGET_DISTRO_FILTER', choices: ['almalinux-8', 'centos-stream-8', 'oraclelinux-8', 'rocky-8', 'all'], description: 'Select a target distro or all for ELevation')
+ choice(name: 'CONF_FILTER', choices: ['minimal', 'docker-ce'], description: 'Select a configuration') + choice(name: 'CONF_FILTER', choices: ['minimal', 'docker-ce'], description: 'Select a configuration')
+ string(name: 'RETRY', defaultValue: '3', description: 'Input count of retry', trim: true) + string(name: 'RETRY', defaultValue: '3', description: 'Input count of retry', trim: true)
+ string(name: 'TIMEOUT', defaultValue: '60', description: 'Input timeout value in minutes', trim: true) + string(name: 'TIMEOUT', defaultValue: '60', description: 'Input timeout value in minutes', trim: true)
@ -848,7 +839,7 @@ index 00000000..0f5ab44d
+ axes { + axes {
+ axis { + axis {
+ name 'TARGET_DISTRO' + name 'TARGET_DISTRO'
+ values 'almalinux-8', 'centos-stream-8', 'eurolinux-8', 'oraclelinux-8', 'rocky-8' + values 'almalinux-8', 'centos-stream-8', 'oraclelinux-8', 'rocky-8'
+ } + }
+ } + }
+ stages { + stages {
@ -977,15 +968,6 @@ index 00000000..0f5ab44d
+ leappData: ldata + leappData: ldata
+ ] + ]
+ break + break
+ case 'eurolinux-8':
+ vm = 'eurolinux_8'
+ ldata = 'leapp-data-eurolinux'
+
+ spec = [
+ vmName: vm,
+ leappData: ldata
+ ]
+ break
+ case 'oraclelinux-8': + case 'oraclelinux-8':
+ vm = 'oraclelinux_8' + vm = 'oraclelinux_8'
+ ldata = 'leapp-data-oraclelinux' + ldata = 'leapp-data-oraclelinux'
@ -1015,10 +997,10 @@ index 00000000..0f5ab44d
+} +}
diff --git a/ci/jenkins/ELevate_el7toel8_Internal_Dev.jenkinsfile b/ci/jenkins/ELevate_el7toel8_Internal_Dev.jenkinsfile diff --git a/ci/jenkins/ELevate_el7toel8_Internal_Dev.jenkinsfile b/ci/jenkins/ELevate_el7toel8_Internal_Dev.jenkinsfile
new file mode 100644 new file mode 100644
index 00000000..168ace8a index 00000000..af2fabe2
--- /dev/null --- /dev/null
+++ b/ci/jenkins/ELevate_el7toel8_Internal_Dev.jenkinsfile +++ b/ci/jenkins/ELevate_el7toel8_Internal_Dev.jenkinsfile
@@ -0,0 +1,262 @@ @@ -0,0 +1,253 @@
+RETRY = params.RETRY +RETRY = params.RETRY
+TIMEOUT = params.TIMEOUT +TIMEOUT = params.TIMEOUT
+ +
@ -1031,7 +1013,7 @@ index 00000000..168ace8a
+ parallelsAlwaysFailFast() + parallelsAlwaysFailFast()
+ } + }
+ parameters { + parameters {
+ choice(name: 'TARGET_DISTRO_FILTER', choices: ['almalinux-8', 'centos-stream-8', 'eurolinux-8', 'oraclelinux-8', 'rocky-8', 'all'], description: 'Select a target distro or all for ELevation') + choice(name: 'TARGET_DISTRO_FILTER', choices: ['almalinux-8', 'centos-stream-8', 'oraclelinux-8', 'rocky-8', 'all'], description: 'Select a target distro or all for ELevation')
+ choice(name: 'CONF_FILTER', choices: ['minimal', 'docker-ce'], description: 'Select a configuration') + choice(name: 'CONF_FILTER', choices: ['minimal', 'docker-ce'], description: 'Select a configuration')
+ string(name: 'LEAPP_SRC_GIT_USER', defaultValue: 'AlmaLinux', description: 'Input name of Git user of LEAPP source', trim: true) + string(name: 'LEAPP_SRC_GIT_USER', defaultValue: 'AlmaLinux', description: 'Input name of Git user of LEAPP source', trim: true)
+ string(name: 'LEAPP_SRC_GIT_BRANCH', defaultValue: 'almalinux', description: 'Input name of Git branch of LEAPP source', trim: true) + string(name: 'LEAPP_SRC_GIT_BRANCH', defaultValue: 'almalinux', description: 'Input name of Git branch of LEAPP source', trim: true)
@ -1097,7 +1079,7 @@ index 00000000..168ace8a
+ axes { + axes {
+ axis { + axis {
+ name 'TARGET_DISTRO' + name 'TARGET_DISTRO'
+ values 'almalinux-8', 'centos-stream-8', 'eurolinux-8', 'oraclelinux-8', 'rocky-8' + values 'almalinux-8', 'centos-stream-8', 'oraclelinux-8', 'rocky-8'
+ } + }
+ } + }
+ stages { + stages {
@ -1245,15 +1227,6 @@ index 00000000..168ace8a
+ leappData: ldata + leappData: ldata
+ ] + ]
+ break + break
+ case 'eurolinux-8':
+ vm = 'eurolinux_8'
+ ldata = 'eurolinux'
+
+ spec = [
+ vmName: vm,
+ leappData: ldata
+ ]
+ break
+ case 'oraclelinux-8': + case 'oraclelinux-8':
+ vm = 'oraclelinux_8' + vm = 'oraclelinux_8'
+ ldata = 'oraclelinux' + ldata = 'oraclelinux'
@ -1283,10 +1256,10 @@ index 00000000..168ace8a
+} +}
diff --git a/ci/jenkins/ELevate_el7toel8_Stable.jenkinsfile b/ci/jenkins/ELevate_el7toel8_Stable.jenkinsfile diff --git a/ci/jenkins/ELevate_el7toel8_Stable.jenkinsfile b/ci/jenkins/ELevate_el7toel8_Stable.jenkinsfile
new file mode 100644 new file mode 100644
index 00000000..8a8667ad index 00000000..ae9bdb57
--- /dev/null --- /dev/null
+++ b/ci/jenkins/ELevate_el7toel8_Stable.jenkinsfile +++ b/ci/jenkins/ELevate_el7toel8_Stable.jenkinsfile
@@ -0,0 +1,237 @@ @@ -0,0 +1,228 @@
+RETRY = params.RETRY +RETRY = params.RETRY
+TIMEOUT = params.TIMEOUT +TIMEOUT = params.TIMEOUT
+ +
@ -1299,7 +1272,7 @@ index 00000000..8a8667ad
+ parallelsAlwaysFailFast() + parallelsAlwaysFailFast()
+ } + }
+ parameters { + parameters {
+ choice(name: 'TARGET_DISTRO_FILTER', choices: ['almalinux-8', 'centos-stream-8', 'eurolinux-8', 'oraclelinux-8', 'rocky-8', 'all'], description: 'Select a target distro or all for ELevation') + choice(name: 'TARGET_DISTRO_FILTER', choices: ['almalinux-8', 'centos-stream-8', 'oraclelinux-8', 'rocky-8', 'all'], description: 'Select a target distro or all for ELevation')
+ choice(name: 'CONF_FILTER', choices: ['minimal', 'docker-ce'], description: 'Select a configuration') + choice(name: 'CONF_FILTER', choices: ['minimal', 'docker-ce'], description: 'Select a configuration')
+ string(name: 'RETRY', defaultValue: '3', description: 'Input count of retry', trim: true) + string(name: 'RETRY', defaultValue: '3', description: 'Input count of retry', trim: true)
+ string(name: 'TIMEOUT', defaultValue: '60', description: 'Input timeout value in minutes', trim: true) + string(name: 'TIMEOUT', defaultValue: '60', description: 'Input timeout value in minutes', trim: true)
@ -1361,7 +1334,7 @@ index 00000000..8a8667ad
+ axes { + axes {
+ axis { + axis {
+ name 'TARGET_DISTRO' + name 'TARGET_DISTRO'
+ values 'almalinux-8', 'centos-stream-8', 'eurolinux-8', 'oraclelinux-8', 'rocky-8' + values 'almalinux-8', 'centos-stream-8', 'oraclelinux-8', 'rocky-8'
+ } + }
+ } + }
+ stages { + stages {
@ -1488,15 +1461,6 @@ index 00000000..8a8667ad
+ leappData: ldata + leappData: ldata
+ ] + ]
+ break + break
+ case 'eurolinux-8':
+ vm = 'eurolinux_8'
+ ldata = 'leapp-data-eurolinux'
+
+ spec = [
+ vmName: vm,
+ leappData: ldata
+ ]
+ break
+ case 'oraclelinux-8': + case 'oraclelinux-8':
+ vm = 'oraclelinux_8' + vm = 'oraclelinux_8'
+ ldata = 'leapp-data-oraclelinux' + ldata = 'leapp-data-oraclelinux'
@ -1526,10 +1490,10 @@ index 00000000..8a8667ad
+} +}
diff --git a/ci/jenkins/ELevate_el7toel8_Testing.jenkinsfile b/ci/jenkins/ELevate_el7toel8_Testing.jenkinsfile diff --git a/ci/jenkins/ELevate_el7toel8_Testing.jenkinsfile b/ci/jenkins/ELevate_el7toel8_Testing.jenkinsfile
new file mode 100644 new file mode 100644
index 00000000..70d1e6f9 index 00000000..0f37cf2e
--- /dev/null --- /dev/null
+++ b/ci/jenkins/ELevate_el7toel8_Testing.jenkinsfile +++ b/ci/jenkins/ELevate_el7toel8_Testing.jenkinsfile
@@ -0,0 +1,237 @@ @@ -0,0 +1,228 @@
+RETRY = params.RETRY +RETRY = params.RETRY
+TIMEOUT = params.TIMEOUT +TIMEOUT = params.TIMEOUT
+ +
@ -1542,7 +1506,7 @@ index 00000000..70d1e6f9
+ parallelsAlwaysFailFast() + parallelsAlwaysFailFast()
+ } + }
+ parameters { + parameters {
+ choice(name: 'TARGET_DISTRO_FILTER', choices: ['almalinux-8', 'centos-stream-8', 'eurolinux-8', 'oraclelinux-8', 'rocky-8', 'all'], description: 'Select a target distro or all for ELevation') + choice(name: 'TARGET_DISTRO_FILTER', choices: ['almalinux-8', 'centos-stream-8', 'oraclelinux-8', 'rocky-8', 'all'], description: 'Select a target distro or all for ELevation')
+ choice(name: 'CONF_FILTER', choices: ['minimal', 'docker-ce'], description: 'Select a configuration') + choice(name: 'CONF_FILTER', choices: ['minimal', 'docker-ce'], description: 'Select a configuration')
+ string(name: 'RETRY', defaultValue: '3', description: 'Input count of retry', trim: true) + string(name: 'RETRY', defaultValue: '3', description: 'Input count of retry', trim: true)
+ string(name: 'TIMEOUT', defaultValue: '60', description: 'Input timeout value in minutes', trim: true) + string(name: 'TIMEOUT', defaultValue: '60', description: 'Input timeout value in minutes', trim: true)
@ -1604,7 +1568,7 @@ index 00000000..70d1e6f9
+ axes { + axes {
+ axis { + axis {
+ name 'TARGET_DISTRO' + name 'TARGET_DISTRO'
+ values 'almalinux-8', 'centos-stream-8', 'eurolinux-8', 'oraclelinux-8', 'rocky-8' + values 'almalinux-8', 'centos-stream-8', 'oraclelinux-8', 'rocky-8'
+ } + }
+ } + }
+ stages { + stages {
@ -1731,15 +1695,6 @@ index 00000000..70d1e6f9
+ leappData: ldata + leappData: ldata
+ ] + ]
+ break + break
+ case 'eurolinux-8':
+ vm = 'eurolinux_8'
+ ldata = 'leapp-data-eurolinux'
+
+ spec = [
+ vmName: vm,
+ leappData: ldata
+ ]
+ break
+ case 'oraclelinux-8': + case 'oraclelinux-8':
+ vm = 'oraclelinux_8' + vm = 'oraclelinux_8'
+ ldata = 'leapp-data-oraclelinux' + ldata = 'leapp-data-oraclelinux'
@ -1769,10 +1724,10 @@ index 00000000..70d1e6f9
+} +}
diff --git a/ci/jenkins/ELevate_el8toel9_Development.jenkinsfile b/ci/jenkins/ELevate_el8toel9_Development.jenkinsfile diff --git a/ci/jenkins/ELevate_el8toel9_Development.jenkinsfile b/ci/jenkins/ELevate_el8toel9_Development.jenkinsfile
new file mode 100644 new file mode 100644
index 00000000..7362aafe index 00000000..7eb5430b
--- /dev/null --- /dev/null
+++ b/ci/jenkins/ELevate_el8toel9_Development.jenkinsfile +++ b/ci/jenkins/ELevate_el8toel9_Development.jenkinsfile
@@ -0,0 +1,204 @@ @@ -0,0 +1,200 @@
+RETRY = params.RETRY +RETRY = params.RETRY
+TIMEOUT = params.TIMEOUT +TIMEOUT = params.TIMEOUT
+ +
@ -1789,8 +1744,8 @@ index 00000000..7362aafe
+ string(name: 'TIMEOUT', defaultValue: '60', description: 'Input timeout value in minutes', trim: true) + string(name: 'TIMEOUT', defaultValue: '60', description: 'Input timeout value in minutes', trim: true)
+ string(name: 'REPO_URL', defaultValue: 'https://github.com/LKHN/el-test-auto-dev.git', description: 'URL of the pipeline repository', trim: true) + string(name: 'REPO_URL', defaultValue: 'https://github.com/LKHN/el-test-auto-dev.git', description: 'URL of the pipeline repository', trim: true)
+ string(name: 'REPO_BRANCH', defaultValue: 'main', description: 'Branch of the pipeline repository', trim: true) + string(name: 'REPO_BRANCH', defaultValue: 'main', description: 'Branch of the pipeline repository', trim: true)
+ choice(name: 'SOURCE_DISTRO_FILTER', choices: ['almalinux-8', 'centos-stream-8', 'eurolinux-8', 'oraclelinux-8', 'rocky-8', 'all'], description: 'Select a source distro or all for ELevation') + choice(name: 'SOURCE_DISTRO_FILTER', choices: ['almalinux-8', 'centos-stream-8', 'oraclelinux-8', 'rocky-8', 'all'], description: 'Select a source distro or all for ELevation')
+ choice(name: 'TARGET_DISTRO_FILTER', choices: ['almalinux-9', 'centos-stream-9', 'eurolinux-9', 'oraclelinux-9', 'rocky-9', 'all'], description: 'Select a target distro or all to ELevation') + choice(name: 'TARGET_DISTRO_FILTER', choices: ['almalinux-9', 'centos-stream-9', 'oraclelinux-9', 'rocky-9', 'all'], description: 'Select a target distro or all to ELevation')
+ choice(name: 'CONF_FILTER', choices: ['minimal', 'docker-ce'], description: 'Select a configuration') + choice(name: 'CONF_FILTER', choices: ['minimal', 'docker-ce'], description: 'Select a configuration')
+ } + }
+ stages { + stages {
@ -1830,11 +1785,11 @@ index 00000000..7362aafe
+ axes { + axes {
+ axis { + axis {
+ name 'SOURCE_DISTRO' + name 'SOURCE_DISTRO'
+ values 'almalinux-8', 'centos-stream-8', 'eurolinux-8', 'oraclelinux-8', 'rocky-8' + values 'almalinux-8', 'centos-stream-8', 'oraclelinux-8', 'rocky-8'
+ } + }
+ axis { + axis {
+ name 'TARGET_DISTRO' + name 'TARGET_DISTRO'
+ values 'almalinux-9', 'centos-stream-9', 'eurolinux-9', 'oraclelinux-9', 'rocky-9' + values 'almalinux-9', 'centos-stream-9', 'oraclelinux-9', 'rocky-9'
+ } + }
+ } + }
+ stages { + stages {
@ -1959,10 +1914,6 @@ index 00000000..7362aafe
+ leapp_data = TARGET_DISTRO.substring(0, 6) + leapp_data = TARGET_DISTRO.substring(0, 6)
+ break + break
+ +
+ case "eurolinux-9":
+ leapp_data = TARGET_DISTRO.substring(0, 9)
+ break
+
+ case "oraclelinux-9": + case "oraclelinux-9":
+ leapp_data = TARGET_DISTRO.substring(0, 11) + leapp_data = TARGET_DISTRO.substring(0, 11)
+ break + break
@ -1979,10 +1930,10 @@ index 00000000..7362aafe
+} +}
diff --git a/ci/jenkins/ELevate_el8toel9_Internal.jenkinsfile b/ci/jenkins/ELevate_el8toel9_Internal.jenkinsfile diff --git a/ci/jenkins/ELevate_el8toel9_Internal.jenkinsfile b/ci/jenkins/ELevate_el8toel9_Internal.jenkinsfile
new file mode 100644 new file mode 100644
index 00000000..33daa5dd index 00000000..aa6be967
--- /dev/null --- /dev/null
+++ b/ci/jenkins/ELevate_el8toel9_Internal.jenkinsfile +++ b/ci/jenkins/ELevate_el8toel9_Internal.jenkinsfile
@@ -0,0 +1,223 @@ @@ -0,0 +1,214 @@
+RETRY = params.RETRY +RETRY = params.RETRY
+TIMEOUT = params.TIMEOUT +TIMEOUT = params.TIMEOUT
+ +
@ -1995,8 +1946,8 @@ index 00000000..33daa5dd
+ parallelsAlwaysFailFast() + parallelsAlwaysFailFast()
+ } + }
+ parameters { + parameters {
+ // choice(name: 'TARGET_DISTRO_FILTER', choices: ['almalinux-9', 'centos-stream-9', 'eurolinux-9', 'rocky-9', 'all'], description: 'Select a target distro or all for ELevation') + // choice(name: 'TARGET_DISTRO_FILTER', choices: ['almalinux-9', 'centos-stream-9', 'rocky-9', 'all'], description: 'Select a target distro or all for ELevation')
+ choice(name: 'TARGET_DISTRO_FILTER', choices: ['almalinux-9', 'rocky-9', 'eurolinux-9', 'all'], description: 'Select a target distro or all for ELevation') + choice(name: 'TARGET_DISTRO_FILTER', choices: ['almalinux-9', 'rocky-9', 'all'], description: 'Select a target distro or all for ELevation')
+ choice(name: 'CONF_FILTER', choices: ['minimal', 'docker-ce'], description: 'Select a configuration') + choice(name: 'CONF_FILTER', choices: ['minimal', 'docker-ce'], description: 'Select a configuration')
+ string(name: 'RETRY', defaultValue: '3', description: 'Input count of retry', trim: true) + string(name: 'RETRY', defaultValue: '3', description: 'Input count of retry', trim: true)
+ string(name: 'TIMEOUT', defaultValue: '60', description: 'Input timeout value in minutes', trim: true) + string(name: 'TIMEOUT', defaultValue: '60', description: 'Input timeout value in minutes', trim: true)
@ -2058,8 +2009,8 @@ index 00000000..33daa5dd
+ axes { + axes {
+ axis { + axis {
+ name 'TARGET_DISTRO' + name 'TARGET_DISTRO'
+ // values 'almalinux-9', 'centos-stream-9', 'eurolinux-9', 'rocky-9' + // values 'almalinux-9', 'centos-stream-9', 'rocky-9'
+ values 'almalinux-9', 'rocky-9', 'eurolinux-9' + values 'almalinux-9', 'rocky-9'
+ } + }
+ } + }
+ stages { + stages {
@ -2179,15 +2130,6 @@ index 00000000..33daa5dd
+ leappData: ldata + leappData: ldata
+ ] + ]
+ break + break
+ case 'eurolinux-9':
+ vm = 'eurolinux_9'
+ ldata = 'leapp-data-eurolinux'
+
+ spec = [
+ vmName: vm,
+ leappData: ldata
+ ]
+ break
+ case 'rocky-9': + case 'rocky-9':
+ vm = 'rocky_9' + vm = 'rocky_9'
+ ldata = 'leapp-data-rocky' + ldata = 'leapp-data-rocky'
@ -2208,10 +2150,10 @@ index 00000000..33daa5dd
+} +}
diff --git a/ci/jenkins/ELevate_el8toel9_Internal_Dev.jenkinsfile b/ci/jenkins/ELevate_el8toel9_Internal_Dev.jenkinsfile diff --git a/ci/jenkins/ELevate_el8toel9_Internal_Dev.jenkinsfile b/ci/jenkins/ELevate_el8toel9_Internal_Dev.jenkinsfile
new file mode 100644 new file mode 100644
index 00000000..2647cc06 index 00000000..82626697
--- /dev/null --- /dev/null
+++ b/ci/jenkins/ELevate_el8toel9_Internal_Dev.jenkinsfile +++ b/ci/jenkins/ELevate_el8toel9_Internal_Dev.jenkinsfile
@@ -0,0 +1,210 @@ @@ -0,0 +1,206 @@
+RETRY = params.RETRY +RETRY = params.RETRY
+TIMEOUT = params.TIMEOUT +TIMEOUT = params.TIMEOUT
+ +
@ -2228,8 +2170,8 @@ index 00000000..2647cc06
+ string(name: 'TIMEOUT', defaultValue: '60', description: 'Input timeout value in minutes', trim: true) + string(name: 'TIMEOUT', defaultValue: '60', description: 'Input timeout value in minutes', trim: true)
+ string(name: 'REPO_URL', defaultValue: 'https://github.com/LKHN/el-test-auto-dev.git', description: 'URL of the pipeline repository', trim: true) + string(name: 'REPO_URL', defaultValue: 'https://github.com/LKHN/el-test-auto-dev.git', description: 'URL of the pipeline repository', trim: true)
+ string(name: 'REPO_BRANCH', defaultValue: 'main', description: 'Branch of the pipeline repository', trim: true) + string(name: 'REPO_BRANCH', defaultValue: 'main', description: 'Branch of the pipeline repository', trim: true)
+ choice(name: 'SOURCE_DISTRO_FILTER', choices: ['almalinux-8', 'centos-stream-8', 'eurolinux-8', 'oraclelinux-8', 'rocky-8', 'all'], description: 'Select a source distro or all for ELevation') + choice(name: 'SOURCE_DISTRO_FILTER', choices: ['almalinux-8', 'centos-stream-8', 'oraclelinux-8', 'rocky-8', 'all'], description: 'Select a source distro or all for ELevation')
+ choice(name: 'TARGET_DISTRO_FILTER', choices: ['almalinux-9', 'centos-stream-9', 'eurolinux-9', 'oraclelinux-9', 'rocky-9', 'all'], description: 'Select a target distro or all to ELevation') + choice(name: 'TARGET_DISTRO_FILTER', choices: ['almalinux-9', 'centos-stream-9', 'oraclelinux-9', 'rocky-9', 'all'], description: 'Select a target distro or all to ELevation')
+ choice(name: 'CONF_FILTER', choices: ['minimal', 'docker-ce'], description: 'Select a configuration') + choice(name: 'CONF_FILTER', choices: ['minimal', 'docker-ce'], description: 'Select a configuration')
+ } + }
+ stages { + stages {
@ -2269,11 +2211,11 @@ index 00000000..2647cc06
+ axes { + axes {
+ axis { + axis {
+ name 'SOURCE_DISTRO' + name 'SOURCE_DISTRO'
+ values 'almalinux-8', 'centos-stream-8', 'eurolinux-8', 'oraclelinux-8', 'rocky-8' + values 'almalinux-8', 'centos-stream-8', 'oraclelinux-8', 'rocky-8'
+ } + }
+ axis { + axis {
+ name 'TARGET_DISTRO' + name 'TARGET_DISTRO'
+ values 'almalinux-9', 'centos-stream-9', 'eurolinux-9', 'oraclelinux-9', 'rocky-9' + values 'almalinux-9', 'centos-stream-9', 'oraclelinux-9', 'rocky-9'
+ } + }
+ } + }
+ stages { + stages {
@ -2404,10 +2346,6 @@ index 00000000..2647cc06
+ leapp_data = TARGET_DISTRO.substring(0, 6) + leapp_data = TARGET_DISTRO.substring(0, 6)
+ break + break
+ +
+ case "eurolinux-9":
+ leapp_data = TARGET_DISTRO.substring(0, 9)
+ break
+
+ case "oraclelinux-9": + case "oraclelinux-9":
+ leapp_data = TARGET_DISTRO.substring(0, 11) + leapp_data = TARGET_DISTRO.substring(0, 11)
+ break + break
@ -2424,10 +2362,10 @@ index 00000000..2647cc06
+} +}
diff --git a/ci/jenkins/ELevate_el8toel9_Stable.jenkinsfile b/ci/jenkins/ELevate_el8toel9_Stable.jenkinsfile diff --git a/ci/jenkins/ELevate_el8toel9_Stable.jenkinsfile b/ci/jenkins/ELevate_el8toel9_Stable.jenkinsfile
new file mode 100644 new file mode 100644
index 00000000..d3251fc1 index 00000000..68f00165
--- /dev/null --- /dev/null
+++ b/ci/jenkins/ELevate_el8toel9_Stable.jenkinsfile +++ b/ci/jenkins/ELevate_el8toel9_Stable.jenkinsfile
@@ -0,0 +1,221 @@ @@ -0,0 +1,212 @@
+RETRY = params.RETRY +RETRY = params.RETRY
+TIMEOUT = params.TIMEOUT +TIMEOUT = params.TIMEOUT
+ +
@ -2440,7 +2378,7 @@ index 00000000..d3251fc1
+ parallelsAlwaysFailFast() + parallelsAlwaysFailFast()
+ } + }
+ parameters { + parameters {
+ // choice(name: 'TARGET_DISTRO_FILTER', choices: ['almalinux-9', 'centos-stream-9', 'eurolinux-9', 'rocky-9', 'all'], description: 'Select a target distro or all for ELevation') + // choice(name: 'TARGET_DISTRO_FILTER', choices: ['almalinux-9', 'centos-stream-9', 'rocky-9', 'all'], description: 'Select a target distro or all for ELevation')
+ choice(name: 'TARGET_DISTRO_FILTER', choices: ['almalinux-9', 'rocky-9', 'all'], description: 'Select a target distro or all for ELevation') + choice(name: 'TARGET_DISTRO_FILTER', choices: ['almalinux-9', 'rocky-9', 'all'], description: 'Select a target distro or all for ELevation')
+ choice(name: 'CONF_FILTER', choices: ['minimal', 'docker-ce'], description: 'Select a configuration') + choice(name: 'CONF_FILTER', choices: ['minimal', 'docker-ce'], description: 'Select a configuration')
+ string(name: 'RETRY', defaultValue: '3', description: 'Input count of retry', trim: true) + string(name: 'RETRY', defaultValue: '3', description: 'Input count of retry', trim: true)
@ -2503,7 +2441,7 @@ index 00000000..d3251fc1
+ axes { + axes {
+ axis { + axis {
+ name 'TARGET_DISTRO' + name 'TARGET_DISTRO'
+ // values 'almalinux-9', 'centos-stream-9', 'eurolinux-9', 'rocky-9' + // values 'almalinux-9', 'centos-stream-9', 'rocky-9'
+ values 'almalinux-9', 'rocky-9' + values 'almalinux-9', 'rocky-9'
+ } + }
+ } + }
@ -2622,15 +2560,6 @@ index 00000000..d3251fc1
+ leappData: ldata + leappData: ldata
+ ] + ]
+ break + break
+ case 'eurolinux-9':
+ vm = 'eurolinux_9'
+ ldata = 'leapp-data-eurolinux'
+
+ spec = [
+ vmName: vm,
+ leappData: ldata
+ ]
+ break
+ case 'rocky-9': + case 'rocky-9':
+ vm = 'rocky_9' + vm = 'rocky_9'
+ ldata = 'leapp-data-rocky' + ldata = 'leapp-data-rocky'
@ -2651,10 +2580,10 @@ index 00000000..d3251fc1
+} +}
diff --git a/ci/jenkins/ELevate_el8toel9_Testing.jenkinsfile b/ci/jenkins/ELevate_el8toel9_Testing.jenkinsfile diff --git a/ci/jenkins/ELevate_el8toel9_Testing.jenkinsfile b/ci/jenkins/ELevate_el8toel9_Testing.jenkinsfile
new file mode 100644 new file mode 100644
index 00000000..af1b9205 index 00000000..79cdd472
--- /dev/null --- /dev/null
+++ b/ci/jenkins/ELevate_el8toel9_Testing.jenkinsfile +++ b/ci/jenkins/ELevate_el8toel9_Testing.jenkinsfile
@@ -0,0 +1,191 @@ @@ -0,0 +1,187 @@
+RETRY = params.RETRY +RETRY = params.RETRY
+TIMEOUT = params.TIMEOUT +TIMEOUT = params.TIMEOUT
+ +
@ -2671,8 +2600,8 @@ index 00000000..af1b9205
+ string(name: 'TIMEOUT', defaultValue: '60', description: 'Input timeout value in minutes', trim: true) + string(name: 'TIMEOUT', defaultValue: '60', description: 'Input timeout value in minutes', trim: true)
+ string(name: 'REPO_URL', defaultValue: 'https://github.com/LKHN/el-test-auto-dev.git', description: 'URL of the pipeline repository', trim: true) + string(name: 'REPO_URL', defaultValue: 'https://github.com/LKHN/el-test-auto-dev.git', description: 'URL of the pipeline repository', trim: true)
+ string(name: 'REPO_BRANCH', defaultValue: 'main', description: 'Branch of the pipeline repository', trim: true) + string(name: 'REPO_BRANCH', defaultValue: 'main', description: 'Branch of the pipeline repository', trim: true)
+ choice(name: 'SOURCE_DISTRO_FILTER', choices: ['almalinux-8', 'centos-stream-8', 'eurolinux-8', 'oraclelinux-8', 'rocky-8', 'all'], description: 'Select a source distro or all for ELevation') + choice(name: 'SOURCE_DISTRO_FILTER', choices: ['almalinux-8', 'centos-stream-8', 'oraclelinux-8', 'rocky-8', 'all'], description: 'Select a source distro or all for ELevation')
+ choice(name: 'TARGET_DISTRO_FILTER', choices: ['almalinux-9', 'centos-stream-9', 'eurolinux-9', 'oraclelinux-9', 'rocky-9', 'all'], description: 'Select a target distro or all to ELevation') + choice(name: 'TARGET_DISTRO_FILTER', choices: ['almalinux-9', 'centos-stream-9', 'oraclelinux-9', 'rocky-9', 'all'], description: 'Select a target distro or all to ELevation')
+ choice(name: 'CONF_FILTER', choices: ['minimal', 'docker-ce'], description: 'Select a configuration') + choice(name: 'CONF_FILTER', choices: ['minimal', 'docker-ce'], description: 'Select a configuration')
+ } + }
+ stages { + stages {
@ -2710,11 +2639,11 @@ index 00000000..af1b9205
+ axes { + axes {
+ axis { + axis {
+ name 'SOURCE_DISTRO' + name 'SOURCE_DISTRO'
+ values 'almalinux-8', 'centos-stream-8', 'eurolinux-8', 'oraclelinux-8', 'rocky-8' + values 'almalinux-8', 'centos-stream-8', 'oraclelinux-8', 'rocky-8'
+ } + }
+ axis { + axis {
+ name 'TARGET_DISTRO' + name 'TARGET_DISTRO'
+ values 'almalinux-9', 'centos-stream-9', 'eurolinux-9', 'oraclelinux-9', 'rocky-9' + values 'almalinux-9', 'centos-stream-9', 'oraclelinux-9', 'rocky-9'
+ } + }
+ } + }
+ stages { + stages {
@ -2828,10 +2757,6 @@ index 00000000..af1b9205
+ leapp_data = TARGET_DISTRO.substring(0, 6) + leapp_data = TARGET_DISTRO.substring(0, 6)
+ break + break
+ +
+ case "eurolinux-9":
+ leapp_data = TARGET_DISTRO.substring(0, 9)
+ break
+
+ case "oraclelinux-9": + case "oraclelinux-9":
+ leapp_data = TARGET_DISTRO.substring(0, 11) + leapp_data = TARGET_DISTRO.substring(0, 11)
+ break + break
@ -3192,64 +3117,6 @@ index 00000000..28e47202
+ +
+ def test_redhat_release(self, get_redhat_release): + def test_redhat_release(self, get_redhat_release):
+ assert get_redhat_release.contains("CentOS Stream release 9") + assert get_redhat_release.contains("CentOS Stream release 9")
diff --git a/ci/tests/tests/distro/test_osinfo_eurolinux_8.py b/ci/tests/tests/distro/test_osinfo_eurolinux_8.py
new file mode 100644
index 00000000..d1bfde55
--- /dev/null
+++ b/ci/tests/tests/distro/test_osinfo_eurolinux_8.py
@@ -0,0 +1,23 @@
+import pytest
+
+
+@pytest.mark.usefixtures("get_os_release")
+class TestOSRelease:
+ """Test values of NAME, ID and VERSION_ID"""
+
+ def test_os_rel_name(self, get_os_release):
+ assert get_os_release.contains('NAME="EuroLinux"')
+
+ def test_os_rel_id(self, get_os_release):
+ assert get_os_release.contains('ID="eurolinux"')
+
+ def test_os_rel_version_id(self, get_os_release):
+ assert get_os_release.contains('VERSION_ID="8.*"')
+
+
+@pytest.mark.usefixtures("get_redhat_release")
+class TestRHRelease:
+ """Test contents of the /etc/redhat-release"""
+
+ def test_redhat_release(self, get_redhat_release):
+ assert get_redhat_release.contains("EuroLinux release 8.*")
diff --git a/ci/tests/tests/distro/test_osinfo_eurolinux_9.py b/ci/tests/tests/distro/test_osinfo_eurolinux_9.py
new file mode 100644
index 00000000..7d749b32
--- /dev/null
+++ b/ci/tests/tests/distro/test_osinfo_eurolinux_9.py
@@ -0,0 +1,23 @@
+import pytest
+
+
+@pytest.mark.usefixtures("get_os_release")
+class TestOSRelease:
+ """Test values of NAME, ID and VERSION_ID"""
+
+ def test_os_rel_name(self, get_os_release):
+ assert get_os_release.contains('NAME="EuroLinux"')
+
+ def test_os_rel_id(self, get_os_release):
+ assert get_os_release.contains('ID="eurolinux"')
+
+ def test_os_rel_version_id(self, get_os_release):
+ assert get_os_release.contains('VERSION_ID="9.*"')
+
+
+@pytest.mark.usefixtures("get_redhat_release")
+class TestRHRelease:
+ """Test contents of the /etc/redhat-release"""
+
+ def test_redhat_release(self, get_redhat_release):
+ assert get_redhat_release.contains("EuroLinux release 9.*")
diff --git a/ci/tests/tests/distro/test_osinfo_oraclelinux_8.py b/ci/tests/tests/distro/test_osinfo_oraclelinux_8.py diff --git a/ci/tests/tests/distro/test_osinfo_oraclelinux_8.py b/ci/tests/tests/distro/test_osinfo_oraclelinux_8.py
new file mode 100644 new file mode 100644
index 00000000..2080fd2f index 00000000..2080fd2f
@ -3400,7 +3267,7 @@ index 00000000..3c2550c7
+ assert cmd.succeeded + assert cmd.succeeded
diff --git a/ci/vagrant/el7toel8_multi.rb b/ci/vagrant/el7toel8_multi.rb diff --git a/ci/vagrant/el7toel8_multi.rb b/ci/vagrant/el7toel8_multi.rb
new file mode 100644 new file mode 100644
index 00000000..74116f78 index 00000000..a18da81d
--- /dev/null --- /dev/null
+++ b/ci/vagrant/el7toel8_multi.rb +++ b/ci/vagrant/el7toel8_multi.rb
@@ -0,0 +1,40 @@ @@ -0,0 +1,40 @@
@ -3427,7 +3294,7 @@ index 00000000..74116f78
+ v.random_hostname = true + v.random_hostname = true
+ end + end
+ +
+ target_distros = ['almalinux', 'centosstream', 'eurolinux', 'oraclelinux', 'rocky'] + target_distros = ['almalinux', 'centosstream', 'oraclelinux', 'rocky']
+ +
+ target_distros.each do |target_distro| + target_distros.each do |target_distro|
+ config.vm.define "#{target_distro}_8" do |machine| + config.vm.define "#{target_distro}_8" do |machine|
@ -3446,10 +3313,10 @@ index 00000000..74116f78
+end +end
diff --git a/ci/vagrant/el7toel8toel9_single.rb b/ci/vagrant/el7toel8toel9_single.rb diff --git a/ci/vagrant/el7toel8toel9_single.rb b/ci/vagrant/el7toel8toel9_single.rb
new file mode 100644 new file mode 100644
index 00000000..0a34edbd index 00000000..8cd05ac3
--- /dev/null --- /dev/null
+++ b/ci/vagrant/el7toel8toel9_single.rb +++ b/ci/vagrant/el7toel8toel9_single.rb
@@ -0,0 +1,54 @@ @@ -0,0 +1,53 @@
+# -*- mode: ruby -*- +# -*- mode: ruby -*-
+# vi: set ft=ruby : +# vi: set ft=ruby :
+ +
@ -3474,7 +3341,7 @@ index 00000000..0a34edbd
+ end + end
+ +
+ # EL7toEL8 + # EL7toEL8
+ target_distros = ['almalinux', 'centosstream', 'eurolinux', 'oraclelinux', 'rocky'] + target_distros = ['almalinux', 'centosstream', 'oraclelinux', 'rocky']
+ +
+ target_distros.each do |target_distro| + target_distros.each do |target_distro|
+ config.vm.define "#{target_distro}_8" do |machine| + config.vm.define "#{target_distro}_8" do |machine|
@ -3487,7 +3354,6 @@ index 00000000..0a34edbd
+ target_distros_el9 = { + target_distros_el9 = {
+ almalinux: 'almalinux/8', + almalinux: 'almalinux/8',
+ # centosstream: 'generic/centos8s', + # centosstream: 'generic/centos8s',
+ eurolinux: 'eurolinux-vagrant/eurolinux-8',
+ rocky: 'generic/rocky8' + rocky: 'generic/rocky8'
+ } + }
+ +
@ -3506,10 +3372,10 @@ index 00000000..0a34edbd
+end +end
diff --git a/ci/vagrant/el8toel9_multi.rb b/ci/vagrant/el8toel9_multi.rb diff --git a/ci/vagrant/el8toel9_multi.rb b/ci/vagrant/el8toel9_multi.rb
new file mode 100644 new file mode 100644
index 00000000..0e2ba8ab index 00000000..370758e6
--- /dev/null --- /dev/null
+++ b/ci/vagrant/el8toel9_multi.rb +++ b/ci/vagrant/el8toel9_multi.rb
@@ -0,0 +1,46 @@ @@ -0,0 +1,45 @@
+# -*- mode: ruby -*- +# -*- mode: ruby -*-
+# vi: set ft=ruby : +# vi: set ft=ruby :
+ +
@ -3536,7 +3402,6 @@ index 00000000..0e2ba8ab
+ target_distros = { + target_distros = {
+ almalinux: 'almalinux/8', + almalinux: 'almalinux/8',
+ # centosstream: 'generic/centos8s', + # centosstream: 'generic/centos8s',
+ eurolinux: 'eurolinux-vagrant/eurolinux-8',
+ rocky: 'generic/rocky8' + rocky: 'generic/rocky8'
+ } + }
+ +
@ -3714,10 +3579,10 @@ index 56016513..7ae1dd5a 100644
tags = (IPUWorkflowTag, FactsPhaseTag) tags = (IPUWorkflowTag, FactsPhaseTag)
diff --git a/repos/system_upgrade/common/actors/efibootorderfix/finalization/actor.py b/repos/system_upgrade/common/actors/efibootorderfix/finalization/actor.py diff --git a/repos/system_upgrade/common/actors/efibootorderfix/finalization/actor.py b/repos/system_upgrade/common/actors/efibootorderfix/finalization/actor.py
index f42909f0..4ddde9f7 100644 index f42909f0..6383a56f 100644
--- a/repos/system_upgrade/common/actors/efibootorderfix/finalization/actor.py --- a/repos/system_upgrade/common/actors/efibootorderfix/finalization/actor.py
+++ b/repos/system_upgrade/common/actors/efibootorderfix/finalization/actor.py +++ b/repos/system_upgrade/common/actors/efibootorderfix/finalization/actor.py
@@ -1,17 +1,118 @@ @@ -1,17 +1,117 @@
+import os +import os
+import re +import re
+ +
@ -3757,7 +3622,6 @@ index f42909f0..4ddde9f7 100644
+ 'Red Hat Enterprise Linux': 'redhat', + 'Red Hat Enterprise Linux': 'redhat',
+ 'Rocky Linux': 'rocky', + 'Rocky Linux': 'rocky',
+ 'Scientific Linux': 'redhat', + 'Scientific Linux': 'redhat',
+ 'EuroLinux': 'eurolinux',
+ } + }
+ +
+ efi_shimname_dict = { + efi_shimname_dict = {
@ -5057,36 +4921,6 @@ index 00000000..acad9006
+ "10": [] + "10": []
+ } + }
+} +}
diff --git a/repos/system_upgrade/common/files/distro/eurolinux/gpg-signatures.json b/repos/system_upgrade/common/files/distro/eurolinux/gpg-signatures.json
new file mode 100644
index 00000000..958edead
--- /dev/null
+++ b/repos/system_upgrade/common/files/distro/eurolinux/gpg-signatures.json
@@ -0,0 +1,24 @@
+{
+ "keys": [
+ "75c333f418cd4a9e",
+ "b413acad6275f250",
+ "f7ad3e5a1c9fd080",
+ "429785e181b961a5",
+ "d07bf2a08d50eb66"
+ ],
+ "obsoleted-keys": {
+ "7": [],
+ "8": [
+ "gpg-pubkey-2fa658e0-45700c69",
+ "gpg-pubkey-37017186-45761324",
+ "gpg-pubkey-db42a60e-37ea5438"
+ ],
+ "9": [
+ "gpg-pubkey-d4082792-5b32db75",
+ "gpg-pubkey-3abb34f8-5ffd890e",
+ "gpg-pubkey-6275f250-5e26cb2e",
+ "gpg-pubkey-73e3b907-6581b071"
+ ],
+ "10": []
+ }
+}
diff --git a/repos/system_upgrade/common/files/distro/ol/gpg-signatures.json b/repos/system_upgrade/common/files/distro/ol/gpg-signatures.json diff --git a/repos/system_upgrade/common/files/distro/ol/gpg-signatures.json b/repos/system_upgrade/common/files/distro/ol/gpg-signatures.json
new file mode 100644 new file mode 100644
index 00000000..a53775cf index 00000000..a53775cf
@ -5245,7 +5079,7 @@ index cc9dcdb5..5ce5a666 100644
}, },
"saphana": { "saphana": {
diff --git a/repos/system_upgrade/common/libraries/config/version.py b/repos/system_upgrade/common/libraries/config/version.py diff --git a/repos/system_upgrade/common/libraries/config/version.py b/repos/system_upgrade/common/libraries/config/version.py
index d710a647..1cdfa0e4 100644 index d710a647..0d075535 100644
--- a/repos/system_upgrade/common/libraries/config/version.py --- a/repos/system_upgrade/common/libraries/config/version.py
+++ b/repos/system_upgrade/common/libraries/config/version.py +++ b/repos/system_upgrade/common/libraries/config/version.py
@@ -17,9 +17,9 @@ OP_MAP = { @@ -17,9 +17,9 @@ OP_MAP = {
@ -5255,9 +5089,9 @@ index d710a647..1cdfa0e4 100644
- '7': {'rhel': ['7.9'], 'rhel-alt': [], 'rhel-saphana': ['7.9']}, - '7': {'rhel': ['7.9'], 'rhel-alt': [], 'rhel-saphana': ['7.9']},
- '8': {'rhel': ['8.10'], 'rhel-saphana': ['8.10']}, - '8': {'rhel': ['8.10'], 'rhel-saphana': ['8.10']},
- '9': {'rhel': ['9.4', '9.5', '9.6'], 'rhel-saphana': ['9.4', '9.6']}, - '9': {'rhel': ['9.4', '9.5', '9.6'], 'rhel-saphana': ['9.4', '9.6']},
+ '7': {'rhel': ['7.9'], 'rhel-alt': [], 'rhel-saphana': ['7.9'], 'centos': ['7.9'], 'eurolinux': ['7.9'], 'ol': ['7.9'], 'scientific': ['7.9']}, + '7': {'rhel': ['7.9'], 'rhel-alt': [], 'rhel-saphana': ['7.9'], 'centos': ['7.9'], 'ol': ['7.9'], 'scientific': ['7.9']},
+ '8': {'rhel': ['8.8', '8.10'], 'rhel-saphana': ['8.8', '8.10'], 'centos': ['8.5', '8.999'], 'almalinux': ['8.6', '8.7', '8.8', '8.9', '8.10'], 'eurolinux': ['8.6', '8.7', '8.8', '8.9', '8.10'], 'ol': ['8.6', '8.7', '8.8', '8.9', '8.10'], 'rocky': ['8.6', '8.7', '8.8', '8.9', '8.10']}, + '8': {'rhel': ['8.8', '8.10'], 'rhel-saphana': ['8.8', '8.10'], 'centos': ['8.5', '8.999'], 'almalinux': ['8.6', '8.7', '8.8', '8.9', '8.10'], 'ol': ['8.6', '8.7', '8.8', '8.9', '8.10'], 'rocky': ['8.6', '8.7', '8.8', '8.9', '8.10']},
+ '9': {'rhel': ['9.4', '9.5', '9.6'], 'rhel-saphana': ['9.4', '9.6'], 'centos': ['9.999'], 'almalinux': ['9.4', '9.5', '9.6'], 'eurolinux': ['9.4', '9.5', '9.6'], 'ol': ['9.4', '9.5', '9.6'], 'rocky': ['9.4', '9.5', '9.6']}, + '9': {'rhel': ['9.4', '9.5', '9.6'], 'rhel-saphana': ['9.4', '9.6'], 'centos': ['9.999'], 'almalinux': ['9.4', '9.5', '9.6'], 'rocky': ['9.4', '9.5', '9.6']},
} }
@ -5627,10 +5461,10 @@ index 00000000..014b7afb
+class VendorTopic(Topic): +class VendorTopic(Topic):
+ name = 'vendor_topic' + name = 'vendor_topic'
diff --git a/repos/system_upgrade/el8toel9/actors/addarmbootloaderworkaround/libraries/addupgradebootloader.py b/repos/system_upgrade/el8toel9/actors/addarmbootloaderworkaround/libraries/addupgradebootloader.py diff --git a/repos/system_upgrade/el8toel9/actors/addarmbootloaderworkaround/libraries/addupgradebootloader.py b/repos/system_upgrade/el8toel9/actors/addarmbootloaderworkaround/libraries/addupgradebootloader.py
index 5e9bf5c6..eb5636c9 100644 index 5e9bf5c6..8a4a34b6 100644
--- a/repos/system_upgrade/el8toel9/actors/addarmbootloaderworkaround/libraries/addupgradebootloader.py --- a/repos/system_upgrade/el8toel9/actors/addarmbootloaderworkaround/libraries/addupgradebootloader.py
+++ b/repos/system_upgrade/el8toel9/actors/addarmbootloaderworkaround/libraries/addupgradebootloader.py +++ b/repos/system_upgrade/el8toel9/actors/addarmbootloaderworkaround/libraries/addupgradebootloader.py
@@ -15,6 +15,23 @@ from leapp.libraries.common.grub import ( @@ -15,6 +15,22 @@ from leapp.libraries.common.grub import (
from leapp.libraries.stdlib import api, CalledProcessError, run from leapp.libraries.stdlib import api, CalledProcessError, run
from leapp.models import ArmWorkaroundEFIBootloaderInfo, EFIBootEntry, TargetUserSpaceInfo from leapp.models import ArmWorkaroundEFIBootloaderInfo, EFIBootEntry, TargetUserSpaceInfo
@ -5642,7 +5476,6 @@ index 5e9bf5c6..eb5636c9 100644
+ 'Red Hat Enterprise Linux': 'redhat', + 'Red Hat Enterprise Linux': 'redhat',
+ 'Rocky Linux': 'rocky', + 'Rocky Linux': 'rocky',
+ 'Scientific Linux': 'redhat', + 'Scientific Linux': 'redhat',
+ 'EuroLinux': 'eurolinux',
+} +}
+ +
+with open('/etc/system-release', 'r') as sr: +with open('/etc/system-release', 'r') as sr:
@ -5654,7 +5487,7 @@ index 5e9bf5c6..eb5636c9 100644
UPGRADE_EFI_ENTRY_LABEL = 'Leapp Upgrade' UPGRADE_EFI_ENTRY_LABEL = 'Leapp Upgrade'
ARM_SHIM_PACKAGE_NAME = 'shim-aa64' ARM_SHIM_PACKAGE_NAME = 'shim-aa64'
@@ -22,7 +39,7 @@ ARM_GRUB_PACKAGE_NAME = 'grub2-efi-aa64' @@ -22,7 +38,7 @@ ARM_GRUB_PACKAGE_NAME = 'grub2-efi-aa64'
EFI_MOUNTPOINT = '/boot/efi/' EFI_MOUNTPOINT = '/boot/efi/'
LEAPP_EFIDIR_CANONICAL_PATH = os.path.join(EFI_MOUNTPOINT, 'EFI/leapp/') LEAPP_EFIDIR_CANONICAL_PATH = os.path.join(EFI_MOUNTPOINT, 'EFI/leapp/')
@ -5664,10 +5497,10 @@ index 5e9bf5c6..eb5636c9 100644
CONTAINER_DOWNLOAD_DIR = '/tmp_pkg_download_dir' CONTAINER_DOWNLOAD_DIR = '/tmp_pkg_download_dir'
diff --git a/repos/system_upgrade/el8toel9/actors/removeupgradeefientry/libraries/removeupgradeefientry.py b/repos/system_upgrade/el8toel9/actors/removeupgradeefientry/libraries/removeupgradeefientry.py diff --git a/repos/system_upgrade/el8toel9/actors/removeupgradeefientry/libraries/removeupgradeefientry.py b/repos/system_upgrade/el8toel9/actors/removeupgradeefientry/libraries/removeupgradeefientry.py
index 3ff3ead9..ee63916a 100644 index 3ff3ead9..a64a0a9f 100644
--- a/repos/system_upgrade/el8toel9/actors/removeupgradeefientry/libraries/removeupgradeefientry.py --- a/repos/system_upgrade/el8toel9/actors/removeupgradeefientry/libraries/removeupgradeefientry.py
+++ b/repos/system_upgrade/el8toel9/actors/removeupgradeefientry/libraries/removeupgradeefientry.py +++ b/repos/system_upgrade/el8toel9/actors/removeupgradeefientry/libraries/removeupgradeefientry.py
@@ -6,9 +6,26 @@ from leapp.libraries.common.grub import GRUB2_BIOS_ENTRYPOINT, GRUB2_BIOS_ENV_FI @@ -6,9 +6,25 @@ from leapp.libraries.common.grub import GRUB2_BIOS_ENTRYPOINT, GRUB2_BIOS_ENV_FI
from leapp.libraries.stdlib import api, CalledProcessError, run from leapp.libraries.stdlib import api, CalledProcessError, run
from leapp.models import ArmWorkaroundEFIBootloaderInfo from leapp.models import ArmWorkaroundEFIBootloaderInfo
@ -5679,7 +5512,6 @@ index 3ff3ead9..ee63916a 100644
+ 'Red Hat Enterprise Linux': 'redhat', + 'Red Hat Enterprise Linux': 'redhat',
+ 'Rocky Linux': 'rocky', + 'Rocky Linux': 'rocky',
+ 'Scientific Linux': 'redhat', + 'Scientific Linux': 'redhat',
+ 'EuroLinux': 'eurolinux',
+} +}
+ +
+with open('/etc/system-release', 'r') as sr: +with open('/etc/system-release', 'r') as sr:

6
SPECS/leapp-repository.spec
View File

@ -53,7 +53,7 @@ py2_byte_compile "%1" "%2"}
Epoch: 1 Epoch: 1
Name: leapp-repository Name: leapp-repository
Version: 0.21.0 Version: 0.21.0
Release: 4%{?dist}.elevate.3 Release: 4%{?dist}.elevate.4
Summary: Repositories for leapp Summary: Repositories for leapp
License: ASL 2.0 License: ASL 2.0
@ -402,6 +402,10 @@ done;
# no files here # no files here
%changelog %changelog
* Wed Dec 11 2024 Yuriy Kohut <ykohut@almalinux.org> - 0.21.0-4.elevate.4
- Update ELevate patch:
- drop EuroLinux support
* Fri Dec 06 2024 Yuriy Kohut <ykohut@almalinux.org> - 0.21.0-4.elevate.3 * Fri Dec 06 2024 Yuriy Kohut <ykohut@almalinux.org> - 0.21.0-4.elevate.3
- Update ELevate patch: - Update ELevate patch:
- remove_upgrade_efi_entry: revert reload EFI info, boot order has changed as Leapp upgrade efi entry was removed - remove_upgrade_efi_entry: revert reload EFI info, boot order has changed as Leapp upgrade efi entry was removed