File tree Expand file tree Collapse file tree 4 files changed +8
-1
lines changed
test/framework/src/main/java/org/elasticsearch/test/rest
plugin/security/qa/multi-project
core-rest-tests-with-multiple-projects
xpack-rest-tests-with-multiple-projects Expand file tree Collapse file tree 4 files changed +8
-1
lines changed Original file line number Diff line number Diff line change @@ -2794,7 +2794,7 @@ private Collection<String> getProjectIds(RestClient client) throws IOException {
27942794 protected void cleanUpProjects () throws IOException {
27952795 final var projectIds = getProjectIds (adminClient ());
27962796 for (String projectId : projectIds ) {
2797- if (projectId .equals (ProjectId .DEFAULT .id ())) {
2797+ if (projectId .equals (ProjectId .DEFAULT .id ()) || projectId . equals ( activeProject ) || extraProjects . contains ( projectId ) ) {
27982798 continue ;
27992799 }
28002800 deleteProject (projectId );
Original file line number Diff line number Diff line change @@ -8,3 +8,7 @@ tasks.named('javaRestTest') {
88 usesDefaultDistribution(" to be triaged" )
99 it. onlyIf(" snapshot build" ) { buildParams. snapshotBuild }
1010}
11+
12+ tasks. withType(Test ). configureEach {
13+ it. systemProperty " test.multi_project.enabled" , true
14+ }
Original file line number Diff line number Diff line change @@ -82,4 +82,6 @@ tasks.named("yamlRestTest").configure {
8282 blacklist + = [];
8383 }
8484 systemProperty ' tests.rest.blacklist' , blacklist. join(' ,' )
85+
86+ systemProperty " test.multi_project.enabled" , true
8587}
Original file line number Diff line number Diff line change @@ -164,4 +164,5 @@ tasks.named("yamlRestTest").configure {
164164 blacklist + = [];
165165 }
166166 systemProperty ' tests.rest.blacklist' , blacklist. join(' ,' )
167+ systemProperty " test.multi_project.enabled" , true
167168}
You can’t perform that action at this time.
0 commit comments