Skip to content

Run E2E tests on the external CI server #657

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
merged 2 commits into from
May 21, 2020
Merged

Run E2E tests on the external CI server #657

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
e2af509
Add E2E task
balhar-jakub May 20, 2020
f378371
Merge branch 'master' into rip/US654420/run_e2e_tests_externally
balhar-jakub May 20, 2020
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
7 changes: 7 additions & 0 deletions api-catalog-ui/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,13 @@ task runTests(type: NpmTask) {
args = ['run', 'test']
}

task runE2ETests(type: NpmTask, dependsOn: ':integration-tests:startUpCheck') {
group = 'integration tests'
description = "End to End Tests depending on the catalog ui"

args = ['run', 'cy:e2e:zowe-ci']
}


task bundle(type: NpmTask) {
inputs.dir('frontend/src').withPathSensitivity(PathSensitivity.RELATIVE)
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ task runIntegrationTestInstances(dependsOn: buildCore) {
}
}

task runCITests(dependsOn: [":integration-tests:runCITests", "runIntegrationTestInstances"]) {
task runCITests(dependsOn: [":integration-tests:runCITests", ":api-catalog-ui:runE2ETests", "runIntegrationTestInstances"]) {
description "Run Integration Test Without MF Dependencies"
group "Integration tests"
}
Expand Down
1 change: 1 addition & 0 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ nodejsVersion=8.11.1
projectRoot=${project.projectDir}

org.gradle.daemon=false
org.gradle.jvmargs=-Xmx1536m
org.gradle.parallel=true
org.gradle.caching=true
# Don't push in remote cache from local environments
Expand Down