Skip to content

SO-126: Sync the list of tests for s2i images with the image versions available in the library #28965

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 4 commits into from
Aug 15, 2024
Merged

SO-126: Sync the list of tests for s2i images with the image versions available in the library #28965

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d28fe3d
Sync the list of tests for s2i images with the image versions availab…
metlos Aug 1, 2024
3c48096
Update the generated annotations.
metlos Aug 1, 2024
05945b7
comment out the image versions that seem to be unreleased.
metlos Aug 1, 2024
85f2c49
update the generated code again
metlos Aug 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
175 changes: 141 additions & 34 deletions test/extended/image_ecosystem/s2i_images.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,22 +25,45 @@ type tc struct {
}

// This is a complete list of supported S2I images
// The commented out definitions are part of the library but seem to
// be not released and therefore are failing the tests.
var s2iImages = map[string][]tc{
"ruby": {
{
Version: "30",
Version: "31",
Cmd: "ruby --version",
Expected: "ruby 3.0",
Tag: "3.0-ubi8",
Expected: "ruby 3.1",
Tag: "3.1-ubi8",
Arches: []string{"amd64", "arm64", "ppc64le", "s390x"},
},
// {
// Version: "33",
// Cmd: "ruby --version",
// Expected: "ruby 3.3",
// Tag: "3.3-ubi8",
// Arches: []string{"amd64", "ppc64le", "s390x"},
// },
{
Version: "30",
Cmd: "ruby --version",
Expected: "ruby 3.0",
Tag: "3.0-ubi7",
Arches: []string{"amd64", "ppc64le", "s390x"},
Tag: "3.0-ubi9",
Arches: []string{"amd64", "arm64", "ppc64le", "s390x"},
},
{
Version: "31",
Cmd: "ruby --version",
Expected: "ruby 3.1",
Tag: "3.1-ubi9",
Arches: []string{"amd64", "arm64", "ppc64le", "s390x"},
},
// {
// Version: "33",
// Cmd: "ruby --version",
// Expected: "ruby 3.3",
// Tag: "3.3-ubi9",
// Arches: []string{"amd64", "arm64", "ppc64le", "s390x"},
// },
{
Version: "25",
Cmd: "ruby --version",
Expand All @@ -50,13 +73,6 @@ var s2iImages = map[string][]tc{
},
},
"python": {
{
Version: "27",
Cmd: "python --version",
Expected: "Python 2.7",
Tag: "2.7-ubi8",
Arches: []string{"amd64", "arm64", "ppc64le", "s390x"},
},
{
Version: "36",
Cmd: "python --version",
Expand All @@ -72,26 +88,75 @@ var s2iImages = map[string][]tc{
Arches: []string{"amd64", "arm64", "ppc64le", "s390x"},
},
{
Version: "38",
Version: "39",
Cmd: "python --version",
Expected: "Python 3.8",
Tag: "3.8-ubi7",
Expected: "Python 3.9",
Tag: "3.9-ubi8",
Arches: []string{"amd64", "arm64", "ppc64le", "s390x"},
},
{
Version: "311",
Cmd: "python --version",
Expected: "Python 3.11",
Tag: "3.11-ubi8",
Arches: []string{"amd64", "ppc64le", "s390x"},
},
// {
// Version: "312",
// Cmd: "python --version",
// Expected: "Python 3.12",
// Tag: "3.12-ubi8",
// Arches: []string{"amd64", "arm64", "ppc64le", "s390x"},
// },
{
Version: "39",
Cmd: "python --version",
Expected: "Python 3.9",
Tag: "3.9-ubi8",
Tag: "3.9-ubi9",
Arches: []string{"amd64", "arm64", "ppc64le", "s390x"},
},
{
Version: "311",
Cmd: "python --version",
Expected: "Python 3.11",
Tag: "3.11-ubi9",
Arches: []string{"amd64", "ppc64le", "s390x"},
},
// {
// Version: "312",
// Cmd: "python --version",
// Expected: "Python 3.12",
// Tag: "3.12-ubi9",
// Arches: []string{"amd64", "arm64", "ppc64le", "s390x"},
// },
},
"nodejs": {
{
Version: "16",
Version: "18",
Cmd: "node --version",
Expected: "v18",
Tag: "18-ubi8",
Arches: []string{"amd64", "arm64", "ppc64le", "s390x"},
},
{
Version: "20",
Cmd: "node --version",
Expected: "v20",
Tag: "20-ubi8",
Arches: []string{"amd64", "arm64", "ppc64le", "s390x"},
},
{
Version: "18",
Cmd: "node --version",
Expected: "v18",
Tag: "18-ubi9",
Arches: []string{"amd64", "arm64", "ppc64le", "s390x"},
},
{
Version: "20",
Cmd: "node --version",
Expected: "v16",
Tag: "16-ubi8",
Expected: "v20",
Tag: "20-ubi9",
Arches: []string{"amd64", "arm64", "ppc64le", "s390x"},
},
},
Expand All @@ -104,11 +169,11 @@ var s2iImages = map[string][]tc{
Arches: []string{"amd64", "arm64", "ppc64le", "s390x"},
},
{
Version: "530",
Version: "532",
Cmd: "perl --version",
Expected: "v5.30",
Tag: "5.30-el7",
Arches: []string{"amd64", "ppc64le", "s390x"},
Expected: "v5.32",
Tag: "5.32-ubi9",
Arches: []string{"amd64", "arm64", "ppc64le", "s390x"},
},
{
Version: "526",
Expand All @@ -119,29 +184,57 @@ var s2iImages = map[string][]tc{
},
},
"php": {
{
Version: "80",
Cmd: "php --version",
Expected: "8.0",
Tag: "8.0-ubi9",
Arches: []string{"amd64", "arm64", "ppc64le", "s390x"},
},
{
Version: "81",
Cmd: "php --version",
Expected: "8.1",
Tag: "8.1-ubi9",
Arches: []string{"amd64", "arm64", "ppc64le", "s390x"},
},
// {
// Version: "82",
// Cmd: "php --version",
// Expected: "8.2",
// Tag: "8.2-ubi9",
// Arches: []string{"amd64", "arm64", "ppc64le", "s390x"},
// },
{
Version: "80",
Cmd: "php --version",
Expected: "8.0",
Tag: "8.0-ubi8",
Arches: []string{"amd64", "arm64", "ppc64le", "s390x"},
},
// {
// Version: "82",
// Cmd: "php --version",
// Expected: "8.2",
// Tag: "8.2-ubi8",
// Arches: []string{"amd64", "arm64", "ppc64le", "s390x"},
// },
{
Version: "74",
Cmd: "php --version",
Expected: "7.4",
Tag: "7.4-ubi8",
Arches: []string{"amd64", "arm64", "ppc64le", "s390x"},
},
{
Version: "73",
Cmd: "php --version",
Expected: "7.3",
Tag: "7.3-ubi7",
Arches: []string{"amd64", "ppc64le", "s390x"},
},
},
"nginx": {
{
Version: "122",
Cmd: "nginx -V",
Expected: "nginx/1.22",
Tag: "1.22-ubi8",
Arches: []string{"amd64", "arm64", "ppc64le", "s390x"},
},
{
Version: "120",
Cmd: "nginx -V",
Expand All @@ -150,12 +243,19 @@ var s2iImages = map[string][]tc{
Arches: []string{"amd64", "arm64", "ppc64le", "s390x"},
},
{
Version: "120",
Version: "122",
Cmd: "nginx -V",
Expected: "nginx/1.20",
Tag: "1.20-ubi7",
Arches: []string{"amd64", "ppc64le", "s390x"},
Expected: "nginx/1.22",
Tag: "1.22-ubi9",
Arches: []string{"amd64", "arm64", "ppc64le", "s390x"},
},
// {
// Version: "124",
// Cmd: "nginx -V",
// Expected: "nginx/1.24",
// Tag: "1.24-ubi9",
// Arches: []string{"amd64", "arm64", "ppc64le", "s390x"},
// },
},
"dotnet": {
{
Expand All @@ -165,6 +265,13 @@ var s2iImages = map[string][]tc{
Tag: "6.0-ubi8",
Arches: []string{"amd64", "arm64", "s390x"},
},
// {
// Version: "80",
// Cmd: "dotnet --version",
// Expected: "8.0",
// Tag: "8.0-ubi8",
// Arches: []string{"amd64", "arm64", "ppc64le", "s390x"},
// },
},
}

Expand Down
Loading