Skip to content

Commit df40aec

Browse files
ywelschywelsch
committed
Merge remote-tracking branch 'elastic/master' into reduce-metadata-writes-master
2 parents c8bfe3d + d5fcb73 commit df40aec

File tree

128 files changed

+1454
-337
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

128 files changed

+1454
-337
lines changed

‎.ci/build.sh‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,5 @@
11
#!/bin/bash
22

3-
JAVA_HOME=${JAVA_HOME:-$HOME/.java/openjdk13}
4-
RUNTIME_JAVA_HOME=${RUNTIME_JAVA_HOME:-$HOME/.java/openjdk11}
5-
6-
JAVA7_HOME=$HOME/.java/java7
7-
JAVA8_HOME=$HOME/.java/java8
8-
JAVA9_HOME=$HOME/.java/java9
9-
JAVA10_HOME=$HOME/.java/java10
10-
JAVA11_HOME=$HOME/.java/java11
11-
JAVA12_HOME=$HOME/.java/openjdk12
12-
JAVA13_HOME=$HOME/.java/openjdk13
13-
143
# drop page cache and kernel slab objects on linux
154
[[ -x /usr/local/sbin/drop-caches ]] && sudo /usr/local/sbin/drop-caches
165

@@ -36,7 +25,6 @@ if pwd | grep -v -q ^/dev/shm ; then
3625
MAX_WORKERS=$(($MAX_WORKERS*2/3))
3726
fi
3827

39-
export GRADLE_OPTS="-XX:+HeapDumpOnOutOfMemoryError -Xmx128m -Xms128m"
4028
set -e
4129
./gradlew --parallel --scan \
4230
-Dorg.elasticsearch.build.cache.url=https://gradle-enterprise.elastic.co/cache/ \

‎.ci/jobs.t/defaults.yml‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,20 @@
3636
- ansicolor
3737
- timestamps
3838
- gradle-build-scan
39+
- inject:
40+
properties-file: '.ci/java-versions.properties'
41+
properties-content: |
42+
WORKSPACE=/dev/shm/$JOB_NAME
43+
JAVA_HOME=$HOME/.java/$ES_BUILD_JAVA
44+
RUNTIME_JAVA_HOME=$HOME/.java/$ES_RUNTIME_JAVA
45+
JAVA7_HOME=$HOME/.java/java7
46+
JAVA8_HOME=$HOME/.java/java8
47+
JAVA9_HOME=$HOME/.java/java9
48+
JAVA10_HOME=$HOME/.java/java10
49+
JAVA11_HOME=$HOME/.java/java11
50+
JAVA12_HOME=$HOME/.java/openjdk12
51+
JAVA13_HOME=$HOME/.java/openjdk13
52+
GRADLE_OPTS=-XX:+HeapDumpOnOutOfMemoryError -Xmx128m -Xms128m
3953
properties:
4054
- github:
4155
url: https://github.com/elastic/elasticsearch/
@@ -76,4 +90,4 @@
7690
7791
7892
79-
93+

‎.ci/jobs.t/elastic+elasticsearch+{branch}+docker-test-ramdisk.yml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
- job:
2+
name: elastic+elasticsearch+%BRANCH%+docker-test-ramdisk
3+
workspace: /dev/shm/elastic+elasticsearch+%BRANCH%+docker-test
4+
display-name: "elastic / elasticsearch # %BRANCH% - docker test ramdisk (experimental)"
5+
description: "Experimental test job to shake out issues with Docker in CI\n"
6+
node: "(debian-10 || sles-12 || debian-8 || sles-15) && immutable"
7+
triggers: []
8+
builders:
9+
- shell: |
10+
#!/usr/local/bin/runbld --redirect-stderr --last-good-commit elastic+elasticsearch+%BRANCH%+git+push
11+
.ci/build.sh -Dbwc.checkout.align=true -p test/fixtures composeUp

‎buildSrc/version.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
elasticsearch = 8.0.0
2-
lucene = 8.4.0-snapshot-08b8d116f8f
2+
lucene = 8.4.0
33

44
bundled_jdk_vendor = adoptopenjdk
55
bundled_jdk = 13.0.1+9

‎distribution/docker/build.gradle‎

Lines changed: 29 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -22,31 +22,29 @@ dependencies {
2222
restSpec project(':rest-api-spec')
2323
}
2424

25-
ext.expansions = { oss, ubi, local ->
25+
ext.expansions = { oss, local ->
2626
final String classifier = 'linux-x86_64'
2727
final String elasticsearch = oss ? "elasticsearch-oss-${VersionProperties.elasticsearch}-${classifier}.tar.gz" : "elasticsearch-${VersionProperties.elasticsearch}-${classifier}.tar.gz"
2828
return [
29-
'base_image' : ubi ? 'registry.access.redhat.com/ubi7/ubi-minimal:7.7' : 'centos:7',
3029
'build_date' : BuildParams.buildDate,
3130
'elasticsearch' : elasticsearch,
3231
'git_revision' : BuildParams.gitRevision,
3332
'license' : oss ? 'Apache-2.0' : 'Elastic-License',
34-
'package_manager' : ubi ? 'microdnf' : 'yum',
3533
'source_elasticsearch': local ? "COPY $elasticsearch /opt/" : "RUN cd /opt && curl --retry 8 -s -L -O https://artifacts.elastic.co/downloads/elasticsearch/${elasticsearch} && cd -",
3634
'version' : VersionProperties.elasticsearch
3735
]
3836
}
3937

40-
private static String buildPath(final boolean oss, final boolean ubi) {
41-
return "build/${oss ? 'oss-' : ''}${ubi ? 'ubi-' : ''}docker"
38+
private static String buildPath(final boolean oss) {
39+
return "build/${oss ? 'oss-' : ''}docker"
4240
}
4341

44-
private static String taskName(final String prefix, final boolean oss, final boolean ubi, final String suffix) {
45-
return "${prefix}${oss ? 'Oss' : ''}${ubi ? 'Ubi' : ''}${suffix}"
42+
private static String taskName(final String prefix, final boolean oss, final String suffix) {
43+
return "${prefix}${oss ? 'Oss' : ''}${suffix}"
4644
}
4745

4846
project.ext {
49-
dockerBuildContext = { boolean oss, boolean ubi, boolean local ->
47+
dockerBuildContext = { boolean oss, boolean local ->
5048
copySpec {
5149
into('bin') {
5250
from project.projectDir.toPath().resolve("src/docker/bin")
@@ -64,20 +62,20 @@ project.ext {
6462
}
6563

6664
from(project.projectDir.toPath().resolve("src/docker/Dockerfile")) {
67-
expand(expansions(oss, ubi, local))
65+
expand(expansions(oss, local))
6866
}
6967
}
7068
}
7169
}
7270

73-
void addCopyDockerContextTask(final boolean oss, final boolean ubi) {
74-
task(taskName("copy", oss, ubi, "DockerContext"), type: Sync) {
75-
expansions(oss, ubi, true).findAll { it.key != 'build_date' }.each { k, v ->
71+
void addCopyDockerContextTask(final boolean oss) {
72+
task(taskName("copy", oss, "DockerContext"), type: Sync) {
73+
expansions(oss, true).findAll { it.key != 'build_date' }.each { k, v ->
7674
inputs.property(k, { v.toString() })
7775
}
78-
into buildPath(oss, ubi)
76+
into buildPath(oss)
7977

80-
with dockerBuildContext(oss, ubi, true)
78+
with dockerBuildContext(oss, true)
8179

8280
if (oss) {
8381
from configurations.ossDockerSource
@@ -149,25 +147,25 @@ task integTest(type: Test) {
149147

150148
check.dependsOn integTest
151149

152-
void addBuildDockerImage(final boolean oss, final boolean ubi) {
153-
final Task buildDockerImageTask = task(taskName("build", oss, ubi, "DockerImage"), type: LoggedExec) {
154-
inputs.files(tasks.named(taskName("copy", oss, ubi, "DockerContext")))
150+
void addBuildDockerImage(final boolean oss) {
151+
final Task buildDockerImageTask = task(taskName("build", oss, "DockerImage"), type: LoggedExec) {
152+
inputs.files(tasks.named(taskName("copy", oss, "DockerContext")))
155153
List<String> tags
156154
if (oss) {
157155
tags = [
158-
"docker.elastic.co/elasticsearch/elasticsearch-oss${ubi ? '-ubi7' : ''}:${VersionProperties.elasticsearch}",
159-
"elasticsearch-oss${ubi ? '-ubi7' : ''}:test"
156+
"docker.elastic.co/elasticsearch/elasticsearch-oss:${VersionProperties.elasticsearch}",
157+
"elasticsearch-oss:test"
160158
]
161159
} else {
162160
tags = [
163-
"elasticsearch${ubi ? '-ubi7' : ''}:${VersionProperties.elasticsearch}",
164-
"docker.elastic.co/elasticsearch/elasticsearch${ubi ? '-ubi7' : ''}:${VersionProperties.elasticsearch}",
165-
"docker.elastic.co/elasticsearch/elasticsearch${ubi ? '-ubi7' : ''}-full:${VersionProperties.elasticsearch}",
166-
"elasticsearch${ubi ? '-ubi7' : ''}:test",
161+
"elasticsearch:${VersionProperties.elasticsearch}",
162+
"docker.elastic.co/elasticsearch/elasticsearch:${VersionProperties.elasticsearch}",
163+
"docker.elastic.co/elasticsearch/elasticsearch-full:${VersionProperties.elasticsearch}",
164+
"elasticsearch:test",
167165
]
168166
}
169167
executable 'docker'
170-
final List<String> dockerArgs = ['build', buildPath(oss, ubi), '--pull', '--no-cache']
168+
final List<String> dockerArgs = ['build', buildPath(oss), '--pull', '--no-cache']
171169
for (final String tag : tags) {
172170
dockerArgs.add('--tag')
173171
dockerArgs.add(tag)
@@ -184,10 +182,8 @@ void addBuildDockerImage(final boolean oss, final boolean ubi) {
184182
}
185183

186184
for (final boolean oss : [false, true]) {
187-
for (final boolean ubi : [false, true]) {
188-
addCopyDockerContextTask(oss, ubi)
189-
addBuildDockerImage(oss, ubi)
190-
}
185+
addCopyDockerContextTask(oss)
186+
addBuildDockerImage(oss)
191187
}
192188

193189
// We build the images used in compose locally, but the pull command insists on using a repository
@@ -206,26 +202,25 @@ subprojects { Project subProject ->
206202
apply plugin: 'distribution'
207203

208204
final boolean oss = subProject.name.contains('oss-')
209-
final boolean ubi = subProject.name.contains('ubi-')
210205

211-
def exportTaskName = taskName("export", oss, ubi, "DockerImage")
212-
def buildTaskName = taskName("build", oss, ubi, "DockerImage")
213-
def tarFile = "${parent.projectDir}/build/elasticsearch${oss ? '-oss' : ''}${ubi ? '-ubi7' : ''}_test.${VersionProperties.elasticsearch}.docker.tar"
206+
def exportTaskName = taskName("export", oss, "DockerImage")
207+
def buildTaskName = taskName("build", oss, "DockerImage")
208+
def tarFile = "${parent.projectDir}/build/elasticsearch${oss ? '-oss' : ''}_test.${VersionProperties.elasticsearch}.docker.tar"
214209

215210
final Task exportDockerImageTask = task(exportTaskName, type: LoggedExec) {
216211
executable 'docker'
217212
outputs.file(tarFile)
218213
args "save",
219214
"-o",
220215
tarFile,
221-
"elasticsearch${oss ? '-oss' : ''}${ubi ? '-ubi7' : ''}:test"
216+
"elasticsearch${oss ? '-oss' : ''}:test"
222217
}
223218

224219
exportDockerImageTask.dependsOn(parent.tasks.getByName(buildTaskName))
225220

226221
artifacts.add('default', file(tarFile)) {
227222
type 'tar'
228-
name "elasticsearch${oss ? '-oss' : ''}${ubi ? '-ubi7' : ''}"
223+
name "elasticsearch${oss ? '-oss' : ''}"
229224
builtBy exportTaskName
230225
}
231226

‎distribution/docker/docker-build-context/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ task buildDockerBuildContext(type: Tar) {
55
compression = Compression.GZIP
66
archiveClassifier = "docker-build-context"
77
archiveBaseName = "elasticsearch"
8-
with dockerBuildContext(false, false, false)
8+
with dockerBuildContext(false, false)
99
}
1010

1111
assemble.dependsOn buildDockerBuildContext

‎distribution/docker/oss-docker-build-context/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ task buildOssDockerBuildContext(type: Tar) {
55
compression = Compression.GZIP
66
archiveClassifier = "docker-build-context"
77
archiveBaseName = "elasticsearch-oss"
8-
with dockerBuildContext(true, false, false)
8+
with dockerBuildContext(true, false)
99
}
1010

1111
assemble.dependsOn buildOssDockerBuildContext

‎distribution/docker/src/docker/Dockerfile‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
# Set gid=0 and make group perms==owner perms
1212
################################################################################
1313

14-
FROM ${base_image} AS builder
14+
FROM centos:7 AS builder
1515

16-
RUN for iter in {1..10}; do ${package_manager} update --setopt=tsflags=nodocs -y && \
17-
${package_manager} install --setopt=tsflags=nodocs -y gzip shadow-utils tar && \
18-
${package_manager} clean all && exit_code=0 && break || exit_code=\$? && echo "${package_manager} error: retry \$iter in 10s" && sleep 10; done; \
16+
RUN for iter in {1..10}; do yum update --setopt=tsflags=nodocs -y && \
17+
yum install --setopt=tsflags=nodocs -y gzip shadow-utils tar && \
18+
yum clean all && exit_code=0 && break || exit_code=\$? && echo "yum error: retry \$iter in 10s" && sleep 10; done; \
1919
(exit \$exit_code)
2020

2121
ENV PATH /usr/share/elasticsearch/bin:\$PATH
@@ -41,13 +41,13 @@ RUN chmod 0660 config/elasticsearch.yml config/log4j2.properties
4141
# Add entrypoint
4242
################################################################################
4343

44-
FROM ${base_image}
44+
FROM centos:7
4545

4646
ENV ELASTIC_CONTAINER true
4747

48-
RUN for iter in {1..10}; do ${package_manager} update --setopt=tsflags=nodocs -y && \
49-
${package_manager} install --setopt=tsflags=nodocs -y nc shadow-utils zip unzip && \
50-
${package_manager} clean all && exit_code=0 && break || exit_code=\$? && echo "${package_manager} error: retry \$iter in 10s" && sleep 10; done; \
48+
RUN for iter in {1..10}; do yum update --setopt=tsflags=nodocs -y && \
49+
yum install --setopt=tsflags=nodocs -y nc shadow-utils zip unzip && \
50+
yum clean all && exit_code=0 && break || exit_code=\$? && echo "yum error: retry \$iter in 10s" && sleep 10; done; \
5151
(exit \$exit_code)
5252

5353
RUN groupadd -g 1000 elasticsearch && \

‎distribution/docker/ubi-docker-build-context/build.gradle‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎distribution/docker/ubi-docker-export/build.gradle‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)