-
Notifications
You must be signed in to change notification settings - Fork 25k
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.
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
[test] add java packaging test project #30161
Changes from 1 commit
3a9f05f
2fac7f5
67a17a3
91804a3
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -44,6 +44,7 @@ class VagrantTestPlugin implements Plugin<Project> { | |
static List<String> UPGRADE_FROM_ARCHIVES = ['rpm', 'deb'] | ||
|
||
private static final PACKAGING_CONFIGURATION = 'packaging' | ||
private static final PACKAGING_TEST_CONFIGURATION = 'packagingTest' | ||
private static final BATS = 'bats' | ||
private static final String BATS_TEST_COMMAND ="cd \$PACKAGING_ARCHIVES && sudo bats --tap \$BATS_TESTS/*.$BATS" | ||
private static final String PLATFORM_TEST_COMMAND ="rm -rf ~/elasticsearch && rsync -r /elasticsearch/ ~/elasticsearch && cd ~/elasticsearch && ./gradlew test integTest" | ||
|
@@ -59,6 +60,7 @@ class VagrantTestPlugin implements Plugin<Project> { | |
|
||
// Creates custom configurations for Bats testing files (and associated scripts and archives) | ||
createPackagingConfiguration(project) | ||
project.configurations.create(PACKAGING_TEST_CONFIGURATION) | ||
|
||
// Creates all the main Vagrant tasks | ||
createVagrantTasks(project) | ||
|
@@ -142,10 +144,12 @@ class VagrantTestPlugin implements Plugin<Project> { | |
} | ||
|
||
private static void createCleanTask(Project project) { | ||
project.tasks.create('clean', Delete.class) { | ||
description 'Clean the project build directory' | ||
group 'Build' | ||
delete project.buildDir | ||
if (project.tasks.findByName('clean') == null) { | ||
project.tasks.create('clean', Delete.class) { | ||
description 'Clean the project build directory' | ||
group 'Build' | ||
delete project.buildDir | ||
} | ||
} | ||
} | ||
|
||
|
@@ -172,6 +176,19 @@ class VagrantTestPlugin implements Plugin<Project> { | |
from project.configurations[PACKAGING_CONFIGURATION] | ||
} | ||
|
||
File testsDir = new File(packagingDir, 'tests') | ||
Copy copyPackagingTests = project.tasks.create('copyPackagingTests', Copy) { | ||
into testsDir | ||
from project.configurations[PACKAGING_TEST_CONFIGURATION] | ||
} | ||
|
||
Task createTestRunnerScript = project.tasks.create('createTestRunnerScript', FileContentsTask) { | ||
dependsOn copyPackagingTests | ||
file "${testsDir}/run-tests.sh" | ||
contents "java -cp \"*\" org.junit.runner.JUnitCore ${-> project.extensions.esvagrant.testClass}" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Should this have a shebang line? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Alternatively, if we just always run as There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yeah running with |
||
executable true | ||
} | ||
|
||
Task createVersionFile = project.tasks.create('createVersionFile', FileContentsTask) { | ||
dependsOn copyPackagingArchives | ||
file "${archivesDir}/version" | ||
|
@@ -232,7 +249,8 @@ class VagrantTestPlugin implements Plugin<Project> { | |
|
||
Task vagrantSetUpTask = project.tasks.create('setupPackagingTest') | ||
vagrantSetUpTask.dependsOn 'vagrantCheckVersion' | ||
vagrantSetUpTask.dependsOn copyPackagingArchives, createVersionFile, createUpgradeFromFile, createUpgradeIsOssFile | ||
vagrantSetUpTask.dependsOn copyPackagingArchives, copyPackagingTests, createTestRunnerScript | ||
vagrantSetUpTask.dependsOn createVersionFile, createUpgradeFromFile, createUpgradeIsOssFile | ||
vagrantSetUpTask.dependsOn copyBatsTests, copyBatsUtils | ||
} | ||
|
||
|
@@ -391,20 +409,29 @@ class VagrantTestPlugin implements Plugin<Project> { | |
packagingTest.dependsOn(batsPackagingTest) | ||
} | ||
|
||
// This task doesn't do anything yet. In the future it will execute a jar containing tests on the vm | ||
Task groovyPackagingTest = project.tasks.create("vagrant${boxTask}#groovyPackagingTest") | ||
groovyPackagingTest.dependsOn(up) | ||
groovyPackagingTest.finalizedBy(halt) | ||
Task javaPackagingTest = project.tasks.create("vagrant${boxTask}#javaPackagingTest", VagrantCommandTask) { | ||
command 'ssh' | ||
boxName box | ||
environmentVars vagrantEnvVars | ||
dependsOn up, setupPackagingTest | ||
finalizedBy halt | ||
args '--command', "cd \$PACKAGING_TESTS && ./run-tests.sh" | ||
} | ||
|
||
// todo remove this onlyIf after all packaging tests are consolidated | ||
javaPackagingTest.onlyIf { | ||
project.extensions.esvagrant.testClass != null | ||
} | ||
|
||
TaskExecutionAdapter groovyPackagingReproListener = createReproListener(project, groovyPackagingTest.path) | ||
groovyPackagingTest.doFirst { | ||
project.gradle.addListener(groovyPackagingReproListener) | ||
TaskExecutionAdapter javaPackagingReproListener = createReproListener(project, javaPackagingTest.path) | ||
javaPackagingTest.doFirst { | ||
project.gradle.addListener(javaPackagingReproListener) | ||
} | ||
groovyPackagingTest.doLast { | ||
project.gradle.removeListener(groovyPackagingReproListener) | ||
javaPackagingTest.doLast { | ||
project.gradle.removeListener(javaPackagingReproListener) | ||
} | ||
if (project.extensions.esvagrant.boxes.contains(box)) { | ||
packagingTest.dependsOn(groovyPackagingTest) | ||
packagingTest.dependsOn(javaPackagingTest) | ||
} | ||
|
||
Task platform = project.tasks.create("vagrant${boxTask}#platformTest", VagrantCommandTask) { | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,5 @@ | ||
import org.elasticsearch.gradle.precommit.PrecommitTasks | ||
|
||
/* | ||
* Licensed to Elasticsearch under one or more contributor | ||
* license agreements. See the NOTICE file distributed with | ||
|
@@ -17,8 +19,23 @@ | |
* under the License. | ||
*/ | ||
|
||
apply plugin: 'elasticsearch.vagrantsupport' | ||
apply plugin: 'elasticsearch.vagrant' | ||
plugins { | ||
id 'java' | ||
id 'elasticsearch.build' | ||
id 'elasticsearch.vagrantsupport' | ||
id 'elasticsearch.vagrant' | ||
} | ||
|
||
dependencies { | ||
compile "junit:junit:${versions.junit}" | ||
compile "org.hamcrest:hamcrest-core:${versions.hamcrest}" | ||
|
||
// needs to be on the classpath for JarHell | ||
runtime project(':libs:elasticsearch-core') | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Shouldn't this just be testRuntime? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yeah that makes sense, but it's going to change to |
||
|
||
// pulls in the jar built by this project and its dependencies | ||
packagingTest project(path: project.path, configuration: 'runtime') | ||
} | ||
|
||
List<String> plugins = [] | ||
for (Project subproj : project.rootProject.subprojects) { | ||
|
@@ -39,3 +56,20 @@ setupPackagingTest { | |
expectedPlugins.setText(plugins.join('\n'), 'UTF-8') | ||
} | ||
} | ||
|
||
esvagrant { | ||
testClass 'org.elasticsearch.packaging.PackagingTests' | ||
} | ||
|
||
forbiddenApisMain { | ||
signaturesURLs = [ | ||
PrecommitTasks.getResource('/forbidden/jdk-signatures.txt') | ||
] | ||
} | ||
|
||
// we don't have additional tests for the tests themselves | ||
tasks.test.enabled = false | ||
|
||
// this project doesn't get published | ||
tasks.dependencyLicenses.enabled = false | ||
tasks.dependenciesInfo.enabled = false |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
/* | ||
* Licensed to Elasticsearch under one or more contributor | ||
* license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright | ||
* ownership. Elasticsearch licenses this file to you under | ||
* the Apache License, Version 2.0 (the "License"); you may | ||
* not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, | ||
* software distributed under the License is distributed on an | ||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
* KIND, either express or implied. See the License for the | ||
* specific language governing permissions and limitations | ||
* under the License. | ||
*/ | ||
|
||
package org.elasticsearch.packaging; | ||
|
||
import org.junit.Test; | ||
|
||
/** | ||
* This class doesn't have any tests yet | ||
*/ | ||
public class PackagingTests { | ||
|
||
@Test | ||
public void testDummy() {} | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In what case will this already be created? Can we rely on it already being created and remove this altogether?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The java plugin also adds a clean task, and it complains when we try to add another one. My thinking was that I didn't want to bake in the expectation that the project vagrant test plugin is applied to is also a java project. For example
:x-pack:qa:vagrant
has the vagrant test plugin but not the java pluginThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hmmm. Maybe maybe it'd be simpler to create a noop java test in there in this PR instead of doing this? I imagine we'll want to make java tests in there eventually anyway.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I believe we're going to put all the java packaging tests (including x-pack) into
:qa:vagrant
, and once all the bats tests are ported we can remove:x-pack:qa:vagrant
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah. That makes sense to me.