Skip to content

Commit

Permalink
Drop EuroLinux support
Browse files Browse the repository at this point in the history
  • Loading branch information
yuravk committed Dec 11, 2024
1 parent 8a70561 commit 5790a53
Show file tree
Hide file tree
Showing 20 changed files with 33 additions and 183 deletions.
13 changes: 2 additions & 11 deletions ci/jenkins/ELevate_el7toel8_Development.jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ pipeline {
parallelsAlwaysFailFast()
}
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')
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)
Expand Down Expand Up @@ -76,7 +76,7 @@ pipeline {
axes {
axis {
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 {
Expand Down Expand Up @@ -215,15 +215,6 @@ def targetDistroSpec(distro) {
vm = 'centosstream_8'
ldata = 'centos'

spec = [
vmName: vm,
leappData: ldata
]
break
case 'eurolinux-8':
vm = 'eurolinux_8'
ldata = 'eurolinux'

spec = [
vmName: vm,
leappData: ldata
Expand Down
13 changes: 2 additions & 11 deletions ci/jenkins/ELevate_el7toel8_Internal.jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ pipeline {
parallelsAlwaysFailFast()
}
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')
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)
Expand Down Expand Up @@ -72,7 +72,7 @@ pipeline {
axes {
axis {
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 {
Expand Down Expand Up @@ -196,15 +196,6 @@ def targetDistroSpec(distro) {
vm = 'centosstream_8'
ldata = 'leapp-data-centos'

spec = [
vmName: vm,
leappData: ldata
]
break
case 'eurolinux-8':
vm = 'eurolinux_8'
ldata = 'leapp-data-eurolinux'

spec = [
vmName: vm,
leappData: ldata
Expand Down
13 changes: 2 additions & 11 deletions ci/jenkins/ELevate_el7toel8_Internal_Dev.jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ pipeline {
parallelsAlwaysFailFast()
}
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')
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)
Expand Down Expand Up @@ -76,7 +76,7 @@ pipeline {
axes {
axis {
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 {
Expand Down Expand Up @@ -219,15 +219,6 @@ def targetDistroSpec(distro) {
vm = 'centosstream_8'
ldata = 'centos'

spec = [
vmName: vm,
leappData: ldata
]
break
case 'eurolinux-8':
vm = 'eurolinux_8'
ldata = 'eurolinux'

spec = [
vmName: vm,
leappData: ldata
Expand Down
13 changes: 2 additions & 11 deletions ci/jenkins/ELevate_el7toel8_Stable.jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ pipeline {
parallelsAlwaysFailFast()
}
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')
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)
Expand Down Expand Up @@ -72,7 +72,7 @@ pipeline {
axes {
axis {
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 {
Expand Down Expand Up @@ -194,15 +194,6 @@ def targetDistroSpec(distro) {
vm = 'centosstream_8'
ldata = 'leapp-data-centos'

spec = [
vmName: vm,
leappData: ldata
]
break
case 'eurolinux-8':
vm = 'eurolinux_8'
ldata = 'leapp-data-eurolinux'

spec = [
vmName: vm,
leappData: ldata
Expand Down
13 changes: 2 additions & 11 deletions ci/jenkins/ELevate_el7toel8_Testing.jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ pipeline {
parallelsAlwaysFailFast()
}
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')
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)
Expand Down Expand Up @@ -72,7 +72,7 @@ pipeline {
axes {
axis {
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 {
Expand Down Expand Up @@ -194,15 +194,6 @@ def targetDistroSpec(distro) {
vm = 'centosstream_8'
ldata = 'leapp-data-centos'

spec = [
vmName: vm,
leappData: ldata
]
break
case 'eurolinux-8':
vm = 'eurolinux_8'
ldata = 'leapp-data-eurolinux'

spec = [
vmName: vm,
leappData: ldata
Expand Down
12 changes: 4 additions & 8 deletions ci/jenkins/ELevate_el8toel9_Development.jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ pipeline {
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_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: '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: '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', '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')
}
stages {
Expand Down Expand Up @@ -55,11 +55,11 @@ pipeline {
axes {
axis {
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 {
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 {
Expand Down Expand Up @@ -184,10 +184,6 @@ def getLeappDataDistro(TARGET_DISTRO) {
leapp_data = TARGET_DISTRO.substring(0, 6)
break

case "eurolinux-9":
leapp_data = TARGET_DISTRO.substring(0, 9)
break

case "oraclelinux-9":
leapp_data = TARGET_DISTRO.substring(0, 11)
break
Expand Down
17 changes: 4 additions & 13 deletions ci/jenkins/ELevate_el8toel9_Internal.jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ pipeline {
parallelsAlwaysFailFast()
}
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', 'rocky-9', 'eurolinux-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: 'CONF_FILTER', choices: ['minimal', 'docker-ce'], description: 'Select a configuration')
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)
Expand Down Expand Up @@ -73,8 +73,8 @@ pipeline {
axes {
axis {
name 'TARGET_DISTRO'
// values 'almalinux-9', 'centos-stream-9', 'eurolinux-9', 'rocky-9'
values 'almalinux-9', 'rocky-9', 'eurolinux-9'
// values 'almalinux-9', 'centos-stream-9', 'rocky-9'
values 'almalinux-9', 'rocky-9'
}
}
stages {
Expand Down Expand Up @@ -189,15 +189,6 @@ def targetDistroSpec(distro) {
vm = 'almalinux_9'
ldata = 'leapp-data-almalinux'

spec = [
vmName: vm,
leappData: ldata
]
break
case 'eurolinux-9':
vm = 'eurolinux_9'
ldata = 'leapp-data-eurolinux'

spec = [
vmName: vm,
leappData: ldata
Expand Down
12 changes: 4 additions & 8 deletions ci/jenkins/ELevate_el8toel9_Internal_Dev.jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ pipeline {
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_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: '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: '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', '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')
}
stages {
Expand Down Expand Up @@ -55,11 +55,11 @@ pipeline {
axes {
axis {
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 {
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 {
Expand Down Expand Up @@ -190,10 +190,6 @@ def getLeappDataDistro(TARGET_DISTRO) {
leapp_data = TARGET_DISTRO.substring(0, 6)
break

case "eurolinux-9":
leapp_data = TARGET_DISTRO.substring(0, 9)
break

case "oraclelinux-9":
leapp_data = TARGET_DISTRO.substring(0, 11)
break
Expand Down
13 changes: 2 additions & 11 deletions ci/jenkins/ELevate_el8toel9_Stable.jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ pipeline {
parallelsAlwaysFailFast()
}
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: 'CONF_FILTER', choices: ['minimal', 'docker-ce'], description: 'Select a configuration')
string(name: 'RETRY', defaultValue: '3', description: 'Input count of retry', trim: true)
Expand Down Expand Up @@ -73,7 +73,7 @@ pipeline {
axes {
axis {
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'
}
}
Expand Down Expand Up @@ -187,15 +187,6 @@ def targetDistroSpec(distro) {
vm = 'almalinux_9'
ldata = 'leapp-data-almalinux'

spec = [
vmName: vm,
leappData: ldata
]
break
case 'eurolinux-9':
vm = 'eurolinux_9'
ldata = 'leapp-data-eurolinux'

spec = [
vmName: vm,
leappData: ldata
Expand Down
12 changes: 4 additions & 8 deletions ci/jenkins/ELevate_el8toel9_Testing.jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ pipeline {
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_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: '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: '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', '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')
}
stages {
Expand Down Expand Up @@ -53,11 +53,11 @@ pipeline {
axes {
axis {
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 {
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 {
Expand Down Expand Up @@ -171,10 +171,6 @@ def getLeappDataDistro(TARGET_DISTRO) {
leapp_data = TARGET_DISTRO.substring(0, 6)
break

case "eurolinux-9":
leapp_data = TARGET_DISTRO.substring(0, 9)
break

case "oraclelinux-9":
leapp_data = TARGET_DISTRO.substring(0, 11)
break
Expand Down
23 changes: 0 additions & 23 deletions ci/tests/tests/distro/test_osinfo_eurolinux_8.py

This file was deleted.

Loading

0 comments on commit 5790a53

Please sign in to comment.