diff --git a/test/extended/image_ecosystem/s2i_images.go b/test/extended/image_ecosystem/s2i_images.go index 495f0f311df6..321b866d591f 100644 --- a/test/extended/image_ecosystem/s2i_images.go +++ b/test/extended/image_ecosystem/s2i_images.go @@ -14,9 +14,8 @@ type tc struct { // Expected output from the command Expected string - // Repository is either openshift/ or rhcsl/ - // The default is 'openshift' - Repository string + // Tag is the image tag to correlates to the Version string + Tag string // Internal: We resolve this in JustBeforeEach DockerImageReference string @@ -29,75 +28,75 @@ type tc struct { var s2iImages = map[string][]tc{ "ruby": { { - Version: "27", - Cmd: "ruby --version", - Expected: "ruby 2.7", - Repository: "rhscl", - NonAMD: true, + Version: "27", + Cmd: "ruby --version", + Expected: "ruby 2.7", + Tag: "2.7", + NonAMD: true, }, { - Version: "26", - Cmd: "ruby --version", - Expected: "ruby 2.6", - Repository: "rhscl", - NonAMD: true, + Version: "26", + Cmd: "ruby --version", + Expected: "ruby 2.6", + Tag: "2.6", + NonAMD: true, }, }, "python": { { - Version: "27", - Cmd: "python --version", - Expected: "Python 2.7", - Repository: "rhscl", - NonAMD: true, + Version: "27", + Cmd: "python --version", + Expected: "Python 2.7", + Tag: "2.7", + NonAMD: true, }, { - Version: "36", - Cmd: "python --version", - Expected: "Python 3.6", - Repository: "rhscl", - NonAMD: true, + Version: "36", + Cmd: "python --version", + Expected: "Python 3.6", + Tag: "3.6-ubi8", + NonAMD: true, }, }, "nodejs": { { - Version: "10", - Cmd: "node --version", - Expected: "v10", - Repository: "rhscl", - NonAMD: true, + Version: "10", + Cmd: "node --version", + Expected: "v10", + Tag: "10", + NonAMD: true, }, { - Version: "12", - Cmd: "node --version", - Expected: "v12", - Repository: "rhscl", - NonAMD: true, + Version: "12", + Cmd: "node --version", + Expected: "v12", + Tag: "12", + NonAMD: true, }, }, "perl": { { - Version: "526", - Cmd: "perl --version", - Expected: "v5.26", - Repository: "rhscl", - NonAMD: true, + Version: "526", + Cmd: "perl --version", + Expected: "v5.26", + Tag: "5.26", + NonAMD: true, }, }, "php": { { - Version: "72", - Cmd: "php --version", - Expected: "7.2", - Repository: "rhscl", - NonAMD: true, + Version: "72", + Cmd: "php --version", + Expected: "7.2", + Tag: "7.2-ubi8", + NonAMD: true, }, { - Version: "73", - Cmd: "php --version", - Expected: "7.3", - Repository: "rhscl", - NonAMD: true, + Version: "73", + Cmd: "php --version", + Expected: "7.3", + Tag: "7.3", + NonAMD: true, }, }, } @@ -115,8 +114,5 @@ func GetTestCaseForImages() map[string][]tc { // resolveDockerImageReferences resolves the pull specs for all images func resolveDockerImageReference(name string, t *tc) { - if len(t.Repository) == 0 { - t.Repository = "openshift" - } - t.DockerImageReference = fmt.Sprintf("registry.redhat.io/%s/%s-%s-rhel7", t.Repository, name, t.Version) + t.DockerImageReference = fmt.Sprintf("image-registry.openshift-image-registry.svc:5000/openshift/%s:%s", name, t.Tag) } diff --git a/test/extended/util/annotate/generated/zz_generated.annotations.go b/test/extended/util/annotate/generated/zz_generated.annotations.go index b672ea334414..1689ff1bd6fa 100644 --- a/test/extended/util/annotate/generated/zz_generated.annotations.go +++ b/test/extended/util/annotate/generated/zz_generated.annotations.go @@ -1649,41 +1649,41 @@ var annotations = map[string]string{ "[Top Level] [sig-devex] check registry.redhat.io is available and samples operator can import sample imagestreams run sample related validations": "run sample related validations [Suite:openshift/conformance/parallel]", - "[Top Level] [sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"registry.redhat.io/rhscl/nodejs-10-rhel7\" should print the usage": "\"registry.redhat.io/rhscl/nodejs-10-rhel7\" should print the usage", + "[Top Level] [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:10\" should print the usage": "\"image-registry.openshift-image-registry.svc:5000/openshift/nodejs:10\" should print the usage", - "[Top Level] [sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"registry.redhat.io/rhscl/nodejs-12-rhel7\" should print the usage": "\"registry.redhat.io/rhscl/nodejs-12-rhel7\" should print the usage", + "[Top Level] [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:12\" should print the usage": "\"image-registry.openshift-image-registry.svc:5000/openshift/nodejs:12\" should print the usage", - "[Top Level] [sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"registry.redhat.io/rhscl/perl-526-rhel7\" should print the usage": "\"registry.redhat.io/rhscl/perl-526-rhel7\" should print the usage", + "[Top Level] [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\" should print the usage": "\"image-registry.openshift-image-registry.svc:5000/openshift/perl:5.26\" should print the usage", - "[Top Level] [sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"registry.redhat.io/rhscl/php-72-rhel7\" should print the usage": "\"registry.redhat.io/rhscl/php-72-rhel7\" should print the usage", + "[Top Level] [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.2-ubi8\" should print the usage": "\"image-registry.openshift-image-registry.svc:5000/openshift/php:7.2-ubi8\" should print the usage", - "[Top Level] [sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"registry.redhat.io/rhscl/php-73-rhel7\" should print the usage": "\"registry.redhat.io/rhscl/php-73-rhel7\" should print the usage", + "[Top Level] [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\" should print the usage": "\"image-registry.openshift-image-registry.svc:5000/openshift/php:7.3\" should print the usage", - "[Top Level] [sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"registry.redhat.io/rhscl/python-27-rhel7\" should print the usage": "\"registry.redhat.io/rhscl/python-27-rhel7\" should print the usage", + "[Top Level] [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\" should print the usage": "\"image-registry.openshift-image-registry.svc:5000/openshift/python:2.7\" should print the usage", - "[Top Level] [sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"registry.redhat.io/rhscl/python-36-rhel7\" should print the usage": "\"registry.redhat.io/rhscl/python-36-rhel7\" should print the usage", + "[Top Level] [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": "\"image-registry.openshift-image-registry.svc:5000/openshift/python:3.6-ubi8\" should print the usage", - "[Top Level] [sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"registry.redhat.io/rhscl/ruby-26-rhel7\" should print the usage": "\"registry.redhat.io/rhscl/ruby-26-rhel7\" should print the usage", + "[Top Level] [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.6\" should print the usage": "\"image-registry.openshift-image-registry.svc:5000/openshift/ruby:2.6\" should print the usage", - "[Top Level] [sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"registry.redhat.io/rhscl/ruby-27-rhel7\" should print the usage": "\"registry.redhat.io/rhscl/ruby-27-rhel7\" should print the usage", + "[Top Level] [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.7\" should print the usage": "\"image-registry.openshift-image-registry.svc:5000/openshift/ruby:2.7\" should print the usage", - "[Top Level] [sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled using the SCL in s2i images \"registry.redhat.io/rhscl/nodejs-10-rhel7\" should be SCL enabled": "\"registry.redhat.io/rhscl/nodejs-10-rhel7\" should be SCL enabled", + "[Top Level] [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:10\" should be SCL enabled": "\"image-registry.openshift-image-registry.svc:5000/openshift/nodejs:10\" should be SCL enabled", - "[Top Level] [sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled using the SCL in s2i images \"registry.redhat.io/rhscl/nodejs-12-rhel7\" should be SCL enabled": "\"registry.redhat.io/rhscl/nodejs-12-rhel7\" should be SCL enabled", + "[Top Level] [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:12\" should be SCL enabled": "\"image-registry.openshift-image-registry.svc:5000/openshift/nodejs:12\" should be SCL enabled", - "[Top Level] [sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled using the SCL in s2i images \"registry.redhat.io/rhscl/perl-526-rhel7\" should be SCL enabled": "\"registry.redhat.io/rhscl/perl-526-rhel7\" should be SCL enabled", + "[Top Level] [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\" should be SCL enabled": "\"image-registry.openshift-image-registry.svc:5000/openshift/perl:5.26\" should be SCL enabled", - "[Top Level] [sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled using the SCL in s2i images \"registry.redhat.io/rhscl/php-72-rhel7\" should be SCL enabled": "\"registry.redhat.io/rhscl/php-72-rhel7\" should be SCL enabled", + "[Top Level] [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.2-ubi8\" should be SCL enabled": "\"image-registry.openshift-image-registry.svc:5000/openshift/php:7.2-ubi8\" should be SCL enabled", - "[Top Level] [sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled using the SCL in s2i images \"registry.redhat.io/rhscl/php-73-rhel7\" should be SCL enabled": "\"registry.redhat.io/rhscl/php-73-rhel7\" should be SCL enabled", + "[Top Level] [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\" should be SCL enabled": "\"image-registry.openshift-image-registry.svc:5000/openshift/php:7.3\" should be SCL enabled", - "[Top Level] [sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled using the SCL in s2i images \"registry.redhat.io/rhscl/python-27-rhel7\" should be SCL enabled": "\"registry.redhat.io/rhscl/python-27-rhel7\" should be SCL enabled", + "[Top Level] [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\" should be SCL enabled": "\"image-registry.openshift-image-registry.svc:5000/openshift/python:2.7\" should be SCL enabled", - "[Top Level] [sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled using the SCL in s2i images \"registry.redhat.io/rhscl/python-36-rhel7\" should be SCL enabled": "\"registry.redhat.io/rhscl/python-36-rhel7\" should be SCL enabled", + "[Top Level] [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": "\"image-registry.openshift-image-registry.svc:5000/openshift/python:3.6-ubi8\" should be SCL enabled", - "[Top Level] [sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled using the SCL in s2i images \"registry.redhat.io/rhscl/ruby-26-rhel7\" should be SCL enabled": "\"registry.redhat.io/rhscl/ruby-26-rhel7\" should be SCL enabled", + "[Top Level] [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.6\" should be SCL enabled": "\"image-registry.openshift-image-registry.svc:5000/openshift/ruby:2.6\" should be SCL enabled", - "[Top Level] [sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled using the SCL in s2i images \"registry.redhat.io/rhscl/ruby-27-rhel7\" should be SCL enabled": "\"registry.redhat.io/rhscl/ruby-27-rhel7\" should be SCL enabled", + "[Top Level] [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.7\" should be SCL enabled": "\"image-registry.openshift-image-registry.svc:5000/openshift/ruby:2.7\" should be SCL enabled", "[Top Level] [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": "should build a nodejs-postgresql image and run it in a pod",