Skip to content

Always test against default distribution when in a FIPS JVM #51273

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 3 commits into from
Jan 22, 2020
Merged

Always test against default distribution when in a FIPS JVM #51273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
24543c1
Always test against default distribution when in a FIPS JVM
mark-vieira Jan 21, 2020
7297d53
Merge branch 'master' into force-default-distro-fips
elasticmachine Jan 21, 2020
dcabd87
Use consistent case for enum values
mark-vieira Jan 21, 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
2 changes: 2 additions & 0 deletions buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import org.elasticsearch.gradle.precommit.PrecommitTasks
import org.elasticsearch.gradle.test.ErrorReportingTestListener
import org.elasticsearch.gradle.testclusters.ElasticsearchCluster
import org.elasticsearch.gradle.testclusters.TestClustersPlugin
import org.elasticsearch.gradle.testclusters.TestDistribution
import org.elasticsearch.gradle.tool.Boilerplate
import org.gradle.api.Action
import org.gradle.api.GradleException
Expand Down Expand Up @@ -159,6 +160,7 @@ class BuildPlugin implements Plugin<Project> {
for (File dep : project.getConfigurations().getByName("extraJars").getFiles()){
cluster.extraJarFile(dep)
}
cluster.setTestDistribution(TestDistribution.DEFAULT)
cluster.extraConfigFile("fips_java.security", securityProperties)
cluster.extraConfigFile("fips_java.policy", securityPolicy)
cluster.extraConfigFile("cacerts.bcfks", bcfksKeystore)
Expand Down
4 changes: 3 additions & 1 deletion plugins/examples/painless-whitelist/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
import org.elasticsearch.gradle.info.BuildParams

apply plugin: 'elasticsearch.testclusters'
apply plugin: 'elasticsearch.esplugin'

Expand All @@ -33,7 +35,7 @@ dependencies {
}

testClusters.integTest {
testDistribution = 'oss'
testDistribution = BuildParams.inFipsJvm ? 'DEFAULT' : 'OSS'
}

test.enabled = false