Skip to content

OCPQE-8067: Fix buildapi test cases #2611

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
Jan 5, 2022
Merged

OCPQE-8067: Fix buildapi test cases #2611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0630b0a
Fix OCP-11139: using rhel8 postgresql multiarch image
aleskandro Jan 5, 2022
e34f7c1
Fixes OCP-12115
aleskandro Jan 5, 2022
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: 2 additions & 2 deletions features/cli/build.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ Feature: build 'apps' with CLI
Given I create a new project
When I run the :new_app client command with:
| image_stream | openshift/mysql |
| image | registry.access.redhat.com/rhscl/postgresql-96-rhel7 |
| image | registry.redhat.io/rhel8/postgresql-12 |
| env | POSTGRESQL_USER=user |
| env | POSTGRESQL_DATABASE=db |
| env | POSTGRESQL_PASSWORD=test |
Expand All @@ -160,7 +160,7 @@ Feature: build 'apps' with CLI
Then the step should succeed
"""
And the output should contain "mysql"
Given I wait for the "postgresql-96-rhel7" service to become ready up to 300 seconds
Given I wait for the "postgresql-12" service to become ready up to 300 seconds
And I get the service pods
And I wait up to 120 seconds for the steps to pass:
"""
Expand Down
6 changes: 3 additions & 3 deletions testdata/build/ruby20rhel7-context-docker.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
"creationTimestamp": null
},
"spec": {
"dockerImageRepository": "registry.access.redhat.com/rhscl/ruby-22-rhel7"
"dockerImageRepository": "quay.io/openshifttest/ruby-27"
},
"status": {
"dockerImageRepository": ""
Expand Down Expand Up @@ -116,7 +116,7 @@
"source": {
"type": "Git",
"git": {
"uri": "https://github.com/openshift-qe/ruby-hello-world-context.git"
"uri": "https://github.com/openshift/ruby-hello-world"
},
"contextDir": "test"
},
Expand All @@ -125,7 +125,7 @@
"dockerStrategy": {
"from": {
"kind": "DockerImage",
"name": "registry.access.redhat.com/rhscl/ruby-22-rhel7:latest"
"name": "quay.io/openshifttest/ruby-27:multiarch"
},
"env": [
{
Expand Down