Skip to content

Enable krb5kdc-fixture, kerberos tests mount urandom for kdc container #41710

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
bizybot merged 11 commits into from
Jun 13, 2019
Merged

Enable krb5kdc-fixture, kerberos tests mount urandom for kdc container #41710

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b7a3106
Enable krb5kdc-fixture, kerberos tests mount urandom for kdc container
May 1, 2019
56a4c96
check if marking nonInputProperties for lazy-evaluated properties works
May 2, 2019
03e6fcd
Merge branch 'master' into fix/40624
May 2, 2019
662a2d6
Merge branch 'master' into fix/40624
May 15, 2019
56fdddc
Merge branch 'master' into fix/40624
May 29, 2019
449dd73
set data node address to find suitable port as locally it failed to b…
May 31, 2019
df76070
for debug
May 31, 2019
7ce8832
check if hdfs fixture is ready
May 31, 2019
e15b34e
Merge branch 'master' into fix/40624
Jun 12, 2019
ccc2057
disable hdfs tests
Jun 12, 2019
527958e
add comment
Jun 12, 2019
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
6 changes: 3 additions & 3 deletions plugins/repository-hdfs/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,10 +122,10 @@ for (String integTestTaskName : ['integTestHa', 'integTestSecure', 'integTestSec
runner {
if (integTestTaskName.contains("Secure")) {
dependsOn secureHdfsFixture
systemProperty "test.krb5.principal.es", "elasticsearch@${realm}"
systemProperty "test.krb5.principal.hdfs", "hdfs/hdfs.build.elastic.co@${realm}"
nonInputProperties.systemProperty "test.krb5.principal.es", "elasticsearch@${realm}"
nonInputProperties.systemProperty "test.krb5.principal.hdfs", "hdfs/hdfs.build.elastic.co@${realm}"
jvmArgs "-Djava.security.krb5.conf=${krb5conf}"
systemProperty (
nonInputProperties.systemProperty (
"test.krb5.keytab.hdfs",
project(':test:fixtures:krb5kdc-fixture').ext.krb5Keytabs("hdfs","hdfs_hdfs.build.elastic.co.keytab")
)
Expand Down
3 changes: 1 addition & 2 deletions test/fixtures/krb5kdc-fixture/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,7 @@ postProcessFixture {
}
}

// https://github.com/elastic/elasticsearch/issues/40624
buildFixture.enabled = false
buildFixture.enabled = true

project.ext.krb5Conf = { service -> file("$buildDir/shared/${service}/krb5.conf") }
project.ext.krb5Keytabs = { service, fileName -> file("$buildDir/shared/${service}/keytabs/${fileName}") }
Expand Down
2 changes: 2 additions & 0 deletions test/fixtures/krb5kdc-fixture/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ services:
command: "bash /fixture/src/main/resources/provision/peppa.sh"
volumes:
- ./build/shared/peppa:/fixture/build
- /dev/urandom:/dev/random
Copy link
Contributor

@alpar-t alpar-t May 2, 2019

Choose a reason for hiding this comment

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

Maybe worth to add a comment as to why this is necessary, it resembles a typo on first glance.

ports:
- "4444"
- "88/udp"
Expand All @@ -19,6 +20,7 @@ services:
command: "bash /fixture/src/main/resources/provision/hdfs.sh"
volumes:
- ./build/shared/hdfs:/fixture/build
- /dev/urandom:/dev/random
ports:
- "4444"
- "88/udp"
9 changes: 4 additions & 5 deletions x-pack/qa/kerberos-tests/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ apply plugin: 'elasticsearch.test.fixtures'

testFixtures.useFixture ":test:fixtures:krb5kdc-fixture"

// https://github.com/elastic/elasticsearch/issues/40624
integTest.enabled = false
integTest.enabled = true

dependencies {
testCompile "org.elasticsearch.plugin:x-pack-core:${version}"
Expand Down Expand Up @@ -56,9 +55,9 @@ integTestCluster {
String realm = "BUILD.ELASTIC.CO"
integTestRunner {
Path peppaKeytab = Paths.get("${project.buildDir}", "generated-resources", "keytabs", "peppa.keytab")
systemProperty 'test.userkt', "peppa@${realm}"
systemProperty 'test.userkt.keytab', "${peppaKeytab}"
systemProperty 'test.userpwd', "george@${realm}"
nonInputProperties.systemProperty 'test.userkt', "peppa@${realm}"
nonInputProperties.systemProperty 'test.userkt.keytab', "${peppaKeytab}"
nonInputProperties.systemProperty 'test.userpwd', "george@${realm}"
systemProperty 'test.userpwd.password', "dino"
systemProperty 'tests.security.manager', 'true'
jvmArgs([
Expand Down