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

[full-ci] Switch UI tests to graphApi #3594

Merged
merged 8 commits into from
Apr 29, 2022
Merged

[full-ci] Switch UI tests to graphApi #3594

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
578e836
use ocis server in UI test and use middleware with changings
ScharfViktor Apr 27, 2022
8bee256
back to default middleware
ScharfViktor Apr 27, 2022
536c753
Update .drone.star
ScharfViktor Apr 27, 2022
b72ea41
run tests with my middleware image
ScharfViktor Apr 29, 2022
5ec603b
Merge branch 'master' into switchUiTestToGraphApi
ScharfViktor Apr 29, 2022
30b7c42
use web commitId
ScharfViktor Apr 29, 2022
7a592b2
change middleware version and web commit
ScharfViktor Apr 29, 2022
3226066
back to webcommitID and add failed test to expected failures
ScharfViktor Apr 29, 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
2 changes: 1 addition & 1 deletion .drone.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ CORE_COMMITID=b262ada63569e241f9cee451c23f267512fd48b2
CORE_BRANCH=master

# The test runner source for UI tests
WEB_COMMITID=41c62d459c4e7bc4a04367eb80f45a8c29aa3baa
WEB_COMMITID=8420a49515254e17654ea9a32ba611696bf461b6
ScharfViktor marked this conversation as resolved.
Show resolved Hide resolved
WEB_BRANCH=master
5 changes: 3 additions & 2 deletions .drone.star
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ OC_CI_NODEJS = "owncloudci/nodejs:%s"
OC_CI_PHP = "owncloudci/php:%s"
OC_CI_WAIT_FOR = "owncloudci/wait-for:latest"
OC_CS3_API_VALIDATOR = "owncloud/cs3api-validator:latest"
OC_OC_TEST_MIDDLEWARE = "owncloud/owncloud-test-middleware:1.5.0"
OC_OC_TEST_MIDDLEWARE = "owncloud/owncloud-test-middleware:1.6.0"
OC_SERVER = "owncloud/server:10"
OC_UBUNTU = "owncloud/ubuntu:18.04"
OSIXIA_OPEN_LDAP = "osixia/openldap:latest"
Expand Down Expand Up @@ -698,7 +698,7 @@ def uiTestPipeline(ctx, filterTags, early_fail, runPart = 1, numberOfParts = 1,
"arch": "amd64",
},
"steps": skipIfUnchanged(ctx, "acceptance-tests") + restoreBuildArtifactCache(ctx, "ocis-binary-amd64", "ocis/bin/ocis") +
ocisServerWithAccounts(storage, accounts_hash_difficulty, [stepVolumeOC10Tests]) + waitForSeleniumService() + waitForMiddlewareService() + [
ocisServer(storage, accounts_hash_difficulty, [stepVolumeOC10Tests]) + waitForSeleniumService() + waitForMiddlewareService() + [
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since ocisServerWithAccounts isn't being used anywhere else anymore I think you can also delete the function from the CI file?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, this can go a away. But IMO it's also fine to do this in a separate PR (if CI succeeds now)

{
"name": "webUITests",
"image": OC_CI_NODEJS % DEFAULT_NODEJS_VERSION,
Expand Down Expand Up @@ -1845,6 +1845,7 @@ def middlewareService():
"REMOTE_UPLOAD_DIR": "/uploads",
"NODE_TLS_REJECT_UNAUTHORIZED": "0",
"MIDDLEWARE_HOST": "middleware",
"TEST_WITH_GRAPH_API": "true",
},
"volumes": [{
"name": "uploads",
Expand Down