Skip to content
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

Jump to bottom

Revert "OCPBUGS-39373: Use a supported Perl version in the test template." #29105

Merged
merged 1 commit into from
Sep 16, 2024
Merged

Revert "OCPBUGS-39373: Use a supported Perl version in the test template." #29105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 14 additions & 15 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.

4 changes: 2 additions & 2 deletions 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 @@ -424,7 +424,7 @@
"name": "PERL_VERSION",
"displayName": "Version of Perl Image",
"description": "Version of Perl image to be used (5.30-el7, 5.30-ubi8, or latest).",
"value": "5.32-ubi8",
"value": "5.30-ubi8",
"required": true
},
{
Expand Down Expand Up @@ -522,4 +522,4 @@
"app": "dancer-mysql-example",
"template": "dancer-mysql-example"
}
}
}
12 changes: 6 additions & 6 deletions test/extended/testdata/cmd/test/cmd/images.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,12 +290,12 @@ os::test::junit::declare_suite_end

os::test::junit::declare_suite_start "cmd/images${IMAGES_TESTS_POSTFIX:-}/delete-istag"
# test deleting a tag using oc delete
os::cmd::expect_success_and_text "oc get is perl --template '{{(index .spec.tags 0).name}}'" '5.32-'
os::cmd::expect_success_and_text "oc get is perl --template '{{(index .status.tags 0).tag}}'" '5.32-'
os::cmd::expect_success_and_text "oc describe is perl | sed -n -e '0,/^Tags:/d' -e '/^\s\+/d' -e '/./p' | head -n 1" '5.32-'
os::cmd::expect_success "oc delete istag/perl:5.32-el8 --context='${cluster_admin_context}'"
os::cmd::expect_success_and_not_text 'oc get is/perl --template={{.spec.tags}}' 'name:5.32-el8'
os::cmd::expect_success_and_not_text 'oc get is/perl --template={{.status.tags}}' 'tag:5.32-el8'
os::cmd::expect_success_and_text "oc get is perl --template '{{(index .spec.tags 0).name}}'" '5.30-'
os::cmd::expect_success_and_text "oc get is perl --template '{{(index .status.tags 0).tag}}'" '5.30-'
os::cmd::expect_success_and_text "oc describe is perl | sed -n -e '0,/^Tags:/d' -e '/^\s\+/d' -e '/./p' | head -n 1" '5.30-'
os::cmd::expect_success "oc delete istag/perl:5.30-el7 --context='${cluster_admin_context}'"
os::cmd::expect_success_and_not_text 'oc get is/perl --template={{.spec.tags}}' 'name:5.30-el7'
os::cmd::expect_success_and_not_text 'oc get is/perl --template={{.status.tags}}' 'tag:5.30-el7'
os::cmd::expect_success 'oc delete all --all'

echo "delete istag: ok"
Expand Down
12 changes: 6 additions & 6 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 @@ -502,20 +502,20 @@
}
},
{
"name": "5.32-el8",
"name": "5.30-el7",
"annotations": {
"description": "Build and run Perl 5.32 applications on CentOS 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-perl-container/blob/master/5.30/README.md.",
"description": "Build and run Perl 5.30 applications on CentOS 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-perl-container/blob/master/5.30/README.md.",
"iconClass": "icon-perl",
"openshift.io/display-name": "Perl 5.32 (CentOS 8)",
"openshift.io/display-name": "Perl 5.30 (CentOS 7)",
"openshift.io/provider-display-name": "Red Hat, Inc.",
"sampleRepo": "https://github.com/sclorg/dancer-ex.git",
"supports": "perl:5.32,perl",
"supports": "perl:5.30,perl",
"tags": "builder,perl",
"version": "5.32"
"version": "5.30"
},
"from": {
"kind": "DockerImage",
"name": "registry.redhat.io/ubi8/perl-532:latest"
"name": "quay.io/centos7/perl-530-centos7:centos7"
},
"generation": null,
"importPolicy": {},
Expand Down