Skip to content

Commit 42fdc08

Browse files
authored
feat(os): support RHEL 9, CentOS Stream 9, Alma Linux 9 (future-architect#1465)
* feat(os): support RHEL 9 * feat(os): support CentOS Stream9, AlmaLinux 9
1 parent 38b1d62 commit 42fdc08

File tree

2 files changed

+49
-24
lines changed

2 files changed

+49
-24
lines changed

config/os.go

+9
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,15 @@ func GetEOL(family, release string) (eol EOL, found bool) {
5656
},
5757
"7": {
5858
StandardSupportUntil: time.Date(2024, 6, 30, 23, 59, 59, 0, time.UTC),
59+
ExtendedSupportUntil: time.Date(2026, 6, 30, 23, 59, 59, 0, time.UTC),
5960
},
6061
"8": {
6162
StandardSupportUntil: time.Date(2029, 5, 31, 23, 59, 59, 0, time.UTC),
63+
ExtendedSupportUntil: time.Date(2031, 5, 31, 23, 59, 59, 0, time.UTC),
64+
},
65+
"9": {
66+
StandardSupportUntil: time.Date(2032, 5, 31, 23, 59, 59, 0, time.UTC),
67+
ExtendedSupportUntil: time.Date(2034, 5, 31, 23, 59, 59, 0, time.UTC),
6268
},
6369
}[major(release)]
6470
case constant.CentOS:
@@ -71,14 +77,17 @@ func GetEOL(family, release string) (eol EOL, found bool) {
7177
"7": {StandardSupportUntil: time.Date(2024, 6, 30, 23, 59, 59, 0, time.UTC)},
7278
"8": {StandardSupportUntil: time.Date(2021, 12, 31, 23, 59, 59, 0, time.UTC)},
7379
"stream8": {StandardSupportUntil: time.Date(2024, 5, 31, 23, 59, 59, 0, time.UTC)},
80+
"stream9": {StandardSupportUntil: time.Date(2027, 5, 31, 23, 59, 59, 0, time.UTC)},
7481
}[major(release)]
7582
case constant.Alma:
7683
eol, found = map[string]EOL{
7784
"8": {StandardSupportUntil: time.Date(2029, 12, 31, 23, 59, 59, 0, time.UTC)},
85+
"9": {StandardSupportUntil: time.Date(2032, 5, 31, 23, 59, 59, 0, time.UTC)},
7886
}[major(release)]
7987
case constant.Rocky:
8088
eol, found = map[string]EOL{
8189
"8": {StandardSupportUntil: time.Date(2029, 5, 31, 23, 59, 59, 0, time.UTC)},
90+
// "9": {StandardSupportUntil: time.Date(2032, 5, 31, 23, 59, 59, 0, time.UTC)},
8291
}[major(release)]
8392
case constant.Oracle:
8493
eol, found = map[string]EOL{

config/os_test.go

+40-24
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,14 @@ func TestEOL_IsStandardSupportEnded(t *testing.T) {
5454
found: true,
5555
},
5656
//RHEL
57+
{
58+
name: "RHEL6 eol",
59+
fields: fields{family: RedHat, release: "6"},
60+
now: time.Date(2021, 1, 6, 23, 59, 59, 0, time.UTC),
61+
stdEnded: true,
62+
extEnded: false,
63+
found: true,
64+
},
5765
{
5866
name: "RHEL7 supported",
5967
fields: fields{family: RedHat, release: "7"},
@@ -71,22 +79,30 @@ func TestEOL_IsStandardSupportEnded(t *testing.T) {
7179
found: true,
7280
},
7381
{
74-
name: "RHEL6 eol",
75-
fields: fields{family: RedHat, release: "6"},
82+
name: "RHEL9 supported",
83+
fields: fields{family: RedHat, release: "9"},
7684
now: time.Date(2021, 1, 6, 23, 59, 59, 0, time.UTC),
77-
stdEnded: true,
85+
stdEnded: false,
7886
extEnded: false,
7987
found: true,
8088
},
8189
{
82-
name: "RHEL9 not found",
83-
fields: fields{family: RedHat, release: "9"},
90+
name: "RHEL10 not found",
91+
fields: fields{family: RedHat, release: "10"},
8492
now: time.Date(2021, 1, 6, 23, 59, 59, 0, time.UTC),
8593
stdEnded: false,
8694
extEnded: false,
8795
found: false,
8896
},
8997
//CentOS
98+
{
99+
name: "CentOS 6 eol",
100+
fields: fields{family: CentOS, release: "6"},
101+
now: time.Date(2021, 1, 6, 23, 59, 59, 0, time.UTC),
102+
stdEnded: true,
103+
extEnded: true,
104+
found: true,
105+
},
90106
{
91107
name: "CentOS 7 supported",
92108
fields: fields{family: CentOS, release: "7"},
@@ -104,16 +120,24 @@ func TestEOL_IsStandardSupportEnded(t *testing.T) {
104120
found: true,
105121
},
106122
{
107-
name: "CentOS 6 eol",
108-
fields: fields{family: CentOS, release: "6"},
123+
name: "CentOS stream8 supported",
124+
fields: fields{family: CentOS, release: "stream8"},
109125
now: time.Date(2021, 1, 6, 23, 59, 59, 0, time.UTC),
110-
stdEnded: true,
111-
extEnded: true,
126+
stdEnded: false,
127+
extEnded: false,
128+
found: true,
129+
},
130+
{
131+
name: "CentOS stream9 supported",
132+
fields: fields{family: CentOS, release: "stream9"},
133+
now: time.Date(2021, 1, 6, 23, 59, 59, 0, time.UTC),
134+
stdEnded: false,
135+
extEnded: false,
112136
found: true,
113137
},
114138
{
115-
name: "CentOS 9 not found",
116-
fields: fields{family: CentOS, release: "9"},
139+
name: "CentOS stream10 Not Found",
140+
fields: fields{family: CentOS, release: "stream10"},
117141
now: time.Date(2021, 1, 6, 23, 59, 59, 0, time.UTC),
118142
stdEnded: false,
119143
extEnded: false,
@@ -129,16 +153,16 @@ func TestEOL_IsStandardSupportEnded(t *testing.T) {
129153
found: true,
130154
},
131155
{
132-
name: "Alma Linux 8 EOL",
133-
fields: fields{family: Alma, release: "8"},
134-
now: time.Date(2029, 2, 1, 0, 0, 0, 0, time.UTC),
156+
name: "Alma Linux 9 supported",
157+
fields: fields{family: Alma, release: "9"},
158+
now: time.Date(2021, 7, 2, 23, 59, 59, 0, time.UTC),
135159
stdEnded: false,
136160
extEnded: false,
137161
found: true,
138162
},
139163
{
140-
name: "Alma Linux 9 Not Found",
141-
fields: fields{family: Alma, release: "9"},
164+
name: "Alma Linux 10 Not Found",
165+
fields: fields{family: Alma, release: "10"},
142166
now: time.Date(2021, 7, 2, 23, 59, 59, 0, time.UTC),
143167
stdEnded: false,
144168
extEnded: false,
@@ -153,14 +177,6 @@ func TestEOL_IsStandardSupportEnded(t *testing.T) {
153177
extEnded: false,
154178
found: true,
155179
},
156-
{
157-
name: "Rocky Linux 8 EOL",
158-
fields: fields{family: Rocky, release: "8"},
159-
now: time.Date(2026, 2, 1, 0, 0, 0, 0, time.UTC),
160-
stdEnded: false,
161-
extEnded: false,
162-
found: true,
163-
},
164180
{
165181
name: "Rocky Linux 9 Not Found",
166182
fields: fields{family: Rocky, release: "9"},

0 commit comments

Comments
 (0)