From d28fe3dffdc6cf572fe88b30edff400778032121 Mon Sep 17 00:00:00 2001 From: Lukas Krejci Date: Thu, 1 Aug 2024 10:25:34 +0200 Subject: [PATCH 1/4] Sync the list of tests for s2i images with the image versions available in the library. --- test/extended/image_ecosystem/s2i_images.go | 173 ++++++++++++++++---- 1 file changed, 139 insertions(+), 34 deletions(-) diff --git a/test/extended/image_ecosystem/s2i_images.go b/test/extended/image_ecosystem/s2i_images.go index a3d47b9c9fa8..0a99b69858fe 100644 --- a/test/extended/image_ecosystem/s2i_images.go +++ b/test/extended/image_ecosystem/s2i_images.go @@ -28,18 +28,39 @@ type tc struct { 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", @@ -50,13 +71,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", @@ -72,26 +86,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: "v16", - Tag: "16-ubi8", + Expected: "v18", + Tag: "18-ubi9", + Arches: []string{"amd64", "arm64", "ppc64le", "s390x"}, + }, + { + Version: "20", + Cmd: "node --version", + Expected: "v20", + Tag: "20-ubi9", Arches: []string{"amd64", "arm64", "ppc64le", "s390x"}, }, }, @@ -104,11 +167,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", @@ -119,6 +182,27 @@ 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", @@ -127,21 +211,28 @@ var s2iImages = map[string][]tc{ Arches: []string{"amd64", "arm64", "ppc64le", "s390x"}, }, { - Version: "74", + Version: "82", Cmd: "php --version", - Expected: "7.4", - Tag: "7.4-ubi8", + Expected: "8.2", + Tag: "8.2-ubi8", Arches: []string{"amd64", "arm64", "ppc64le", "s390x"}, }, { - Version: "73", + Version: "74", Cmd: "php --version", - Expected: "7.3", - Tag: "7.3-ubi7", - Arches: []string{"amd64", "ppc64le", "s390x"}, + Expected: "7.4", + Tag: "7.4-ubi8", + Arches: []string{"amd64", "arm64", "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", @@ -150,11 +241,18 @@ 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": { @@ -165,6 +263,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"}, + }, }, } From 3c4809600496ebd466b84a562ff6fc26c9574d23 Mon Sep 17 00:00:00 2001 From: Lukas Krejci Date: Thu, 1 Aug 2024 10:47:24 +0200 Subject: [PATCH 2/4] Update the generated annotations. --- .../generated/zz_generated.annotations.go | 100 ++++++++++++++---- 1 file changed, 80 insertions(+), 20 deletions(-) diff --git a/test/extended/util/annotate/generated/zz_generated.annotations.go b/test/extended/util/annotate/generated/zz_generated.annotations.go index 998396b02b24..d9a04ed1841a 100644 --- a/test/extended/util/annotate/generated/zz_generated.annotations.go +++ b/test/extended/util/annotate/generated/zz_generated.annotations.go @@ -947,75 +947,135 @@ var Annotations = map[string]string{ "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"image-registry.openshift-image-registry.svc:5000/openshift/dotnet:6.0-ubi8\" should print the usage": "", - "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"image-registry.openshift-image-registry.svc:5000/openshift/nginx:1.20-ubi7\" should print the usage": "", + "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"image-registry.openshift-image-registry.svc:5000/openshift/dotnet:8.0-ubi8\" should print the usage": "", "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"image-registry.openshift-image-registry.svc:5000/openshift/nginx:1.20-ubi9\" should print the usage": "", - "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"image-registry.openshift-image-registry.svc:5000/openshift/nodejs:16-ubi8\" should print the usage": "", + "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"image-registry.openshift-image-registry.svc:5000/openshift/nginx:1.22-ubi8\" should print the usage": "", - "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"image-registry.openshift-image-registry.svc:5000/openshift/perl:5.26-ubi8\" should print the usage": "", + "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"image-registry.openshift-image-registry.svc:5000/openshift/nginx:1.22-ubi9\" should print the usage": "", + + "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"image-registry.openshift-image-registry.svc:5000/openshift/nginx:1.24-ubi9\" should print the usage": "", + + "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"image-registry.openshift-image-registry.svc:5000/openshift/nodejs:18-ubi8\" should print the usage": "", + + "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"image-registry.openshift-image-registry.svc:5000/openshift/nodejs:18-ubi9\" should print the usage": "", + + "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"image-registry.openshift-image-registry.svc:5000/openshift/nodejs:20-ubi8\" should print the usage": "", - "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"image-registry.openshift-image-registry.svc:5000/openshift/perl:5.30-el7\" should print the usage": "", + "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"image-registry.openshift-image-registry.svc:5000/openshift/nodejs:20-ubi9\" should print the usage": "", + + "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"image-registry.openshift-image-registry.svc:5000/openshift/perl:5.26-ubi8\" should print the usage": "", "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"image-registry.openshift-image-registry.svc:5000/openshift/perl:5.32-ubi8\" should print the usage": "", - "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"image-registry.openshift-image-registry.svc:5000/openshift/php:7.3-ubi7\" should print the usage": "", + "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"image-registry.openshift-image-registry.svc:5000/openshift/perl:5.32-ubi9\" should print the usage": "", "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"image-registry.openshift-image-registry.svc:5000/openshift/php:7.4-ubi8\" should print the usage": "", "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"image-registry.openshift-image-registry.svc:5000/openshift/php:8.0-ubi8\" should print the usage": "", - "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"image-registry.openshift-image-registry.svc:5000/openshift/python:2.7-ubi8\" should print the usage": "", + "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"image-registry.openshift-image-registry.svc:5000/openshift/php:8.0-ubi9\" should print the usage": "", - "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"image-registry.openshift-image-registry.svc:5000/openshift/python:3.6-ubi8\" should print the usage": "", + "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"image-registry.openshift-image-registry.svc:5000/openshift/php:8.1-ubi9\" should print the usage": "", + + "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"image-registry.openshift-image-registry.svc:5000/openshift/php:8.2-ubi8\" should print the usage": "", + + "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"image-registry.openshift-image-registry.svc:5000/openshift/php:8.2-ubi9\" should print the usage": "", - "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"image-registry.openshift-image-registry.svc:5000/openshift/python:3.8-ubi7\" should print the usage": "", + "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"image-registry.openshift-image-registry.svc:5000/openshift/python:3.11-ubi8\" should print the usage": "", + + "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"image-registry.openshift-image-registry.svc:5000/openshift/python:3.11-ubi9\" should print the usage": "", + + "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"image-registry.openshift-image-registry.svc:5000/openshift/python:3.12-ubi8\" should print the usage": "", + + "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"image-registry.openshift-image-registry.svc:5000/openshift/python:3.12-ubi9\" should print the usage": "", + + "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"image-registry.openshift-image-registry.svc:5000/openshift/python:3.6-ubi8\" should print the usage": "", "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"image-registry.openshift-image-registry.svc:5000/openshift/python:3.8-ubi8\" should print the usage": "", "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"image-registry.openshift-image-registry.svc:5000/openshift/python:3.9-ubi8\" should print the usage": "", + "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"image-registry.openshift-image-registry.svc:5000/openshift/python:3.9-ubi9\" should print the usage": "", + "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"image-registry.openshift-image-registry.svc:5000/openshift/ruby:2.5-ubi8\" should print the usage": "", - "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.0-ubi7\" should print the usage": "", + "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.0-ubi9\" should print the usage": "", + + "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.1-ubi8\" should print the usage": "", + + "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.1-ubi9\" should print the usage": "", + + "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.3-ubi8\" should print the usage": "", - "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.0-ubi8\" should print the usage": "", + "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.3-ubi9\" should print the usage": "", "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled using the SCL in s2i images \"image-registry.openshift-image-registry.svc:5000/openshift/dotnet:6.0-ubi8\" should be SCL enabled": "", - "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled using the SCL in s2i images \"image-registry.openshift-image-registry.svc:5000/openshift/nginx:1.20-ubi7\" should be SCL enabled": "", + "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled using the SCL in s2i images \"image-registry.openshift-image-registry.svc:5000/openshift/dotnet:8.0-ubi8\" should be SCL enabled": "", "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled using the SCL in s2i images \"image-registry.openshift-image-registry.svc:5000/openshift/nginx:1.20-ubi9\" should be SCL enabled": "", - "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled using the SCL in s2i images \"image-registry.openshift-image-registry.svc:5000/openshift/nodejs:16-ubi8\" should be SCL enabled": "", + "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled using the SCL in s2i images \"image-registry.openshift-image-registry.svc:5000/openshift/nginx:1.22-ubi8\" should be SCL enabled": "", - "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled using the SCL in s2i images \"image-registry.openshift-image-registry.svc:5000/openshift/perl:5.26-ubi8\" should be SCL enabled": "", + "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled using the SCL in s2i images \"image-registry.openshift-image-registry.svc:5000/openshift/nginx:1.22-ubi9\" should be SCL enabled": "", + + "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled using the SCL in s2i images \"image-registry.openshift-image-registry.svc:5000/openshift/nginx:1.24-ubi9\" should be SCL enabled": "", + + "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled using the SCL in s2i images \"image-registry.openshift-image-registry.svc:5000/openshift/nodejs:18-ubi8\" should be SCL enabled": "", + + "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled using the SCL in s2i images \"image-registry.openshift-image-registry.svc:5000/openshift/nodejs:18-ubi9\" should be SCL enabled": "", + + "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled using the SCL in s2i images \"image-registry.openshift-image-registry.svc:5000/openshift/nodejs:20-ubi8\" should be SCL enabled": "", - "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled using the SCL in s2i images \"image-registry.openshift-image-registry.svc:5000/openshift/perl:5.30-el7\" should be SCL enabled": "", + "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled using the SCL in s2i images \"image-registry.openshift-image-registry.svc:5000/openshift/nodejs:20-ubi9\" should be SCL enabled": "", + + "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled using the SCL in s2i images \"image-registry.openshift-image-registry.svc:5000/openshift/perl:5.26-ubi8\" should be SCL enabled": "", "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled using the SCL in s2i images \"image-registry.openshift-image-registry.svc:5000/openshift/perl:5.32-ubi8\" should be SCL enabled": "", - "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled using the SCL in s2i images \"image-registry.openshift-image-registry.svc:5000/openshift/php:7.3-ubi7\" should be SCL enabled": "", + "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled using the SCL in s2i images \"image-registry.openshift-image-registry.svc:5000/openshift/perl:5.32-ubi9\" should be SCL enabled": "", "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled using the SCL in s2i images \"image-registry.openshift-image-registry.svc:5000/openshift/php:7.4-ubi8\" should be SCL enabled": "", "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled using the SCL in s2i images \"image-registry.openshift-image-registry.svc:5000/openshift/php:8.0-ubi8\" should be SCL enabled": "", - "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled using the SCL in s2i images \"image-registry.openshift-image-registry.svc:5000/openshift/python:2.7-ubi8\" should be SCL enabled": "", + "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled using the SCL in s2i images \"image-registry.openshift-image-registry.svc:5000/openshift/php:8.0-ubi9\" should be SCL enabled": "", - "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled using the SCL in s2i images \"image-registry.openshift-image-registry.svc:5000/openshift/python:3.6-ubi8\" should be SCL enabled": "", + "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled using the SCL in s2i images \"image-registry.openshift-image-registry.svc:5000/openshift/php:8.1-ubi9\" should be SCL enabled": "", + + "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled using the SCL in s2i images \"image-registry.openshift-image-registry.svc:5000/openshift/php:8.2-ubi8\" should be SCL enabled": "", + + "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled using the SCL in s2i images \"image-registry.openshift-image-registry.svc:5000/openshift/php:8.2-ubi9\" should be SCL enabled": "", - "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled using the SCL in s2i images \"image-registry.openshift-image-registry.svc:5000/openshift/python:3.8-ubi7\" should be SCL enabled": "", + "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled using the SCL in s2i images \"image-registry.openshift-image-registry.svc:5000/openshift/python:3.11-ubi8\" should be SCL enabled": "", + + "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled using the SCL in s2i images \"image-registry.openshift-image-registry.svc:5000/openshift/python:3.11-ubi9\" should be SCL enabled": "", + + "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled using the SCL in s2i images \"image-registry.openshift-image-registry.svc:5000/openshift/python:3.12-ubi8\" should be SCL enabled": "", + + "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled using the SCL in s2i images \"image-registry.openshift-image-registry.svc:5000/openshift/python:3.12-ubi9\" should be SCL enabled": "", + + "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled using the SCL in s2i images \"image-registry.openshift-image-registry.svc:5000/openshift/python:3.6-ubi8\" should be SCL enabled": "", "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled using the SCL in s2i images \"image-registry.openshift-image-registry.svc:5000/openshift/python:3.8-ubi8\" should be SCL enabled": "", "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled using the SCL in s2i images \"image-registry.openshift-image-registry.svc:5000/openshift/python:3.9-ubi8\" should be SCL enabled": "", + "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled using the SCL in s2i images \"image-registry.openshift-image-registry.svc:5000/openshift/python:3.9-ubi9\" should be SCL enabled": "", + "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled using the SCL in s2i images \"image-registry.openshift-image-registry.svc:5000/openshift/ruby:2.5-ubi8\" should be SCL enabled": "", - "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled using the SCL in s2i images \"image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.0-ubi7\" should be SCL enabled": "", + "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled using the SCL in s2i images \"image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.0-ubi9\" should be SCL enabled": "", + + "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled using the SCL in s2i images \"image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.1-ubi8\" should be SCL enabled": "", + + "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled using the SCL in s2i images \"image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.1-ubi9\" should be SCL enabled": "", + + "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled using the SCL in s2i images \"image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.3-ubi8\" should be SCL enabled": "", - "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled using the SCL in s2i images \"image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.0-ubi8\" should be SCL enabled": "", + "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled using the SCL in s2i images \"image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.3-ubi9\" should be SCL enabled": "", "[sig-devex][Feature:ImageEcosystem][Slow] openshift sample application repositories [sig-devex][Feature:ImageEcosystem][nodejs] test nodejs images with nodejs-rest-http-crud db repo Building nodejs-postgresql app from new-app should build a nodejs-postgresql image and run it in a pod [apigroup:build.openshift.io]": "", From 05945b76e68062c98dd3a379f55c049d62c68e32 Mon Sep 17 00:00:00 2001 From: Lukas Krejci Date: Thu, 1 Aug 2024 14:12:17 +0200 Subject: [PATCH 3/4] comment out the image versions that seem to be unreleased. --- test/extended/image_ecosystem/s2i_images.go | 114 ++++++++++---------- 1 file changed, 58 insertions(+), 56 deletions(-) diff --git a/test/extended/image_ecosystem/s2i_images.go b/test/extended/image_ecosystem/s2i_images.go index 0a99b69858fe..3943ab09f98d 100644 --- a/test/extended/image_ecosystem/s2i_images.go +++ b/test/extended/image_ecosystem/s2i_images.go @@ -25,6 +25,8 @@ 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": { { @@ -34,13 +36,13 @@ var s2iImages = map[string][]tc{ 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: "33", + // Cmd: "ruby --version", + // Expected: "ruby 3.3", + // Tag: "3.3-ubi8", + // Arches: []string{"amd64", "ppc64le", "s390x"}, + // }, { Version: "30", Cmd: "ruby --version", @@ -55,13 +57,13 @@ var s2iImages = map[string][]tc{ 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: "33", + // Cmd: "ruby --version", + // Expected: "ruby 3.3", + // Tag: "3.3-ubi9", + // Arches: []string{"amd64", "arm64", "ppc64le", "s390x"}, + // }, { Version: "25", Cmd: "ruby --version", @@ -99,13 +101,13 @@ var s2iImages = map[string][]tc{ 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: "312", + // Cmd: "python --version", + // Expected: "Python 3.12", + // Tag: "3.12-ubi8", + // Arches: []string{"amd64", "arm64", "ppc64le", "s390x"}, + // }, { Version: "39", Cmd: "python --version", @@ -120,13 +122,13 @@ var s2iImages = map[string][]tc{ 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"}, - }, + // { + // Version: "312", + // Cmd: "python --version", + // Expected: "Python 3.12", + // Tag: "3.12-ubi9", + // Arches: []string{"amd64", "arm64", "ppc64le", "s390x"}, + // }, }, "nodejs": { { @@ -196,13 +198,13 @@ var s2iImages = map[string][]tc{ 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: "82", + // Cmd: "php --version", + // Expected: "8.2", + // Tag: "8.2-ubi9", + // Arches: []string{"amd64", "arm64", "ppc64le", "s390x"}, + // }, { Version: "80", Cmd: "php --version", @@ -210,13 +212,13 @@ var s2iImages = map[string][]tc{ 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: "82", + // Cmd: "php --version", + // Expected: "8.2", + // Tag: "8.2-ubi8", + // Arches: []string{"amd64", "arm64", "ppc64le", "s390x"}, + // }, { Version: "74", Cmd: "php --version", @@ -247,13 +249,13 @@ var s2iImages = map[string][]tc{ 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"}, - }, + // { + // Version: "124", + // Cmd: "nginx -V", + // Expected: "nginx/1.24", + // Tag: "1.24-ubi9", + // Arches: []string{"amd64", "arm64", "ppc64le", "s390x"}, + // }, }, "dotnet": { { @@ -263,13 +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"}, - }, + // { + // Version: "80", + // Cmd: "dotnet --version", + // Expected: "8.0", + // Tag: "8.0-ubi8", + // Arches: []string{"amd64", "arm64", "ppc64le", "s390x"}, + // }, }, } From 85f2c49e494074ce28edc4dd41c39e5701dd196e Mon Sep 17 00:00:00 2001 From: Lukas Krejci Date: Thu, 1 Aug 2024 14:39:30 +0200 Subject: [PATCH 4/4] update the generated code again --- .../generated/zz_generated.annotations.go | 32 ------------------- 1 file changed, 32 deletions(-) diff --git a/test/extended/util/annotate/generated/zz_generated.annotations.go b/test/extended/util/annotate/generated/zz_generated.annotations.go index d9a04ed1841a..7852b032e5cf 100644 --- a/test/extended/util/annotate/generated/zz_generated.annotations.go +++ b/test/extended/util/annotate/generated/zz_generated.annotations.go @@ -947,16 +947,12 @@ var Annotations = map[string]string{ "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"image-registry.openshift-image-registry.svc:5000/openshift/dotnet:6.0-ubi8\" should print the usage": "", - "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"image-registry.openshift-image-registry.svc:5000/openshift/dotnet:8.0-ubi8\" should print the usage": "", - "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"image-registry.openshift-image-registry.svc:5000/openshift/nginx:1.20-ubi9\" should print the usage": "", "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"image-registry.openshift-image-registry.svc:5000/openshift/nginx:1.22-ubi8\" should print the usage": "", "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"image-registry.openshift-image-registry.svc:5000/openshift/nginx:1.22-ubi9\" should print the usage": "", - "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"image-registry.openshift-image-registry.svc:5000/openshift/nginx:1.24-ubi9\" should print the usage": "", - "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"image-registry.openshift-image-registry.svc:5000/openshift/nodejs:18-ubi8\" should print the usage": "", "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"image-registry.openshift-image-registry.svc:5000/openshift/nodejs:18-ubi9\" should print the usage": "", @@ -979,18 +975,10 @@ var Annotations = map[string]string{ "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"image-registry.openshift-image-registry.svc:5000/openshift/php:8.1-ubi9\" should print the usage": "", - "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"image-registry.openshift-image-registry.svc:5000/openshift/php:8.2-ubi8\" should print the usage": "", - - "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"image-registry.openshift-image-registry.svc:5000/openshift/php:8.2-ubi9\" should print the usage": "", - "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"image-registry.openshift-image-registry.svc:5000/openshift/python:3.11-ubi8\" should print the usage": "", "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"image-registry.openshift-image-registry.svc:5000/openshift/python:3.11-ubi9\" should print the usage": "", - "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"image-registry.openshift-image-registry.svc:5000/openshift/python:3.12-ubi8\" should print the usage": "", - - "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"image-registry.openshift-image-registry.svc:5000/openshift/python:3.12-ubi9\" should print the usage": "", - "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"image-registry.openshift-image-registry.svc:5000/openshift/python:3.6-ubi8\" should print the usage": "", "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"image-registry.openshift-image-registry.svc:5000/openshift/python:3.8-ubi8\" should print the usage": "", @@ -1007,22 +995,14 @@ var Annotations = map[string]string{ "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.1-ubi9\" should print the usage": "", - "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.3-ubi8\" should print the usage": "", - - "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.3-ubi9\" should print the usage": "", - "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled using the SCL in s2i images \"image-registry.openshift-image-registry.svc:5000/openshift/dotnet:6.0-ubi8\" should be SCL enabled": "", - "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled using the SCL in s2i images \"image-registry.openshift-image-registry.svc:5000/openshift/dotnet:8.0-ubi8\" should be SCL enabled": "", - "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled using the SCL in s2i images \"image-registry.openshift-image-registry.svc:5000/openshift/nginx:1.20-ubi9\" should be SCL enabled": "", "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled using the SCL in s2i images \"image-registry.openshift-image-registry.svc:5000/openshift/nginx:1.22-ubi8\" should be SCL enabled": "", "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled using the SCL in s2i images \"image-registry.openshift-image-registry.svc:5000/openshift/nginx:1.22-ubi9\" should be SCL enabled": "", - "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled using the SCL in s2i images \"image-registry.openshift-image-registry.svc:5000/openshift/nginx:1.24-ubi9\" should be SCL enabled": "", - "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled using the SCL in s2i images \"image-registry.openshift-image-registry.svc:5000/openshift/nodejs:18-ubi8\" should be SCL enabled": "", "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled using the SCL in s2i images \"image-registry.openshift-image-registry.svc:5000/openshift/nodejs:18-ubi9\" should be SCL enabled": "", @@ -1045,18 +1025,10 @@ var Annotations = map[string]string{ "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled using the SCL in s2i images \"image-registry.openshift-image-registry.svc:5000/openshift/php:8.1-ubi9\" should be SCL enabled": "", - "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled using the SCL in s2i images \"image-registry.openshift-image-registry.svc:5000/openshift/php:8.2-ubi8\" should be SCL enabled": "", - - "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled using the SCL in s2i images \"image-registry.openshift-image-registry.svc:5000/openshift/php:8.2-ubi9\" should be SCL enabled": "", - "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled using the SCL in s2i images \"image-registry.openshift-image-registry.svc:5000/openshift/python:3.11-ubi8\" should be SCL enabled": "", "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled using the SCL in s2i images \"image-registry.openshift-image-registry.svc:5000/openshift/python:3.11-ubi9\" should be SCL enabled": "", - "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled using the SCL in s2i images \"image-registry.openshift-image-registry.svc:5000/openshift/python:3.12-ubi8\" should be SCL enabled": "", - - "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled using the SCL in s2i images \"image-registry.openshift-image-registry.svc:5000/openshift/python:3.12-ubi9\" should be SCL enabled": "", - "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled using the SCL in s2i images \"image-registry.openshift-image-registry.svc:5000/openshift/python:3.6-ubi8\" should be SCL enabled": "", "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled using the SCL in s2i images \"image-registry.openshift-image-registry.svc:5000/openshift/python:3.8-ubi8\" should be SCL enabled": "", @@ -1073,10 +1045,6 @@ var Annotations = map[string]string{ "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled using the SCL in s2i images \"image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.1-ubi9\" should be SCL enabled": "", - "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled using the SCL in s2i images \"image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.3-ubi8\" should be SCL enabled": "", - - "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled using the SCL in s2i images \"image-registry.openshift-image-registry.svc:5000/openshift/ruby:3.3-ubi9\" should be SCL enabled": "", - "[sig-devex][Feature:ImageEcosystem][Slow] openshift sample application repositories [sig-devex][Feature:ImageEcosystem][nodejs] test nodejs images with nodejs-rest-http-crud db repo Building nodejs-postgresql app from new-app should build a nodejs-postgresql image and run it in a pod [apigroup:build.openshift.io]": "", "[sig-devex][Feature:ImageEcosystem][Slow] openshift sample application repositories [sig-devex][Feature:ImageEcosystem][php] test php images with cakephp-ex db repo Building cakephp-mysql app from new-app should build a cakephp-mysql image and run it in a pod [apigroup:build.openshift.io]": "",