Skip to content

Commit b7a3106

Browse files
author
Yogesh Gaikwad
committed
Enable krb5kdc-fixture, kerberos tests mount urandom for kdc container
Infra has fixed elastic#10462 by installing `haveged` on CI workers. This commit enables the disabled fixture and tests, and mounts `/dev/urandom` for the container so there is enough entropy required for kdc. Closes elastic#40624
1 parent 8e04f36 commit b7a3106

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

test/fixtures/krb5kdc-fixture/build.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,7 @@ postProcessFixture {
4747
}
4848
}
4949

50-
// https://github.com/elastic/elasticsearch/issues/40624
51-
buildFixture.enabled = false
50+
buildFixture.enabled = true
5251

5352
project.ext.krb5Conf = { service -> file("$buildDir/shared/${service}/krb5.conf") }
5453
project.ext.krb5Keytabs = { service, fileName -> file("$buildDir/shared/${service}/keytabs/${fileName}") }

test/fixtures/krb5kdc-fixture/docker-compose.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ services:
88
command: "bash /fixture/src/main/resources/provision/peppa.sh"
99
volumes:
1010
- ./build/shared/peppa:/fixture/build
11+
- /dev/urandom:/dev/random
1112
ports:
1213
- "4444"
1314
- "88/udp"
@@ -19,6 +20,7 @@ services:
1920
command: "bash /fixture/src/main/resources/provision/hdfs.sh"
2021
volumes:
2122
- ./build/shared/hdfs:/fixture/build
23+
- /dev/urandom:/dev/random
2224
ports:
2325
- "4444"
2426
- "88/udp"

x-pack/qa/kerberos-tests/build.gradle

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ apply plugin: 'elasticsearch.test.fixtures'
88

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

11-
// https://github.com/elastic/elasticsearch/issues/40624
12-
integTest.enabled = false
11+
integTest.enabled = true
1312

1413
dependencies {
1514
testCompile "org.elasticsearch.plugin:x-pack-core:${version}"
@@ -56,9 +55,9 @@ integTestCluster {
5655
String realm = "BUILD.ELASTIC.CO"
5756
integTestRunner {
5857
Path peppaKeytab = Paths.get("${project.buildDir}", "generated-resources", "keytabs", "peppa.keytab")
59-
systemProperty 'test.userkt', "peppa@${realm}"
60-
systemProperty 'test.userkt.keytab', "${peppaKeytab}"
61-
systemProperty 'test.userpwd', "george@${realm}"
58+
nonInputProperties.systemProperty 'test.userkt', "peppa@${realm}"
59+
nonInputProperties.systemProperty 'test.userkt.keytab', "${peppaKeytab}"
60+
nonInputProperties.systemProperty 'test.userpwd', "george@${realm}"
6261
systemProperty 'test.userpwd.password', "dino"
6362
systemProperty 'tests.security.manager', 'true'
6463
jvmArgs([

0 commit comments

Comments
 (0)