Skip to content

Commit

Permalink
Drop Ruby 2.5 testing
Browse files Browse the repository at this point in the history
These versions are long end of life and shouldn't be running anymore.
This allows us to clean up Ruby 2.5 from our Jenkins nodes.
  • Loading branch information
ekohl authored and evgeni committed Jan 23, 2024
1 parent 2fb6c3b commit cdd149f
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 45 deletions.
2 changes: 1 addition & 1 deletion theforeman.org/pipelines/test/foreman/unit.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ pipeline {
axes {
axis {
name 'ruby'
values '2.7', '2.5'
values '2.7'
}
}
when {
Expand Down
21 changes: 0 additions & 21 deletions theforeman.org/pipelines/test/foreman/vars.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,6 @@ def foreman_integration_versions = [
'3.4-stable': [
'ruby': ['2.7'],
'katello': 'KATELLO-4.6'
],
'3.3-stable': [
'ruby': ['2.7'],
'katello': 'KATELLO-4.5'
],
'3.2-stable': [
'ruby': ['2.7'],
'katello': 'KATELLO-4.4'
],
'3.1-stable': [
'ruby': ['2.7'],
'katello': 'KATELLO-4.3'
]
]

Expand Down Expand Up @@ -66,15 +54,6 @@ def foreman_unit_versions = [
],
'3.4-stable': [
'ruby': ['2.7']
],
'3.3-stable': [
'ruby': ['2.7', '2.5']
],
'3.2-stable': [
'ruby': ['2.7', '2.5']
],
'3.1-stable': [
'ruby': ['2.7', '2.5']
]
]

25 changes: 2 additions & 23 deletions theforeman.org/pipelines/test/testKatello.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -26,28 +26,7 @@ def katello_versions = [
'KATELLO-4.6': [
'foreman': '3.4-stable',
'ruby': ['2.7']
],
'KATELLO-4.5': [
'foreman': '3.3-stable',
'ruby': ['2.7']
],
'KATELLO-4.4': [
'foreman': '3.2-stable',
'ruby': ['2.7']
],
'KATELLO-4.3': [
'foreman': '3.1-stable',
'ruby': ['2.7']
],
'KATELLO-4.2': [
'foreman': '3.0-stable',
'ruby': ['2.7']
],
//Testing of 3.18 to help with better testing of user issue fixes for migration
'KATELLO-3.18': [
'foreman': '2.3-stable',
'ruby': ['2.5']
],
]
]

def ruby_versions = katello_versions[ghprbTargetBranch]['ruby']
Expand All @@ -69,7 +48,7 @@ pipeline {
axes {
axis {
name 'ruby'
values '2.5', '2.7'
values '2.7'
}
}
when {
Expand Down

0 comments on commit cdd149f

Please sign in to comment.