Skip to content

Bug 1949928: Remove references to EOL ImageStream Tags #26082

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-robot merged 2 commits into from
Apr 17, 2021
Merged

Bug 1949928: Remove references to EOL ImageStream Tags #26082

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
73c5f03
Bug 1949928: Remove references to EOL Image tags
adambkaplan Apr 15, 2021
db5d21e
cmd: remove reference to EOL perl image
adambkaplan Apr 16, 2021
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
4 changes: 0 additions & 4 deletions cmd/openshift-tests/minimal.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,19 +333,15 @@ var (
"[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": {},
"[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": {},
"[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\" 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\" 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:12\" 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:10\" should be SCL enabled": {},
"[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": {},
"[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": {},
"[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:2.7\" 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\" 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.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/perl:5.30\" 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\" 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:12\" 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:10\" should print the usage": {},
"[sig-cluster-lifecycle][Feature:Machines] Managed cluster should have machine resources [Suite:openshift/conformance/parallel]": {},
"[sig-cli] oc observe works as expected [Suite:openshift/conformance/parallel]": {},
"[sig-cli] oc debug does not require a real resource on the server [Suite:openshift/conformance/parallel]": {},
Expand Down
22 changes: 0 additions & 22 deletions examples/image-streams/image-streams-centos7.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -610,28 +610,6 @@
"referencePolicy": {
"type": "Local"
}
},
{
"name": "5.26-ubi8",
"annotations": {
"description": "Build and run Perl 5.26 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-perl-container/blob/master/5.26-mod_fcgid/README.md.",
"iconClass": "icon-perl",
"openshift.io/display-name": "Perl 5.26 (UBI 8)",
"openshift.io/provider-display-name": "Red Hat, Inc.",
"sampleRepo": "https://github.com/sclorg/dancer-ex.git",
"supports": "perl:5.26,perl",
"tags": "builder,perl",
"version": "5.26"
},
"from": {
"kind": "DockerImage",
"name": "registry.access.redhat.com/ubi8/perl-526:latest"
},
"generation": null,
"importPolicy": {},
"referencePolicy": {
"type": "Local"
}
}
]
}
Expand Down
2 changes: 1 addition & 1 deletion examples/quickstarts/dancer-mysql-persistent.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
],
"from": {
"kind": "ImageStreamTag",
"name": "perl:5.26-ubi8",
"name": "perl:5.30-ubi8",
"namespace": "${NAMESPACE}"
}
},
Expand Down
2 changes: 1 addition & 1 deletion examples/quickstarts/dancer-mysql.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
],
"from": {
"kind": "ImageStreamTag",
"name": "perl:5.26-ubi8",
"name": "perl:5.30-ubi8",
"namespace": "${NAMESPACE}"
}
},
Expand Down
2 changes: 1 addition & 1 deletion examples/quickstarts/rails-postgresql-persistent.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,7 @@
],
"from": {
"kind": "ImageStreamTag",
"name": "postgresql:10",
"name": "postgresql:12",
"namespace": "${NAMESPACE}"
}
},
Expand Down
4 changes: 2 additions & 2 deletions examples/quickstarts/rails-postgresql.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
],
"from": {
"kind": "ImageStreamTag",
"name": "ruby:2.5",
"name": "ruby:2.7",
"namespace": "${NAMESPACE}"
}
},
Expand Down Expand Up @@ -442,7 +442,7 @@
],
"from": {
"kind": "ImageStreamTag",
"name": "postgresql:10",
"name": "postgresql:12",
"namespace": "${NAMESPACE}"
}
},
Expand Down
62 changes: 8 additions & 54 deletions test/extended/testdata/bindata.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion test/extended/testdata/builds/pullsecret/linked-nodejs-bc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ spec:
sourceStrategy:
from:
kind: DockerImage
name: image-registry.openshift-image-registry.svc:5000/openshift/nodejs:10
name: image-registry.openshift-image-registry.svc:5000/openshift/nodejs:latest
2 changes: 1 addition & 1 deletion test/extended/testdata/cluster/quickstarts/dancer-mysql.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
],
"from": {
"kind": "ImageStreamTag",
"name": "perl:5.26-ubi8",
"name": "perl:5.30-ubi8",
"namespace": "${NAMESPACE}"
}
},
Expand Down
2 changes: 1 addition & 1 deletion test/extended/testdata/cluster/quickstarts/rails-postgresql.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@
],
"from": {
"kind": "ImageStreamTag",
"name": "postgresql:10",
"name": "postgresql:12",
"namespace": "${NAMESPACE}"
}
},
Expand Down
2 changes: 0 additions & 2 deletions test/extended/testdata/cmd/test/cmd/newapp.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,11 +342,9 @@ os::cmd::try_until_success 'oc get imagestreamtags nginx:latest'
os::cmd::try_until_success 'oc get imagestreamtags nginx:1.14'
os::cmd::try_until_success 'oc get imagestreamtags nginx:1.16'
os::cmd::try_until_success 'oc get imagestreamtags nodejs:latest'
os::cmd::try_until_success 'oc get imagestreamtags nodejs:10'
os::cmd::try_until_success 'oc get imagestreamtags nodejs:12'
os::cmd::try_until_success 'oc get imagestreamtags perl:latest'
os::cmd::try_until_success 'oc get imagestreamtags perl:5.30'
os::cmd::try_until_success 'oc get imagestreamtags perl:5.26-ubi8'
os::cmd::try_until_success 'oc get imagestreamtags php:latest'
os::cmd::try_until_success 'oc get imagestreamtags php:7.0'
os::cmd::try_until_success 'oc get imagestreamtags php:7.1'
Expand Down
22 changes: 0 additions & 22 deletions test/extended/testdata/cmd/test/cmd/testdata/image-streams/image-streams-centos7.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -610,28 +610,6 @@
"referencePolicy": {
"type": "Local"
}
},
{
"name": "5.26-ubi8",
"annotations": {
"description": "Build and run Perl 5.26 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-perl-container/blob/master/5.26-mod_fcgid/README.md.",
"iconClass": "icon-perl",
"openshift.io/display-name": "Perl 5.26 (UBI 8)",
"openshift.io/provider-display-name": "Red Hat, Inc.",
"sampleRepo": "https://github.com/sclorg/dancer-ex.git",
"supports": "perl:5.26,perl",
"tags": "builder,perl",
"version": "5.26"
},
"from": {
"kind": "DockerImage",
"name": "registry.access.redhat.com/ubi8/perl-526:latest"
},
"generation": null,
"importPolicy": {},
"referencePolicy": {
"type": "Local"
}
}
]
}
Expand Down