Skip to content

Commit e106cbe

Browse files
Jakub Sliacanopenshift-merge-robot
authored andcommitted
e2e: patch little issues in e2e tests
- Rephrase and update comments - Remove story_registry.feature and include it as a scenario in story_openshift.feature - Remove select skip-checks on Windows as they are not relevant during crc setup
1 parent 8e3791d commit e106cbe

File tree

3 files changed

+29
-51
lines changed

3 files changed

+29
-51
lines changed

test/e2e/features/config.feature

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -97,19 +97,20 @@ Feature: Test configuration settings
9797
@windows
9898
Examples:
9999
| property | value1 | value2 |
100-
| skip-check-administrator-user | true | false |
101100
| skip-check-bundle-extracted | true | false |
102-
| skip-check-hyperv-installed | true | false |
103-
| skip-check-hyperv-switch | true | false |
104101
| skip-check-user-in-hyperv-group | true | false |
105-
| skip-check-windows-version | true | false |
102+
103+
#| skip-check-hyperv-installed | true | false |
104+
#| skip-check-hyperv-switch | true | false |
105+
#| skip-check-administrator-user | true | false |
106+
#| skip-check-windows-version | true | false |
106107

107108
# --------------------------------------
108109
# Linux-specific Scenarios
109110

110111
@linux
111112
Scenario: Missing CRC setup
112-
Given executing single crc setup command succeeds
113+
Given executing crc setup command succeeds
113114
When executing "rm ~/.crc/bin/crc-driver-libvirt" succeeds
114115
Then starting CRC with default bundle fails
115116
And stderr should contain "Preflight checks failed during `crc start`, please try to run `crc setup` first in case you haven't done so yet"

test/e2e/features/story_openshift.feature

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Feature: 3 Openshift stories
55
Given ensuring CRC cluster is running succeeds
66
And ensuring user is logged in succeeds
77

8-
# Old: End-to-end health check
8+
# End-to-end health check
99

1010
@darwin @linux @windows @startstop @testdata
1111
Scenario: Overall cluster health
@@ -36,10 +36,28 @@ Feature: 3 Openshift stories
3636
Then with up to "4" retries with wait period of "1m" http response from "http://httpd-example-testproj.apps-crc.testing" has status code "200"
3737
And executing "oc delete project testproj" succeeds
3838

39-
# Old: Local image to image-registry feature
39+
# Local image to image-registry feature
4040

41-
@linux @testdata
42-
Scenario: Create local image, push to registry, deploy
41+
@darwin @linux @windows
42+
Scenario: Mirror image to OpenShift image registry (via oc registry login)
43+
# mirror
44+
When executing "oc new-project testproj-img" succeeds
45+
And executing "oc registry login --insecure=true" succeeds
46+
Then executing "oc image mirror registry.access.redhat.com/ubi8/httpd-24:latest=default-route-openshift-image-registry.apps-crc.testing/testproj-img/httpd-24:latest --insecure=true --filter-by-os=linux/amd64" succeeds
47+
And executing "oc set image-lookup httpd-24" succeeds
48+
# deploy
49+
When executing "oc new-app testproj-img/httpd-24:latest" succeeds
50+
When executing "oc rollout status deployment httpd-24" succeeds
51+
Then stdout should contain "successfully rolled out"
52+
When executing "oc get pods" succeeds
53+
Then stdout should contain "Running"
54+
When executing "oc logs deployment/httpd-24" succeeds
55+
Then stdout should contain "httpd"
56+
# cleanup
57+
And executing "oc delete project testproj-img" succeeds
58+
59+
@linux
60+
Scenario: Create local image, push to registry, deploy (via podman login)
4361
Given checking that CRC is running
4462
And executing "podman pull quay.io/centos7/httpd-24-centos7" succeeds
4563
When executing "oc new-project testproj-img" succeeds
@@ -53,14 +71,12 @@ Feature: 3 Openshift stories
5371
Then stdout should contain "Running"
5472
When executing "oc logs deployment/hello" succeeds
5573
Then stdout should contain "httpd"
56-
#And executing "podman image rm quay.io/bitnami/nginx" succeeds
5774
And executing "oc delete project testproj-img" succeeds
5875

59-
# Old: Operator from marketplace
76+
# Operator from marketplace
6077

6178
@darwin @linux @windows @testdata
6279
Scenario: Install new operator
63-
Given checking that CRC is running
6480
When executing "oc apply -f redis-sub.yaml" succeeds
6581
Then with up to "20" retries with wait period of "30s" command "oc get csv" output matches ".*redis-operator\.(.*)Succeeded$"
6682
# install redis operator

test/e2e/features/story_registry.feature

Lines changed: 0 additions & 39 deletions
This file was deleted.

0 commit comments

Comments
 (0)