Skip to content

Commit 04c1785

Browse files
github-actions[bot]picandocodigopquentin
authored
[Backport 8.10] [CI] Updates Buildkite configuration (#2344)
* [CI] Updates Buildkite configuration (#2254) * [CI] Updates Buildkite configuration * Copy updated test certificates to .buildkite * Stop testing 3.6 as in Jenkins * Simplify Dockerfile by relying more on nox --------- Co-authored-by: Quentin Pradet <[email protected]> Co-authored-by: Josh Mock <[email protected]> (cherry picked from commit 24a4583) * Remove .ci directory * Remove more references to .ci * Fix Assemble action * Drop unified release workflow * Switch to pytest_asyncio.fixture This is required now that strict mode is the default. * Fix test_errors_are_reported_correctly --------- Co-authored-by: Fernando Briano <[email protected]> Co-authored-by: Quentin Pradet <[email protected]>
1 parent 88a970f commit 04c1785

36 files changed

+150
-496
lines changed

.ci/Dockerfile renamed to .buildkite/Dockerfile

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,7 @@ RUN groupadd --system -g ${BUILDER_GID} ${BUILDER_GROUP} \
1414
&& useradd --system --shell /bin/bash -u ${BUILDER_UID} -g ${BUILDER_GROUP} -d /var/lib/elastic -m elastic 1>/dev/null 2>/dev/null \
1515
&& mkdir -p /code/elasticsearch-py && mkdir /code/elasticsearch-py/build \
1616
&& chown -R ${BUILDER_USER}:${BUILDER_GROUP} /code/
17-
COPY --chown=$BUILDER_USER:$BUILDER_GROUP . .
1817
WORKDIR /code/elasticsearch-py
1918
USER ${BUILDER_USER}:${BUILDER_GROUP}
20-
COPY dev-requirements.txt .
21-
RUN python -m pip install \
22-
-U --no-cache-dir \
23-
--disable-pip-version-check \
24-
nox -rdev-requirements.txt
19+
RUN python -m pip install --disable-pip-version-check nox
2520
COPY --chown=$BUILDER_USER:$BUILDER_GROUP . .
26-
RUN python -m pip install -U -e .

.buildkite/certs/ca.crt

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
-----BEGIN CERTIFICATE-----
2+
MIIDSTCCAjGgAwIBAgIUHTeTPPuZIX3wdyudMsllXa9yZ1kwDQYJKoZIhvcNAQEL
3+
BQAwNDEyMDAGA1UEAxMpRWxhc3RpYyBDZXJ0aWZpY2F0ZSBUb29sIEF1dG9nZW5l
4+
cmF0ZWQgQ0EwHhcNMjMwODIxMTcyNTMyWhcNMjYwODIwMTcyNTMyWjA0MTIwMAYD
5+
VQQDEylFbGFzdGljIENlcnRpZmljYXRlIFRvb2wgQXV0b2dlbmVyYXRlZCBDQTCC
6+
ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMZs7DXbV7ovFvQ/CiqvHHZ/
7+
40rLyAcBQMhVBke2VVCQk3hIOPpHYt3xZgb61Oyrf14lFxny483beXaUqGThZ67Y
8+
RsxzSOS8NUi21OLZ3xaE+p+Yx9Xe6lTMQJM4RpD/A5V35uikji1K4+F0ooJghELq
9+
Fndmark/7SQFh6Bg8/aaf6Hpyar3WOWdQjHXgszNAv1Ez7+pPlfnCS8XNjYB5Y2n
10+
gAayb1krMRW/3E6hRVZAig3I2H8mezL5tF8iS5aJW1WLpw4oYnbH0DdS+gpCK1lT
11+
8GZd8Dk0QbNGpXNTu67BravVhgEoprBVMz6G1C4MiuVcBy7gA671/f46S4Tgb10C
12+
AwEAAaNTMFEwHQYDVR0OBBYEFHVhRrHXbd5QFEgk3RFn4Y4LYo9PMB8GA1UdIwQY
13+
MBaAFHVhRrHXbd5QFEgk3RFn4Y4LYo9PMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZI
14+
hvcNAQELBQADggEBACoGVPqeYE3IPRdSAtihIq071BfGA8vgfJWv0qiI0T+gYetX
15+
dnebmQc5EccdEIrxD0bLKPgzd5c3ILwQy5+uo03ua7PrplwPVdeNXnU1LodAQ0Zb
16+
GmTixXqgj8AMcvRsA7qARjXvf6w3Yyb7GO3FXRIGtqk12Vb1qnJg894CSIWrHiw0
17+
hRO5b7eJyrOy2s6QA6FucM/scM1Z/8D9tHfgwmrKM875VGerJORwfHCaCvF1YvBj
18+
cIpYNnw2vFzDvRevh63sSQbZ9q3nbtD27AZSN9LKEbipSEOoBZMKG2zgDTT/Olzx
19+
EQJ2t+Z487UuFX6+WaLZMteL2F4eh9OFWIYM3EI=
20+
-----END CERTIFICATE-----

.buildkite/certs/ca.pem

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
-----BEGIN CERTIFICATE-----
2+
MIIDSTCCAjGgAwIBAgIUHTeTPPuZIX3wdyudMsllXa9yZ1kwDQYJKoZIhvcNAQEL
3+
BQAwNDEyMDAGA1UEAxMpRWxhc3RpYyBDZXJ0aWZpY2F0ZSBUb29sIEF1dG9nZW5l
4+
cmF0ZWQgQ0EwHhcNMjMwODIxMTcyNTMyWhcNMjYwODIwMTcyNTMyWjA0MTIwMAYD
5+
VQQDEylFbGFzdGljIENlcnRpZmljYXRlIFRvb2wgQXV0b2dlbmVyYXRlZCBDQTCC
6+
ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMZs7DXbV7ovFvQ/CiqvHHZ/
7+
40rLyAcBQMhVBke2VVCQk3hIOPpHYt3xZgb61Oyrf14lFxny483beXaUqGThZ67Y
8+
RsxzSOS8NUi21OLZ3xaE+p+Yx9Xe6lTMQJM4RpD/A5V35uikji1K4+F0ooJghELq
9+
Fndmark/7SQFh6Bg8/aaf6Hpyar3WOWdQjHXgszNAv1Ez7+pPlfnCS8XNjYB5Y2n
10+
gAayb1krMRW/3E6hRVZAig3I2H8mezL5tF8iS5aJW1WLpw4oYnbH0DdS+gpCK1lT
11+
8GZd8Dk0QbNGpXNTu67BravVhgEoprBVMz6G1C4MiuVcBy7gA671/f46S4Tgb10C
12+
AwEAAaNTMFEwHQYDVR0OBBYEFHVhRrHXbd5QFEgk3RFn4Y4LYo9PMB8GA1UdIwQY
13+
MBaAFHVhRrHXbd5QFEgk3RFn4Y4LYo9PMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZI
14+
hvcNAQELBQADggEBACoGVPqeYE3IPRdSAtihIq071BfGA8vgfJWv0qiI0T+gYetX
15+
dnebmQc5EccdEIrxD0bLKPgzd5c3ILwQy5+uo03ua7PrplwPVdeNXnU1LodAQ0Zb
16+
GmTixXqgj8AMcvRsA7qARjXvf6w3Yyb7GO3FXRIGtqk12Vb1qnJg894CSIWrHiw0
17+
hRO5b7eJyrOy2s6QA6FucM/scM1Z/8D9tHfgwmrKM875VGerJORwfHCaCvF1YvBj
18+
cIpYNnw2vFzDvRevh63sSQbZ9q3nbtD27AZSN9LKEbipSEOoBZMKG2zgDTT/Olzx
19+
EQJ2t+Z487UuFX6+WaLZMteL2F4eh9OFWIYM3EI=
20+
-----END CERTIFICATE-----

.buildkite/certs/testnode.crt

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
-----BEGIN CERTIFICATE-----
2+
MIIDODCCAiCgAwIBAgIVAKLWEcNzTd4B0NqnrJL0xAKaS8DWMA0GCSqGSIb3DQEB
3+
CwUAMDQxMjAwBgNVBAMTKUVsYXN0aWMgQ2VydGlmaWNhdGUgVG9vbCBBdXRvZ2Vu
4+
ZXJhdGVkIENBMB4XDTIzMDgyMTE3MjcwMloXDTI2MDgyMDE3MjcwMlowEzERMA8G
5+
A1UEAxMIaW5zdGFuY2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC8
6+
eLXL3ZX5v8JlHcfg+96Bpq24EeiqV+7RPPKbcH80ODjkETqYUpam+TcOl2gt23p/
7+
rpiPSSpOX8pFdmY78wTmxo2GCQZ/db2h0gZOOYpb8HQku+hJ4bAmtzizrqWW76Wz
8+
csen3DSUkT0bKkJTjUMmwVhRaMpfv8EIcUbrHAwc3VCj7grnFL0kdAuQa6iyBH4I
9+
lTUYOIOVyEJ8zZ7R4BJO3QU+TRuJ5+w/QiZMeDqxtrdDL37vYQHPW7L/XISCCOMp
10+
sA3avzFphoQXBQ8mjdB8Txkd4sH7mJTqnRp5ILhRzVpcPPgQYFeIB567B+kFeSau
11+
aJJmc0EVgOcK5aSMtOH3AgMBAAGjYjBgMB0GA1UdDgQWBBQsZbZDudZ63h52FlU5
12+
N2g3pznkETAfBgNVHSMEGDAWgBR1YUax123eUBRIJN0RZ+GOC2KPTzATBgNVHREE
13+
DDAKgghpbnN0YW5jZTAJBgNVHRMEAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQAyv0Cw
14+
OrvZn7FHHS8TJI5vTi1F43R/eSNMNL/+q/nK93KaxWJH1T4zrJhrJ9KpzkFcalXP
15+
bu02oTh28b3o3QpS2wdwMv/Q3NLoMBEmQlG2UrELFvV43nS8LCiwCX3o11L1HZP3
16+
1Z/rclwxbA4OQ/ZkPcol++TDZQTM/8WkIdZmTL4UDb/ppDjX24nTOitkMRZlYAOY
17+
mid9GGExhKrUJ0I9/A3w1hWRA1Hwc+1TFDcPphl2x2uQ9HJFBueAvuFXmIjDki1x
18+
qrvnFZ+mneI9kR4m82MX900WF15KS35GzmMui0tsf0wbfy3Jh+WnpMlIIa2OQXw7
19+
prbkg9tScQSsvhC8
20+
-----END CERTIFICATE-----

.buildkite/certs/testnode.key

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
-----BEGIN RSA PRIVATE KEY-----
2+
MIIEowIBAAKCAQEAvHi1y92V+b/CZR3H4PvegaatuBHoqlfu0Tzym3B/NDg45BE6
3+
mFKWpvk3DpdoLdt6f66Yj0kqTl/KRXZmO/ME5saNhgkGf3W9odIGTjmKW/B0JLvo
4+
SeGwJrc4s66llu+ls3LHp9w0lJE9GypCU41DJsFYUWjKX7/BCHFG6xwMHN1Qo+4K
5+
5xS9JHQLkGuosgR+CJU1GDiDlchCfM2e0eASTt0FPk0biefsP0ImTHg6sba3Qy9+
6+
72EBz1uy/1yEggjjKbAN2r8xaYaEFwUPJo3QfE8ZHeLB+5iU6p0aeSC4Uc1aXDz4
7+
EGBXiAeeuwfpBXkmrmiSZnNBFYDnCuWkjLTh9wIDAQABAoIBAAU0iEDTI9s78pB8
8+
XBLYofKOuemFhRl/SDc7KbAlUT4N93RFDYs7bLG73Eto3xW1JBL2rXv3l1WGy71T
9+
YctyEMaW4T28bhODGvOnK0lpyWp0n6CMGARCWW0YTlaYEjay866bEuyN5l3cDQX9
10+
Csvn8NzXJitJa51tXFVxW3YO1j7Nyc/M59oyBZ1ARYYmQqFYLEu6lvJOW0cKDFkZ
11+
AcMVlOIxZQL/Mf+RO72aQGVuYNjqxlLIXLuE9zFR2gDFM2+l3FMUWDGHGBDFyjKU
12+
iMk4+sSlOTFXqO9VQzua6FLFMsQT6m5PFD4uPY92KR6CPfH/NrWqwqr+jpjaU+gs
13+
3U9GN+ECgYEA58qX7tKPk7CWdk3kyk5NsNcs/qib+heXWEubfhoU8LmSnbBQhOAz
14+
wi//r/xm0OHGj84y66+G3T347iudrLjhr07oGM1QfjYT3kb90efLjwAfCECtyVYL
15+
EQrWO5UeoTnmrhlB1mGL3sWaVAsVqNLz8i2H5c7sj0hxHsvM62159r8CgYEA0Cff
16+
opJqmUpMpHm3sgjMWctylVrHBuQe5cl5Ad80pbd6mvtt4TvGXbUGNdzURfyve9DS
17+
x1CVlj4Sz8VuelFQgYL+7/qUqZoms1aSgJpxWv8ou+wUHmlF3kVO8VKt3BNHV+8J
18+
euSB6NG91BGguBoHgnOoVcjbDGdhJGRTojCNWskCgYEA1jE3nwDCnrbTA3XNk0ky
19+
r9TXhmgm4r+EIpqTkL7nVOAXZVJ1xaQtECgsveKe3C2WwHLKSVMFbFMFQonZha+/
20+
FbHz9l9cH5U3XPL7QEpTp8xz4LtsHJ4/UbtS5vJQwKnxyjYaydGQYAb4KuunUz/F
21+
H6kFaM6DeZB2v/+SWIfs6Z8CgYARUdAEyeP+vzTjVpFXSe4e5pOxI619wEtl2T6t
22+
TjImO78C2DrLS9r0fxR2NNqgvCapybVQCj94EdAk44uOt+dX71thAluORRpFP8XO
23+
14rpBGQSRtFhumaq2N95quR2dFAyW9xREmRQx+rgk1rpFplbXF48TQsU3CE0Evj2
24+
fM22KQKBgDhob7M9sWvXecxoyy3J17jUTcFqmqKcqGnx3ZJ7Q9CgAfjYqNNQws27
25+
wTuaJB0PEuCOu4t+lUHEBMIjGkBfo1bHd4EZaW04Xgbfn2j8MK2e+9GlRtedxxFg
26+
c1JdRb5+eTgPwLcDsmMWIW357PDW7RDEI07G1ZB4SqxGTKkU7JOW
27+
-----END RSA PRIVATE KEY-----

.ci/functions/cleanup.sh renamed to .buildkite/functions/cleanup.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# Shared cleanup routines between different steps
44
#
5-
# Please source .ci/functions/imports.sh as a whole not just this file
5+
# Please source .buildkite/functions/imports.sh as a whole not just this file
66
#
77
# Version 1.0.0
88
# - Initial version after refactor
File renamed without changes.

.ci/functions/wait-for-container.sh renamed to .buildkite/functions/wait-for-container.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# Exposes a routine scripts can call to wait for a container if that container set up a health command
44
#
5-
# Please source .ci/functions/imports.sh as a whole not just this file
5+
# Please source .buildkite/functions/imports.sh as a whole not just this file
66
#
77
# Version 1.0.1
88
# - Initial version after refactor

.buildkite/pipeline.yml

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
11
steps:
2-
- label: ":python: Greetings"
3-
command: "echo 'Hello, world!'"
2+
- label: ":elasticsearch: :python: ES Python ({{ matrix.python }})"
3+
agents:
4+
provider: "gcp"
5+
env:
6+
PYTHON_VERSION: "{{ matrix.python }}"
7+
TEST_SUITE: "platinum"
8+
STACK_VERSION: "8.11.0-SNAPSHOT"
9+
PYTHON_CONNECTION_CLASS: "{{ matrix.connection }}"
10+
matrix:
11+
setup:
12+
python:
13+
- "3.7"
14+
- "3.8"
15+
- "3.9"
16+
- "3.10"
17+
- "3.11"
18+
connection:
19+
- "urllib3"
20+
- "requests"
21+
command: ./.buildkite/run-tests

.ci/run-elasticsearch.sh renamed to .buildkite/run-elasticsearch.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,12 @@ cleanup_node $es_node_name
3131
master_node_name=${es_node_name}
3232
cluster_name=${moniker}${suffix}
3333

34+
BUILDKITE=${BUILDKITE-false}
35+
# Set vm.max_map_count kernel setting to 262144 if we're in CI
36+
if [[ "$BUILDKITE" == "true" ]]; then
37+
sudo sysctl -w vm.max_map_count=262144
38+
fi
39+
3440
declare -a volumes
3541
environment=($(cat <<-END
3642
--env ELASTIC_PASSWORD=$elastic_password
File renamed without changes.

.ci/run-repository.sh renamed to .buildkite/run-repository.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ echo -e "\033[34;1mINFO:\033[0m PYTHON_CONNECTION_CLASS ${PYTHON_CONNECTION_CLAS
2424
echo -e "\033[1m>>>>> Build [elastic/elasticsearch-py container] >>>>>>>>>>>>>>>>>>>>>>>>>>>>>\033[0m"
2525

2626
docker build \
27-
--file .ci/Dockerfile \
27+
--file .buildkite/Dockerfile \
2828
--tag elastic/elasticsearch-py \
2929
--build-arg "PYTHON_VERSION=${PYTHON_VERSION}" \
3030
--build-arg "BUILDER_UID=$(id -u)" \

.ci/run-tests renamed to .buildkite/run-tests

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,17 @@ script_path=$(dirname $(realpath -s $0))
1414
source $script_path/functions/imports.sh
1515
set -euo pipefail
1616

17-
echo -e "\033[1m>>>>> Start [$STACK_VERSION container] >>>>>>>>>>>>>>>>>>>>>>>>>>>>>\033[0m"
18-
DETACH=true bash .ci/run-elasticsearch.sh
17+
echo "--- :elasticsearch: Starting Elasticsearch"
18+
DETACH=true bash $script_path/run-elasticsearch.sh
1919

2020
if [[ -n "$RUNSCRIPTS" ]]; then
2121
for RUNSCRIPT in ${RUNSCRIPTS//,/ } ; do
2222
echo -e "\033[1m>>>>> Running run-$RUNSCRIPT.sh >>>>>>>>>>>>>>>>>>>>>>>>>>>>>\033[0m"
2323
CONTAINER_NAME=${RUNSCRIPT} \
2424
DETACH=true \
25-
bash .ci/run-${RUNSCRIPT}.sh
25+
bash $script_path/run-${RUNSCRIPT}.sh
2626
done
2727
fi
2828

29-
echo -e "\033[1m>>>>> Repository specific tests >>>>>>>>>>>>>>>>>>>>>>>>>>>>>\033[0m"
30-
bash .ci/run-repository.sh
29+
echo "+++ :python: Client tests"
30+
bash $script_path/run-repository.sh

.ci/certs/ca.crt

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

.ci/certs/ca.pem

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

.ci/certs/testnode.crt

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

.ci/certs/testnode.key

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

.ci/jobs/defaults.yml

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

.ci/jobs/elastic+elasticsearch-py+7.17.yml

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

.ci/jobs/elastic+elasticsearch-py+8.3.yml

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

0 commit comments

Comments
 (0)