Skip to content

Commit 7a97222

Browse files
andrewlukoshkoandrewlukoshko
authored
Merge pull request #134 from yuravk/almalinux-ng-0.21.0
Drop EuroLinux support
2 parents 8a70561 + 5790a53 commit 7a97222

20 files changed

+33
-183
lines changed

‎ci/jenkins/ELevate_el7toel8_Development.jenkinsfile‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ pipeline {
1010
parallelsAlwaysFailFast()
1111
}
1212
parameters {
13-
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')
13+
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')
1414
choice(name: 'CONF_FILTER', choices: ['minimal', 'docker-ce'], description: 'Select a configuration')
1515
string(name: 'LEAPP_SRC_GIT_USER', defaultValue: 'AlmaLinux', description: 'Input name of Git user of LEAPP source', trim: true)
1616
string(name: 'LEAPP_SRC_GIT_BRANCH', defaultValue: 'almalinux', description: 'Input name of Git branch of LEAPP source', trim: true)
@@ -76,7 +76,7 @@ pipeline {
7676
axes {
7777
axis {
7878
name 'TARGET_DISTRO'
79-
values 'almalinux-8', 'centos-stream-8', 'eurolinux-8', 'oraclelinux-8', 'rocky-8'
79+
values 'almalinux-8', 'centos-stream-8', 'oraclelinux-8', 'rocky-8'
8080
}
8181
}
8282
stages {
@@ -215,15 +215,6 @@ def targetDistroSpec(distro) {
215215
vm = 'centosstream_8'
216216
ldata = 'centos'
217217

218-
spec = [
219-
vmName: vm,
220-
leappData: ldata
221-
]
222-
break
223-
case 'eurolinux-8':
224-
vm = 'eurolinux_8'
225-
ldata = 'eurolinux'
226-
227218
spec = [
228219
vmName: vm,
229220
leappData: ldata

‎ci/jenkins/ELevate_el7toel8_Internal.jenkinsfile‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ pipeline {
1010
parallelsAlwaysFailFast()
1111
}
1212
parameters {
13-
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')
13+
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')
1414
choice(name: 'CONF_FILTER', choices: ['minimal', 'docker-ce'], description: 'Select a configuration')
1515
string(name: 'RETRY', defaultValue: '3', description: 'Input count of retry', trim: true)
1616
string(name: 'TIMEOUT', defaultValue: '60', description: 'Input timeout value in minutes', trim: true)
@@ -72,7 +72,7 @@ pipeline {
7272
axes {
7373
axis {
7474
name 'TARGET_DISTRO'
75-
values 'almalinux-8', 'centos-stream-8', 'eurolinux-8', 'oraclelinux-8', 'rocky-8'
75+
values 'almalinux-8', 'centos-stream-8', 'oraclelinux-8', 'rocky-8'
7676
}
7777
}
7878
stages {
@@ -196,15 +196,6 @@ def targetDistroSpec(distro) {
196196
vm = 'centosstream_8'
197197
ldata = 'leapp-data-centos'
198198

199-
spec = [
200-
vmName: vm,
201-
leappData: ldata
202-
]
203-
break
204-
case 'eurolinux-8':
205-
vm = 'eurolinux_8'
206-
ldata = 'leapp-data-eurolinux'
207-
208199
spec = [
209200
vmName: vm,
210201
leappData: ldata

‎ci/jenkins/ELevate_el7toel8_Internal_Dev.jenkinsfile‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ pipeline {
1010
parallelsAlwaysFailFast()
1111
}
1212
parameters {
13-
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')
13+
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')
1414
choice(name: 'CONF_FILTER', choices: ['minimal', 'docker-ce'], description: 'Select a configuration')
1515
string(name: 'LEAPP_SRC_GIT_USER', defaultValue: 'AlmaLinux', description: 'Input name of Git user of LEAPP source', trim: true)
1616
string(name: 'LEAPP_SRC_GIT_BRANCH', defaultValue: 'almalinux', description: 'Input name of Git branch of LEAPP source', trim: true)
@@ -76,7 +76,7 @@ pipeline {
7676
axes {
7777
axis {
7878
name 'TARGET_DISTRO'
79-
values 'almalinux-8', 'centos-stream-8', 'eurolinux-8', 'oraclelinux-8', 'rocky-8'
79+
values 'almalinux-8', 'centos-stream-8', 'oraclelinux-8', 'rocky-8'
8080
}
8181
}
8282
stages {
@@ -219,15 +219,6 @@ def targetDistroSpec(distro) {
219219
vm = 'centosstream_8'
220220
ldata = 'centos'
221221

222-
spec = [
223-
vmName: vm,
224-
leappData: ldata
225-
]
226-
break
227-
case 'eurolinux-8':
228-
vm = 'eurolinux_8'
229-
ldata = 'eurolinux'
230-
231222
spec = [
232223
vmName: vm,
233224
leappData: ldata

‎ci/jenkins/ELevate_el7toel8_Stable.jenkinsfile‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ pipeline {
1010
parallelsAlwaysFailFast()
1111
}
1212
parameters {
13-
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')
13+
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')
1414
choice(name: 'CONF_FILTER', choices: ['minimal', 'docker-ce'], description: 'Select a configuration')
1515
string(name: 'RETRY', defaultValue: '3', description: 'Input count of retry', trim: true)
1616
string(name: 'TIMEOUT', defaultValue: '60', description: 'Input timeout value in minutes', trim: true)
@@ -72,7 +72,7 @@ pipeline {
7272
axes {
7373
axis {
7474
name 'TARGET_DISTRO'
75-
values 'almalinux-8', 'centos-stream-8', 'eurolinux-8', 'oraclelinux-8', 'rocky-8'
75+
values 'almalinux-8', 'centos-stream-8', 'oraclelinux-8', 'rocky-8'
7676
}
7777
}
7878
stages {
@@ -194,15 +194,6 @@ def targetDistroSpec(distro) {
194194
vm = 'centosstream_8'
195195
ldata = 'leapp-data-centos'
196196

197-
spec = [
198-
vmName: vm,
199-
leappData: ldata
200-
]
201-
break
202-
case 'eurolinux-8':
203-
vm = 'eurolinux_8'
204-
ldata = 'leapp-data-eurolinux'
205-
206197
spec = [
207198
vmName: vm,
208199
leappData: ldata

‎ci/jenkins/ELevate_el7toel8_Testing.jenkinsfile‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ pipeline {
1010
parallelsAlwaysFailFast()
1111
}
1212
parameters {
13-
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')
13+
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')
1414
choice(name: 'CONF_FILTER', choices: ['minimal', 'docker-ce'], description: 'Select a configuration')
1515
string(name: 'RETRY', defaultValue: '3', description: 'Input count of retry', trim: true)
1616
string(name: 'TIMEOUT', defaultValue: '60', description: 'Input timeout value in minutes', trim: true)
@@ -72,7 +72,7 @@ pipeline {
7272
axes {
7373
axis {
7474
name 'TARGET_DISTRO'
75-
values 'almalinux-8', 'centos-stream-8', 'eurolinux-8', 'oraclelinux-8', 'rocky-8'
75+
values 'almalinux-8', 'centos-stream-8', 'oraclelinux-8', 'rocky-8'
7676
}
7777
}
7878
stages {
@@ -194,15 +194,6 @@ def targetDistroSpec(distro) {
194194
vm = 'centosstream_8'
195195
ldata = 'leapp-data-centos'
196196

197-
spec = [
198-
vmName: vm,
199-
leappData: ldata
200-
]
201-
break
202-
case 'eurolinux-8':
203-
vm = 'eurolinux_8'
204-
ldata = 'leapp-data-eurolinux'
205-
206197
spec = [
207198
vmName: vm,
208199
leappData: ldata

‎ci/jenkins/ELevate_el8toel9_Development.jenkinsfile‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ pipeline {
1414
string(name: 'TIMEOUT', defaultValue: '60', description: 'Input timeout value in minutes', trim: true)
1515
string(name: 'REPO_URL', defaultValue: 'https://github.com/LKHN/el-test-auto-dev.git', description: 'URL of the pipeline repository', trim: true)
1616
string(name: 'REPO_BRANCH', defaultValue: 'main', description: 'Branch of the pipeline repository', trim: true)
17-
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')
18-
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')
17+
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')
18+
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')
1919
choice(name: 'CONF_FILTER', choices: ['minimal', 'docker-ce'], description: 'Select a configuration')
2020
}
2121
stages {
@@ -55,11 +55,11 @@ pipeline {
5555
axes {
5656
axis {
5757
name 'SOURCE_DISTRO'
58-
values 'almalinux-8', 'centos-stream-8', 'eurolinux-8', 'oraclelinux-8', 'rocky-8'
58+
values 'almalinux-8', 'centos-stream-8', 'oraclelinux-8', 'rocky-8'
5959
}
6060
axis {
6161
name 'TARGET_DISTRO'
62-
values 'almalinux-9', 'centos-stream-9', 'eurolinux-9', 'oraclelinux-9', 'rocky-9'
62+
values 'almalinux-9', 'centos-stream-9', 'oraclelinux-9', 'rocky-9'
6363
}
6464
}
6565
stages {
@@ -184,10 +184,6 @@ def getLeappDataDistro(TARGET_DISTRO) {
184184
leapp_data = TARGET_DISTRO.substring(0, 6)
185185
break
186186

187-
case "eurolinux-9":
188-
leapp_data = TARGET_DISTRO.substring(0, 9)
189-
break
190-
191187
case "oraclelinux-9":
192188
leapp_data = TARGET_DISTRO.substring(0, 11)
193189
break

‎ci/jenkins/ELevate_el8toel9_Internal.jenkinsfile‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ pipeline {
1010
parallelsAlwaysFailFast()
1111
}
1212
parameters {
13-
// 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')
14-
choice(name: 'TARGET_DISTRO_FILTER', choices: ['almalinux-9', 'rocky-9', 'eurolinux-9', 'all'], description: 'Select a target distro or all for ELevation')
13+
// choice(name: 'TARGET_DISTRO_FILTER', choices: ['almalinux-9', 'centos-stream-9', 'rocky-9', 'all'], description: 'Select a target distro or all for ELevation')
14+
choice(name: 'TARGET_DISTRO_FILTER', choices: ['almalinux-9', 'rocky-9', 'all'], description: 'Select a target distro or all for ELevation')
1515
choice(name: 'CONF_FILTER', choices: ['minimal', 'docker-ce'], description: 'Select a configuration')
1616
string(name: 'RETRY', defaultValue: '3', description: 'Input count of retry', trim: true)
1717
string(name: 'TIMEOUT', defaultValue: '60', description: 'Input timeout value in minutes', trim: true)
@@ -73,8 +73,8 @@ pipeline {
7373
axes {
7474
axis {
7575
name 'TARGET_DISTRO'
76-
// values 'almalinux-9', 'centos-stream-9', 'eurolinux-9', 'rocky-9'
77-
values 'almalinux-9', 'rocky-9', 'eurolinux-9'
76+
// values 'almalinux-9', 'centos-stream-9', 'rocky-9'
77+
values 'almalinux-9', 'rocky-9'
7878
}
7979
}
8080
stages {
@@ -189,15 +189,6 @@ def targetDistroSpec(distro) {
189189
vm = 'almalinux_9'
190190
ldata = 'leapp-data-almalinux'
191191

192-
spec = [
193-
vmName: vm,
194-
leappData: ldata
195-
]
196-
break
197-
case 'eurolinux-9':
198-
vm = 'eurolinux_9'
199-
ldata = 'leapp-data-eurolinux'
200-
201192
spec = [
202193
vmName: vm,
203194
leappData: ldata

‎ci/jenkins/ELevate_el8toel9_Internal_Dev.jenkinsfile‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ pipeline {
1414
string(name: 'TIMEOUT', defaultValue: '60', description: 'Input timeout value in minutes', trim: true)
1515
string(name: 'REPO_URL', defaultValue: 'https://github.com/LKHN/el-test-auto-dev.git', description: 'URL of the pipeline repository', trim: true)
1616
string(name: 'REPO_BRANCH', defaultValue: 'main', description: 'Branch of the pipeline repository', trim: true)
17-
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')
18-
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')
17+
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')
18+
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')
1919
choice(name: 'CONF_FILTER', choices: ['minimal', 'docker-ce'], description: 'Select a configuration')
2020
}
2121
stages {
@@ -55,11 +55,11 @@ pipeline {
5555
axes {
5656
axis {
5757
name 'SOURCE_DISTRO'
58-
values 'almalinux-8', 'centos-stream-8', 'eurolinux-8', 'oraclelinux-8', 'rocky-8'
58+
values 'almalinux-8', 'centos-stream-8', 'oraclelinux-8', 'rocky-8'
5959
}
6060
axis {
6161
name 'TARGET_DISTRO'
62-
values 'almalinux-9', 'centos-stream-9', 'eurolinux-9', 'oraclelinux-9', 'rocky-9'
62+
values 'almalinux-9', 'centos-stream-9', 'oraclelinux-9', 'rocky-9'
6363
}
6464
}
6565
stages {
@@ -190,10 +190,6 @@ def getLeappDataDistro(TARGET_DISTRO) {
190190
leapp_data = TARGET_DISTRO.substring(0, 6)
191191
break
192192

193-
case "eurolinux-9":
194-
leapp_data = TARGET_DISTRO.substring(0, 9)
195-
break
196-
197193
case "oraclelinux-9":
198194
leapp_data = TARGET_DISTRO.substring(0, 11)
199195
break

‎ci/jenkins/ELevate_el8toel9_Stable.jenkinsfile‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ pipeline {
1010
parallelsAlwaysFailFast()
1111
}
1212
parameters {
13-
// 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')
13+
// choice(name: 'TARGET_DISTRO_FILTER', choices: ['almalinux-9', 'centos-stream-9', 'rocky-9', 'all'], description: 'Select a target distro or all for ELevation')
1414
choice(name: 'TARGET_DISTRO_FILTER', choices: ['almalinux-9', 'rocky-9', 'all'], description: 'Select a target distro or all for ELevation')
1515
choice(name: 'CONF_FILTER', choices: ['minimal', 'docker-ce'], description: 'Select a configuration')
1616
string(name: 'RETRY', defaultValue: '3', description: 'Input count of retry', trim: true)
@@ -73,7 +73,7 @@ pipeline {
7373
axes {
7474
axis {
7575
name 'TARGET_DISTRO'
76-
// values 'almalinux-9', 'centos-stream-9', 'eurolinux-9', 'rocky-9'
76+
// values 'almalinux-9', 'centos-stream-9', 'rocky-9'
7777
values 'almalinux-9', 'rocky-9'
7878
}
7979
}
@@ -187,15 +187,6 @@ def targetDistroSpec(distro) {
187187
vm = 'almalinux_9'
188188
ldata = 'leapp-data-almalinux'
189189

190-
spec = [
191-
vmName: vm,
192-
leappData: ldata
193-
]
194-
break
195-
case 'eurolinux-9':
196-
vm = 'eurolinux_9'
197-
ldata = 'leapp-data-eurolinux'
198-
199190
spec = [
200191
vmName: vm,
201192
leappData: ldata

‎ci/jenkins/ELevate_el8toel9_Testing.jenkinsfile‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ pipeline {
1414
string(name: 'TIMEOUT', defaultValue: '60', description: 'Input timeout value in minutes', trim: true)
1515
string(name: 'REPO_URL', defaultValue: 'https://github.com/LKHN/el-test-auto-dev.git', description: 'URL of the pipeline repository', trim: true)
1616
string(name: 'REPO_BRANCH', defaultValue: 'main', description: 'Branch of the pipeline repository', trim: true)
17-
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')
18-
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')
17+
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')
18+
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')
1919
choice(name: 'CONF_FILTER', choices: ['minimal', 'docker-ce'], description: 'Select a configuration')
2020
}
2121
stages {
@@ -53,11 +53,11 @@ pipeline {
5353
axes {
5454
axis {
5555
name 'SOURCE_DISTRO'
56-
values 'almalinux-8', 'centos-stream-8', 'eurolinux-8', 'oraclelinux-8', 'rocky-8'
56+
values 'almalinux-8', 'centos-stream-8', 'oraclelinux-8', 'rocky-8'
5757
}
5858
axis {
5959
name 'TARGET_DISTRO'
60-
values 'almalinux-9', 'centos-stream-9', 'eurolinux-9', 'oraclelinux-9', 'rocky-9'
60+
values 'almalinux-9', 'centos-stream-9', 'oraclelinux-9', 'rocky-9'
6161
}
6262
}
6363
stages {
@@ -171,10 +171,6 @@ def getLeappDataDistro(TARGET_DISTRO) {
171171
leapp_data = TARGET_DISTRO.substring(0, 6)
172172
break
173173

174-
case "eurolinux-9":
175-
leapp_data = TARGET_DISTRO.substring(0, 9)
176-
break
177-
178174
case "oraclelinux-9":
179175
leapp_data = TARGET_DISTRO.substring(0, 11)
180176
break

0 commit comments

Comments
 (0)