Skip to content
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

Jump to bottom

Run some REST tests against a cluster running in docker containers #39515

Merged
merged 20 commits into from
Jul 11, 2019
Merged

Run some REST tests against a cluster running in docker containers #39515

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
36ad7e7
Run REST tests against a cluster running on docker
alpar-t Feb 28, 2019
0962587
Add missing dependency
alpar-t Mar 1, 2019
cf69ae3
Add x-pack tests, export logs
alpar-t Mar 1, 2019
0244955
Fix repo tests
alpar-t Mar 1, 2019
02278b6
Fix deprecation warnings
alpar-t Mar 1, 2019
012e88a
Fix task dependencies
alpar-t Mar 4, 2019
76f8ead
Merge remote-tracking branch 'origin/master' into docker-rest-test-38053
alpar-t Mar 4, 2019
ef0e33a
PR review
alpar-t Mar 6, 2019
ef8bbb8
PR review
alpar-t Mar 7, 2019
df7c5fb
Merge remote-tracking branch 'origin/master' into docker-rest-test-38053
alpar-t Mar 7, 2019
48eba36
Add distribution as input property
alpar-t Mar 7, 2019
5f6b3f8
Replace the full test run with a minimal check
alpar-t Mar 21, 2019
aa95613
Merge remote-tracking branch 'origin/master' into docker-rest-test-38053
alpar-t Mar 25, 2019
d6fa767
Merge remote-tracking branch 'origin/master' into docker-rest-test-38053
alpar-t Mar 25, 2019
d86c25d
PR review
alpar-t Mar 29, 2019
39b2597
Merge remote-tracking branch 'origin/master' into docker-rest-test-38053
alpar-t Mar 29, 2019
6794c14
Merge remote-tracking branch 'origin/master' into docker-rest-test-38053
alpar-t Apr 1, 2019
8d50f21
Merge remote-tracking branch 'origin/master' into docker-rest-test-38053
alpar-t Apr 12, 2019
4b785b8
Migrate to Gradle Test task
alpar-t Apr 12, 2019
c0cac7b
Merge remote-tracking branch 'origin/master' into docker-rest-test-38053
alpar-t Jul 5, 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
8 changes: 7 additions & 1 deletion buildSrc/src/main/java/org/elasticsearch/gradle/testfixtures/TestFixturesPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,15 @@ public void apply(Project project) {
(name, port) -> postProcessFixture.getExtensions()
.getByType(ExtraPropertiesExtension.class).set(name, port)
);

// Make it possible to have the both fixture and what's using it in a single place
extension.fixtures.add(project);
mark-vieira marked this conversation as resolved.
Show resolved Hide resolved
}

extension.fixtures.all(fixtureProject -> project.evaluationDependsOn(fixtureProject.getPath()));
extension.fixtures
.matching(fixtureProject -> fixtureProject.equals(project) == false)
.all(fixtureProject -> project.evaluationDependsOn(fixtureProject.getPath()));

if (dockerComposeSupported(project) == false) {
project.getLogger().warn(
"Tests for {} require docker-compose at /usr/local/bin/docker-compose or /usr/bin/docker-compose " +
Expand Down
78 changes: 72 additions & 6 deletions distribution/docker/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,15 @@ import org.elasticsearch.gradle.BuildPlugin
import org.elasticsearch.gradle.LoggedExec
import org.elasticsearch.gradle.MavenFilteringHack
import org.elasticsearch.gradle.VersionProperties
import com.carrotsearch.gradle.junit4.RandomizedTestingTask

apply plugin: 'base'
import javax.net.ssl.KeyManager
mark-vieira marked this conversation as resolved.
Show resolved Hide resolved
import javax.net.ssl.SSLContext
import javax.net.ssl.TrustManagerFactory
import java.security.KeyStore
import java.security.SecureRandom

apply plugin: 'elasticsearch.standalone-rest-test'
apply plugin: 'elasticsearch.test.fixtures'

configurations {
Expand Down Expand Up @@ -91,20 +98,79 @@ void addCopyDockerfileTask(final boolean oss) {
}
}

Closure createAndSetWritable = {location ->
mark-vieira marked this conversation as resolved.
Show resolved Hide resolved
File file = file(location);
file.mkdirs()
file.setWritable(true, false)
}

task copyKeystore(type: Sync) {
from project(':x-pack:plugin:core')
.file('src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode.jks')
into "${buildDir}/certs"
doLast {
file("${buildDir}/certs").setReadable(true, false)
file("${buildDir}/certs/testnode.jks").setReadable(true, false)
}
}

preProcessFixture {
dependsOn taskName("copy", true, "DockerContext")
dependsOn taskName("copy", true, "Dockerfile")
dependsOn taskName("copy", false, "DockerContext")
dependsOn taskName("copy", false, "Dockerfile")
dependsOn copyKeystore
doLast {
// tests expect to have an empty repo
project.delete("${buildDir}/repo")
mark-vieira marked this conversation as resolved.
Show resolved Hide resolved
project.delete("${buildDir}/oss-repo")
createAndSetWritable("${buildDir}/repo")
createAndSetWritable("${buildDir}/oss-repo")
createAndSetWritable("${buildDir}/logs/default-1")
createAndSetWritable("${buildDir}/logs/default-2")
createAndSetWritable("${buildDir}/logs/oss-1")
createAndSetWritable("${buildDir}/logs/oss-2")
}
}

postProcessFixture.doLast {
println "docker default distro is on port: ${ext."test.fixtures.elasticsearch-default.tcp.9200"}, " +
"oss is on: ${ext."test.fixtures.elasticsearch-oss.tcp.9200"}"
configurations {
mark-vieira marked this conversation as resolved.
Show resolved Hide resolved
restSpec
}
dependencies {
restSpec "org.elasticsearch:rest-api-spec:${version}"
}

task copyRestTests(type: Sync) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Rather than define a new task here, we should just configure the existing processTestResources task to do this. Its job is already to copy stuff into the resources output directory and can be configured like any other CopySpec.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I specifically wanted to have a Sync task to make sure that there are no tests accidentally left in the resources directory when switching branches etc.

Copy link
Contributor

Choose a reason for hiding this comment

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

The ProcessResources task already does this.

https://github.com/gradle/gradle/blob/master/subprojects/language-jvm/src/main/java/org/gradle/language/jvm/tasks/ProcessResources.java#L30

from { zipTree(configurations.restSpec.singleFile) }
from project(':x-pack:plugin:core')
.file('src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/testnode.jks')
into sourceSets.test.output.resourcesDir
if (System.getProperty("tests.distribution", "default") == "default") {
from { project(':x-pack:plugin').sourceSets.test.resources }
into sourceSets.test.output.resourcesDir
mark-vieira marked this conversation as resolved.
Show resolved Hide resolved
}
dependsOn configurations.restSpec
// FIXME: check why these tests fail
exclude "**/data_frame/**"
exclude "**/ml/**"
}
processTestResources.dependsOn copyRestTests

task integTest(type: RandomizedTestingTask) {
parallelism = '1'
include '**/*IT.class'
// FIXME: see why these tests fail
systemProperty 'tests.rest.blacklist', [
'watcher/execute_watch/60_http_input/HTTP input supports extracting of keys',
'token/10_basic/Test invalidate realm\'s tokens',
'monitoring/bulk/10_basic/Bulk indexing of monitoring data on closed indices should throw an export exception',
'monitoring/bulk/20_privileges/Monitoring Bulk API',
'indices.get_alias/10_basic/Get alias against closed indices',
'ssl/10_basic/Test get SSL certificates',
].join(",")
}

// TODO: Add some actual tests, this will just check that the TPC port in the container is up
check.dependsOn postProcessFixture
check.dependsOn integTest

void addBuildDockerImage(final boolean oss) {
final Task buildDockerImageTask = task(taskName("build", oss, "DockerImage"), type: LoggedExec) {
Expand Down
128 changes: 122 additions & 6 deletions distribution/docker/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,137 @@
# Only used for testing the docker images
version: '3'
services:
elasticsearch-default:
elasticsearch-default-1:
build:
context: ./build/docker
dockerfile: Dockerfile
environment:
- node.name=elasticsearch-default-1
- cluster.initial_master_nodes=elasticsearch-default-1,elasticsearch-default-2
- discovery.seed_hosts=elasticsearch-default-2:9300
- cluster.name=elasticsearch-default
- discovery.type=single-node
- bootstrap.memory_lock=true
- "ES_JAVA_OPTS=-Xms512m -Xmx512m"
- path.repo=/tmp/es-repo
- node.attr.testattr=test
- cluster.routing.allocation.disk.watermark.low=1b
- cluster.routing.allocation.disk.watermark.high=1b
- cluster.routing.allocation.disk.watermark.flood_stage=1b
- script.max_compilations_rate=2048/1m
- node.store.allow_mmap=false
- xpack.security.enabled=true
- xpack.security.transport.ssl.enabled=true
- xpack.security.http.ssl.enabled=true
- xpack.security.authc.token.enabled=true
- xpack.security.audit.enabled=true
- xpack.security.authc.realms.file.file1.order=0
- xpack.security.authc.realms.native.native1.order=1
- xpack.security.transport.ssl.keystore.path=/usr/share/elasticsearch/config/testnode.jks
- xpack.security.http.ssl.keystore.path=/usr/share/elasticsearch/config/testnode.jks
- xpack.http.ssl.verification_mode=certificate
- xpack.security.transport.ssl.verification_mode=certificate
- xpack.license.self_generated.type=trial
volumes:
- ./build/repo:/tmp/es-repo
- ./build/certs/testnode.jks:/usr/share/elasticsearch/config/testnode.jks
- ./build/logs/default-1:/usr/share/elasticsearch/logs
- ./docker-test-entrypoint.sh:/docker-test-entrypoint.sh
ports:
- "9200"
elasticsearch-oss:
ulimits:
memlock:
soft: -1
hard: -1
entrypoint: /docker-test-entrypoint.sh
elasticsearch-default-2:
build:
context: ./build/docker
environment:
- node.name=elasticsearch-default-2
- cluster.initial_master_nodes=elasticsearch-default-1,elasticsearch-default-2
- discovery.seed_hosts=elasticsearch-default-1:9300
- cluster.name=elasticsearch-default
- bootstrap.memory_lock=true
- "ES_JAVA_OPTS=-Xms512m -Xmx512m"
- path.repo=/tmp/es-repo
- node.attr.testattr=test
- cluster.routing.allocation.disk.watermark.low=1b
- cluster.routing.allocation.disk.watermark.high=1b
- cluster.routing.allocation.disk.watermark.flood_stage=1b
- script.max_compilations_rate=2048/1m
- node.store.allow_mmap=false
- xpack.security.enabled=true
- xpack.security.transport.ssl.enabled=true
- xpack.security.http.ssl.enabled=true
- xpack.security.authc.token.enabled=true
- xpack.security.audit.enabled=true
- xpack.security.authc.realms.file.file1.order=0
- xpack.security.authc.realms.native.native1.order=1
- xpack.security.transport.ssl.keystore.path=/usr/share/elasticsearch/config/testnode.jks
- xpack.security.http.ssl.keystore.path=/usr/share/elasticsearch/config/testnode.jks
- xpack.http.ssl.verification_mode=certificate
- xpack.security.transport.ssl.verification_mode=certificate
- xpack.license.self_generated.type=trial
volumes:
- ./build/repo:/tmp/es-repo
- ./build/certs/testnode.jks:/usr/share/elasticsearch/config/testnode.jks
- ./build/logs/default-2:/usr/share/elasticsearch/logs
- ./docker-test-entrypoint.sh:/docker-test-entrypoint.sh
ports:
- "9200"
ulimits:
memlock:
soft: -1
hard: -1
entrypoint: /docker-test-entrypoint.sh
elasticsearch-oss-1:
build:
context: ./build/oss-docker
environment:
- node.name=elasticsearch-oss-1
- cluster.initial_master_nodes=elasticsearch-oss-1,elasticsearch-oss-2
- discovery.seed_hosts=elasticsearch-oss-2:9300
- cluster.name=elasticsearch-oss
- bootstrap.memory_lock=true
- "ES_JAVA_OPTS=-Xms512m -Xmx512m"
- path.repo=/tmp/es-repo
- node.attr.testattr=test
- cluster.routing.allocation.disk.watermark.low=1b
- cluster.routing.allocation.disk.watermark.high=1b
- cluster.routing.allocation.disk.watermark.flood_stage=1b
- script.max_compilations_rate=2048/1m
- node.store.allow_mmap=false
volumes:
- ./build/oss-repo:/tmp/es-repo
- ./build/logs/oss-1:/usr/share/elasticsearch/logs
ports:
- "9200"
ulimits:
memlock:
soft: -1
hard: -1
elasticsearch-oss-2:
build:
context: ./build/oss-docker
dockerfile: Dockerfile
environment:
- node.name=elasticsearch-oss-2
- cluster.initial_master_nodes=elasticsearch-oss-1,elasticsearch-oss-2
- discovery.seed_hosts=elasticsearch-oss-1:9300
- cluster.name=elasticsearch-oss
- discovery.type=single-node
- bootstrap.memory_lock=true
- "ES_JAVA_OPTS=-Xms512m -Xmx512m"
- path.repo=/tmp/es-repo
- node.attr.testattr=test
- cluster.routing.allocation.disk.watermark.low=1b
- cluster.routing.allocation.disk.watermark.high=1b
- cluster.routing.allocation.disk.watermark.flood_stage=1b
- script.max_compilations_rate=2048/1m
- node.store.allow_mmap=false
volumes:
- ./build/oss-repo:/tmp/es-repo
- ./build/logs/oss-2:/usr/share/elasticsearch/logs
ports:
- "9200"
ulimits:
memlock:
soft: -1
hard: -1
7 changes: 7 additions & 0 deletions distribution/docker/docker-test-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#!/bin/bash
cd /usr/share/elasticsearch/bin/
./elasticsearch-users useradd x_pack_rest_user -p x-pack-test-password -r superuser || true
Copy link
Member

Choose a reason for hiding this comment

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

Can we do these with docker exec instead of modifying the entry point?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I would rather not. The test fixtures are transparent w.r.t the technology used to implement them. In general there's nothing docker specific in the build scripts, and the plugin disables everything that can't run if docker is not available. I would like to keep this and thus avoid using docker exec.

Maybe this is a generic enough use-case to add env vars for creating a super-user when bringing up the container if these are present ?

echo "testnode" > /tmp/password
cat /tmp/password | ./elasticsearch-keystore add -x -f -v 'xpack.security.transport.ssl.keystore.secure_password'
cat /tmp/password | ./elasticsearch-keystore add -x -f -v 'xpack.security.http.ssl.keystore.secure_password'
/usr/local/bin/docker-entrypoint.sh > /usr/share/elasticsearch/logs/console.log
mark-vieira marked this conversation as resolved.
Show resolved Hide resolved
Loading