Skip to content

Commit 0b7f4a3

Browse files
AnaethelionAnaethelion
authored
CI: Update reference to docker for CI (#223)
* CI: Update reference to docker for CI * CI: Fix stack version for 7.11 branch * CI: Fix docker version to latest built SNAPSHOT * CI: Update elasticsearch license for integration tests * CI: Update CA * Generator: Tests: Remove datastream before removing indices -- prevents deadlock in tests * CI: Make things behave between Makefile and Jenkins First step to CI convergence with other clients! * CI: Clean and relaunch an xpack cluster for xpack build
1 parent 992d3d0 commit 0b7f4a3

File tree

11 files changed

+86
-84
lines changed

11 files changed

+86
-84
lines changed

‎.ci/certs/ca.crt‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
-----BEGIN CERTIFICATE-----
2-
MIIDSTCCAjGgAwIBAgIUGqPn96yNRroRX2uBi+m999M4GwIwDQYJKoZIhvcNAQEL
3-
BQAwNDEyMDAGA1UEAxMpRWxhc3RpYyBDZXJ0aWZpY2F0ZSBUb29sIEF1dG9nZW5l
4-
cmF0ZWQgQ0EwHhcNMjAwNDI5MDUyMzI2WhcNMjEwNDI5MDUyMzI2WjA0MTIwMAYD
5-
VQQDEylFbGFzdGljIENlcnRpZmljYXRlIFRvb2wgQXV0b2dlbmVyYXRlZCBDQTCC
6-
ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIsS6eBX4PK3xiU5+mWG2pj6
7-
T/3GzOkYRmHPqOsIdVylKeqg5p42y8u3UrSk4pqWg7oifwZTJkOQOuoZMoqAE9C1
8-
lwHJfdvyltjg/BAj4+3s3QqxWWMy1ATNXvYYOxhgC5F7URLYKdEKxYjWkZIxChcy
9-
2oEpYSezDb1KnnraDz+snawTUVAqiHgsjmEMqueJZGj78dULf6kgsDRbGVecVy+B
10-
D9aFUgnB0Tb8i2BbU90LwknKqJGmQ0JwMRBWoGXJ/jhOr1bYhx8RUWZVglF/Q6MZ
11-
Es63oW45POm+OLlZk8Lnvzth7DS37v8wPID8cc00Dsb1g2s7ValacesdFn8huyUC
12-
AwEAAaNTMFEwHQYDVR0OBBYEFAoBzyNNN2Uz/J/pQP6o8Mj2OvEWMB8GA1UdIwQY
13-
MBaAFAoBzyNNN2Uz/J/pQP6o8Mj2OvEWMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZI
14-
hvcNAQELBQADggEBACV43c28cDSpX1FICI37pITRRzw4O9PG/HKrf307/jIieHTb
15-
HPR6W27YZcwaI5Mtut6DkloM6I44uC87zqzCpxnSdmhEzMIcKjQbIBZEItvrJURd
16-
2ll4RcXrAEznbwng9Z90W3WOgWjX91AA6Y/TCYgCxa9/qA99RLvJlU4VkQ6QUE4X
17-
e2nSdBBBTUgARVM+0nDxPvE00GR598UA/UFiXtKJNZv3BNt5viPefFYXItuzlmsQ
18-
7ZkLqGOYcHrH/rdSzS4R2D1WjlzPBx4z5D7+3XQV2mjRJmahKZj8F0icnZPq9Uk2
19-
nehNyMis+kGplpUspadB+HUKt6uaCwR+ELOPyhU=
20-
-----END CERTIFICATE-----
2+
MIIDSjCCAjKgAwIBAgIVAJQLm8V2LcaCTHUcoIfO+KL63nG3MA0GCSqGSIb3DQEB
3+
CwUAMDQxMjAwBgNVBAMTKUVsYXN0aWMgQ2VydGlmaWNhdGUgVG9vbCBBdXRvZ2Vu
4+
ZXJhdGVkIENBMB4XDTIwMDIyNjA1NTA1N1oXDTIzMDIyNTA1NTA1N1owNDEyMDAG
5+
A1UEAxMpRWxhc3RpYyBDZXJ0aWZpY2F0ZSBUb29sIEF1dG9nZW5lcmF0ZWQgQ0Ew
6+
ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDYyajkPvGtUOE5M1OowQfB
7+
kWVrWjo1+LIxzgCeRHp0YztLtdVJ0sk2xoSrt2uZpxcPepdyOseLTjFJex1D2yCR
8+
AEniIqcFif4G72nDih2LlbhpUe/+/MTryj8ZTkFTzI+eMmbQi5FFMaH+kwufmdt/
9+
5/w8YazO18SxxJUlzMqzfNUrhM8vvvVdxgboU7PWhk28wZHCMHQovomHmzclhRpF
10+
N0FMktA98vHHeRjH19P7rNhifSd7hZzoH3H148HVAKoPgqnZ6vW2O2YfAWOP6ulq
11+
cyszr57p8fS9B2wSdlWW7nVHU1JuKcYD67CxbBS23BeGFgCj4tiNrmxO8S5Yf85v
12+
AgMBAAGjUzBRMB0GA1UdDgQWBBSWAlip9eoPmnG4p4OFZeOUBlAbNDAfBgNVHSME
13+
GDAWgBSWAlip9eoPmnG4p4OFZeOUBlAbNDAPBgNVHRMBAf8EBTADAQH/MA0GCSqG
14+
SIb3DQEBCwUAA4IBAQA19qqrMTWl7YyId+LR/QIHDrP4jfxmrEELrAL58q5Epc1k
15+
XxZLzOBSXoBfBrPdv+3XklWqXrZjKWfdkux0Xmjnl4qul+srrZDLJVZG3I7IrITh
16+
AmQUmL9MuPiMnAcxoGZp1xpijtW8Qmd2qnambbljWfkuVaa4hcVRfrAX6TciIQ21
17+
bS5aeLGrPqR14h30YzDp0RMmTujEa1o6ExN0+RSTkE9m89Q6WdM69az8JW7YkWqm
18+
I+UCG3TcLd3TXmN1zNQkq4y2ObDK4Sxy/2p6yFPI1Fds5w/zLfBOvvPQY61vEqs8
19+
SCCcQIe7f6NDpIRIBlty1C9IaEHj7edyHjF6rtYb
20+
-----END CERTIFICATE-----

‎.ci/certs/elasticsearch.crt‎

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
11
-----BEGIN CERTIFICATE-----
2-
MIIDWTCCAkGgAwIBAgIVAPoJuUxY401b3h8Rk0FDXBSelZtHMA0GCSqGSIb3DQEB
2+
MIIDYjCCAkqgAwIBAgIVAIZQH0fe5U+bGQ6m1JUBO/AQkQ/9MA0GCSqGSIb3DQEB
33
CwUAMDQxMjAwBgNVBAMTKUVsYXN0aWMgQ2VydGlmaWNhdGUgVG9vbCBBdXRvZ2Vu
4-
ZXJhdGVkIENBMB4XDTIwMDQyOTA1MjMyN1oXDTIxMDQyOTA1MjMyN1owGDEWMBQG
5-
A1UEAxMNZWxhc3RpY3NlYXJjaDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
6-
ggEBAK5zkKu8T+b7r1douuv5LAE7+Fy+uGvUG10PNifyxDZPyaj6B0+LA62Im+2A
7-
6Yy9j2lmDgXdho6pOBvjdOtP/b3LTMlWkRW45/iPUeq3QcJBpoeQCZKhqtiYNaFH
8-
ONqSulZcgQWaOuT3Z6JCHNoO4F8Vk5EYrhgd34VGWmJ/faZKOrghB20is23YXEum
9-
jyVsh9hlP8y4RvLstcVBpjIgMcouTRaDHTIvG7est9w6C88CocVM7a0BW8WBTPnh
10-
oMCXvW2VavLb1q5SLaw71ubSifdfCiMGtDlKiCLlBFrFz7Jgy4Sv9ZRP5pIHKaYW
11-
G1hfBmSd0uljDo3CYzg0eh/hr7sCAwEAAaN+MHwwHQYDVR0OBBYEFIi080MqNORc
12-
puFSi6fLV/e/DqUVMB8GA1UdIwQYMBaAFAoBzyNNN2Uz/J/pQP6o8Mj2OvEWMC8G
13-
A1UdEQQoMCaCCWxvY2FsaG9zdIcEfwAAAYcEAAAAAIIDZXMxggNlczKCA2VzMzAJ
14-
BgNVHRMEAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQAoKXXBi2dnDP2cdPhd859OASl5
15-
PjNpnCrVlUUbQtATUC48yuIdtfpsh1g50Bw5WXZIckM+nebYWE+wOGu4gYgVKgIL
16-
ewbKBTds3GMIIXo3SE41jjOOLmP5Pg5v2/QrxchUd4M2PYwhjs7/9rQ9r4CpaJN0
17-
jm1YkGaJe+lySoD5q029Xy3tcJNur3Ks+TXiGAX5sFJqSpYIwYnsr/h8rRamZYGx
18-
BGuohGZSoiMMHJCJedOyFjg8gGX7cqWt70scbHqb65SXpbZsWwyim3fm64h7fVVq
19-
4IGbNVSm+QLasvqoqw2bjdvwdqgriKVZOqAZJXp43PQxB90cRnBs88pnZfr6
20-
-----END CERTIFICATE-----
4+
ZXJhdGVkIENBMB4XDTIwMDMyNzE5MTcxMVoXDTIzMDMyNzE5MTcxMVowEzERMA8G
5+
A1UEAxMIaW5zdGFuY2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDB
6+
fco1t1+sE1gTwTVGcXKZqJTP2GjMHM0cfJE5KKfwC5B+pHADRT6FZxvepgKjEBDt
7+
CK+2Rmotyeb15XXMSKguNhyT+2PuKvT5r05L7P91XRYXrwxG2swJPtct7A87xdFa
8+
Ek+YRpqGGmTaux2jOELMiAmqEzoj6w/xFq+LF4SolTW4wOL2eLFkEFHBX2oCwU5T
9+
Q+B+7E9zL45nFWlkeRGJ+ZQTnRNZ/1r4N9A9Gtj4x/H1/y4inWndikdxAb5QiEYJ
10+
T+vbQWzHYWjz13ttHJsz+6T8rvA1jK+buHgVh4K8lV13X9k54soBqHB8va7/KIJP
11+
g8gvd6vusEI7Bmfl1as7AgMBAAGjgYswgYgwHQYDVR0OBBYEFKnnpvuVYwtFSUis
12+
WwN9OHLyExzJMB8GA1UdIwQYMBaAFJYCWKn16g+acbing4Vl45QGUBs0MDsGA1Ud
13+
EQQ0MDKCCWxvY2FsaG9zdIIIaW5zdGFuY2WHBH8AAAGHEAAAAAAAAAAAAAAAAAAA
14+
AAGCA2VzMTAJBgNVHRMEAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQAPNsIoD4GBrTgR
15+
jfvBuHS6eU16P95m16O8Mdpr4SMQgWLQUhs8aoVgfwpg2TkbCWxOe6khJOyNm7bf
16+
fW4aFQ/OHcQV4Czz3c7eOHTWSyMlCOv+nRXd4giJZ5TOHw1zKGmKXOIvhvE6RfdF
17+
uBBfrusk164H4iykm0Bbr/wo4d6wuebp3ZYLPw5zV0D08rsaR+3VJ9VxWuFpdm/r
18+
2onYOohyuX9DRjAczasC+CRRQN4eHJlRfSQB8WfTKw3EloRJJDAg6SJyGiAJ++BF
19+
hnqfNcEyKes2AWagFF9aTbEJMrzMhH+YB5F+S/PWvMUlFzcoocVKqc4pIrjKUNWO
20+
6nbTxeAB
21+
-----END CERTIFICATE-----

‎.ci/certs/elasticsearch.key‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
-----BEGIN RSA PRIVATE KEY-----
2-
MIIEowIBAAKCAQEArnOQq7xP5vuvV2i66/ksATv4XL64a9QbXQ82J/LENk/JqPoH
3-
T4sDrYib7YDpjL2PaWYOBd2Gjqk4G+N060/9vctMyVaRFbjn+I9R6rdBwkGmh5AJ
4-
kqGq2Jg1oUc42pK6VlyBBZo65PdnokIc2g7gXxWTkRiuGB3fhUZaYn99pko6uCEH
5-
bSKzbdhcS6aPJWyH2GU/zLhG8uy1xUGmMiAxyi5NFoMdMi8bt6y33DoLzwKhxUzt
6-
rQFbxYFM+eGgwJe9bZVq8tvWrlItrDvW5tKJ918KIwa0OUqIIuUEWsXPsmDLhK/1
7-
lE/mkgcpphYbWF8GZJ3S6WMOjcJjODR6H+GvuwIDAQABAoIBAQCuZUE/LaYDF6CW
8-
FVCoDhR7t2P184OR6Bzizw4oqXyVfvXuQuWEE0i99k9LAxB3bhksGKX0Hx0hCPHa
9-
j2yWwQS887vzmuK3gH4F8eDGcCUA+XhtFQU83PlaRe93Jygi+YPmSduBqkkuFFY5
10-
0zXcl/qdk4hOCQohedu19DrvNNx7mxq1wPtaHuLXqQEYHYETF61mbs2qvbmzmJAV
11-
CTfzBkv03xKL0IBjF2MZ0cShLxYiZdotsjeCZBQ7m5PKa41GOgPLoLBx0th2uBA1
12-
wKqx/XQOx/QL/uHkd8yLhuvdrmsy1PWG3ZUDdIxI7iOJfY/PrxgrExVfniMG7G0N
13-
UHlyKNxhAoGBANdm3mtXu2HK7jLXueOeAMV11FhmWMjKSTZWLIf491AqNW5Rp2Of
14-
U1vkuRQcuOSepnEgS2WWkOEEfX+SOX+86MumozJRXnvSeJE9hnq6lgZRoaxcZUyS
15-
T1K1SoM8ANedNm4z+H3BNspRy0By1zrjvJmEeIUjlp5RiBF9eCiQYlpnAoGBAM9U
16-
1zKWDyHIoUMAzRPe+dj+ONxr+ImsN4NRyYdVINIDlZ+ZCUDt1xVEa6Ksd/Mmz3US
17-
zbbVe9EEETsOOcyzUWBx8xigefxO5hJ6HV/Z3e411JzDmj00UI8VSCNK1iCLE2sp
18-
+VUXWOF+KlNb6PRw8ztWG0SKYEkkHPt2QXEzVdONAoGAVieiDONBYqMNVS6t/lnD
19-
SzeO4HDHUECAuggLtbMiEGFhj6d/QTyH1fiNAntehKrkPdlB7vcjKa1nGPB+qRYB
20-
MvuKyOR82x/a85TdRhd9TDe4Z71pExBuQ9GZZRZJ6/PIwpls6bevV4sRtcx5Q+e1
21-
Ft5CalZKtzY7K2u49NiTTj8CgYBFEtTnK4s7DCZ9tiScvCqtGnVDKk2RQGj2PSdR
22-
CRF4Jm2Q0GF+2j5P/Y2GksMbpRB0xqD2isVHa316GVE0W4F/CjedOsmpP3fzK+/h
23-
YSpJFHITEC+wuF8mbEauS15vVSZRC5jfunmIFopvXy2LUp4WZKeM/DT76SYmuM0w
24-
s5OieQKBgFf982X5HHS+TJmNhy+OaFjwDdsLN3Ww3nAkGEKDBUOLfi6L3WUuXNMd
25-
r1mZQ4kOxumMFn/x4/OftVGh3XhZfkAiYd4Gg3Hq9K74xmUeHDWf+Qk9HsRhBzJG
26-
nR+AYGo0e/1/t2yvKD8C+FNaGrjrLlFFuUeN4QUdDEmvULErXcGE
27-
-----END RSA PRIVATE KEY-----
2+
MIIEowIBAAKCAQEAwX3KNbdfrBNYE8E1RnFymaiUz9hozBzNHHyROSin8AuQfqRw
3+
A0U+hWcb3qYCoxAQ7QivtkZqLcnm9eV1zEioLjYck/tj7ir0+a9OS+z/dV0WF68M
4+
RtrMCT7XLewPO8XRWhJPmEaahhpk2rsdozhCzIgJqhM6I+sP8RavixeEqJU1uMDi
5+
9nixZBBRwV9qAsFOU0PgfuxPcy+OZxVpZHkRifmUE50TWf9a+DfQPRrY+Mfx9f8u
6+
Ip1p3YpHcQG+UIhGCU/r20Fsx2Fo89d7bRybM/uk/K7wNYyvm7h4FYeCvJVdd1/Z
7+
OeLKAahwfL2u/yiCT4PIL3er7rBCOwZn5dWrOwIDAQABAoIBAFcm4ICnculf4Sks
8+
umFbUiISA81GjZV6V4zAMu1K+bGuk8vnJyjh9JJD6hK0NbXa07TgV7zDJKoxKd2S
9+
GCgGhfIin2asMcuh/6vDIYIjYsErR3stdlsnzAVSD7v4ergSlwR6AO32xz0mAE1h
10+
QK029yeHEstPU72/7/NIo5MD6dXAbut1MzgijZD8RQo1z21D6qmLcPTVTfkn7a3W
11+
MY3y7XUIkA1TOyIRsH3k6F6NBWkvtXbwOUeLCJ14EvS8T9BqhIhPDZv8mQTRLDOD
12+
tQRyC4Cnw+UhYmnMFJhj6N2jpTBv/AdoKcRC56uBJyPW+dxj6i4e7n3pQuxqRvpI
13+
LLJJsskCgYEA4QQxzuJizLKV75rE+Qxg0Ej0Gid1aj3H5eeTZOUhm9KC8KDfPdpk
14+
msKaNzJq/VDcqHPluGS1jYZVgZlal1nk5xKBcbQ4n297VPVd+sLtlf0bj4atlDUO
15+
+iOVo0H7k5yWvj+TzVRlc5zjDLcnQh8i+22o3+65hIrb2zpzg/cCZJ8CgYEA3CJX
16+
bjmWPQ0uZVIa8Wz8cJFtKT9uVl7Z3/f6HjN9I0b/9MmVlNxQVAilVwhDkzR/UawG
17+
QeRFBJ6XWRwX0aoMq+O9VSNu/R2rtEMpIYt3LwbI3yw6GRoCdB5qeL820O+KX5Fl
18+
/z+ZNgrHgA1yKPVf+8ke2ZtLEqPHMN+BMuq8t+UCgYEAy0MfvzQPbbuw55WWcyb0
19+
WZJdNzcHwKX4ajzrj4vP9VOPRtD7eINMt+QsrMnVjei6u0yeahhHTIXZvc2K4Qeq
20+
V/YGinDzaUqqTU+synXFauUOPXO6XxQi6GC2rphPKsOcBFWoLSYc0vgYvgbA5uD7
21+
l8Yyc77RROKuwfWmHcJHHh8CgYBurGFSjGdJWHgr/oSHPqkIG0VLiJV7nQJjBPRd
22+
/Lr8YnTK6BJpHf7Q0Ov3frMirjEYqakXtaExel5TMbmT8q+eN8h3pnHlleY+oclr
23+
EQghv4J8GWs4NYhoQuZ6wH/ZuaTS+XHTS3FG51J3wcrUZtET8ICvHNE4lNjPbH8z
24+
TysENQKBgHER1RtDFdz+O7mlWibrHk8JDgcVdZV/pBF+9cb7r/orkH9RLAHDlsAO
25+
tuSVaQmm5eqgaAxMamBXSyw1lir07byemyuEDg0mJ1rNUGsAY8P+LWr579gvKMme
26+
5gvrJr99JkBTV3z+TiL7dZa52eW00Ijqg2qcbHGpq3kXWWkbd8Tn
27+
-----END RSA PRIVATE KEY-----

‎.ci/run-tests‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ if [[ ($branch_specifier == "refs/heads/xpack" && $TEST_SUITE == "core") ]]; the
1919
fi
2020

2121
if [[ $TEST_SUITE == "core" ]]; then
22-
elasticsearch_image=elasticsearch-oss:$STACK_VERSION
22+
elasticsearch_image=elasticsearch:$STACK_VERSION
2323
elasticsearch_url=http://es1:9200
2424
fi
2525

@@ -44,11 +44,11 @@ echo -e "\033[1m>>>>> SETUP [$TEST_SUITE] >>>>>>>>>>>>>>>>>>>>>>>>>>>>>\033[0m"
4444
docker build --file Dockerfile --tag elastic/go-elasticsearch .
4545

4646
# Launch a single Elasticsearch node
47-
(make cluster detach=true version=$elasticsearch_image)
47+
(make cluster detach=true version=$elasticsearch_image flavor=$TEST_SUITE)
4848

4949
# Store the Elasticsearch version and build hash
5050
ELASTICSEARCH_VERSION="$STACK_VERSION"
51-
ELASTICSEARCH_BUILD_VERSION=$(docker run --network elasticsearch --rm appropriate/curl -sSk $elasticsearch_url | docker run -i --rm stedolan/jq -r '.version.number')
51+
ELASTICSEARCH_BUILD_VERSION=$(docker run --network elasticsearch --rm appropriate/curl --retry-connrefused --retry 5 --retry-delay 5 --retry-max-time 60 -sSk $elasticsearch_url | docker run -i --rm stedolan/jq -r '.version.number')
5252
ELASTICSEARCH_BUILD_HASH=$(docker run --network elasticsearch --rm appropriate/curl -sSk $elasticsearch_url | docker run -i --rm stedolan/jq -r '.version.build_hash')
5353

5454
# Download Elasticsearch source code at ELASTICSEARCH_BUILD_HASH and store it in a container

‎.ci/test-matrix.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22

33
STACK_VERSION:
4-
- 7.x-SNAPSHOT
4+
- 7.11.0-SNAPSHOT
55

66
GO_VERSION:
77
- 1-alpine

‎.ci/tests-core.sh‎

100644100755
File mode changed.

‎.ci/tests-xpack.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@ time docker exec --tty --workdir=/go-elasticsearch/esapi/test go-elasticsearch /
3232
status1=$?
3333

3434
docker container rm --force --volumes es1 > /dev/null 2>&1
35-
make cluster-clean cluster version=elasticsearch:$ELASTICSEARCH_VERSION detach=true
35+
make cluster-clean cluster version=elasticsearch:$ELASTICSEARCH_VERSION detach=true flavor=xpack
3636

3737
echo -e "\033[1m>>>>> Running tests: XPACK ML >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\033[0m"
3838

3939
time docker exec --tty --workdir=/go-elasticsearch/esapi/test go-elasticsearch /bin/sh -c 'gotestsum --format=short-verbose --junitfile=$WORKSPACE/TEST-integration-api-xpack-ml-junit.xml -- --tags=integration --timeout=1h -v ./xpack/ml/*_test.go'
4040
status2=$?
4141

4242
docker container rm --force --volumes es1 > /dev/null 2>&1
43-
make cluster-clean cluster version=elasticsearch:$ELASTICSEARCH_VERSION detach=true
43+
make cluster-clean cluster version=elasticsearch:$ELASTICSEARCH_VERSION detach=true flavor=xpack
4444

4545
echo -e "\033[1m>>>>> Running tests: XPACK ML CRUD >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\033[0m"
4646

‎.github/workflows/test-api.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
test-core:
1212
name: Core
1313
env:
14-
ELASTICSEARCH_VERSION: elasticsearch-oss:7.x-SNAPSHOT
14+
ELASTICSEARCH_VERSION: elasticsearch:7.11.0-SNAPSHOT
1515
ELASTICSEARCH_URL: http://localhost:9200
1616
runs-on: ubuntu-latest
1717
steps:
@@ -43,7 +43,7 @@ jobs:
4343
test-xpack:
4444
name: X-Pack
4545
env:
46-
ELASTICSEARCH_VERSION: elasticsearch:7.x-SNAPSHOT
46+
ELASTICSEARCH_VERSION: elasticsearch:7.11.0-SNAPSHOT
4747
ELASTICSEARCH_URL: https://elastic:elastic@localhost:9200
4848
runs-on: ubuntu-latest
4949
steps:

‎.github/workflows/test-integration.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ on:
1717

1818
env:
1919
GITHUB_ACTIONS: true
20-
ELASTICSEARCH_VERSION: elasticsearch-oss:7.x-SNAPSHOT
20+
ELASTICSEARCH_VERSION: elasticsearch:7.11.0-SNAPSHOT
2121

2222
jobs:
2323
test:

‎Makefile‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ godoc: ## Display documentation for the package
247247
godoc --http=localhost:6060 --play
248248

249249
cluster: ## Launch an Elasticsearch cluster with Docker
250-
$(eval version ?= "elasticsearch-oss:7.x-SNAPSHOT")
250+
$(eval version ?= "elasticsearch:7.11.0-SNAPSHOT")
251251
ifeq ($(origin nodes), undefined)
252252
$(eval nodes = 1)
253253
endif
@@ -257,10 +257,8 @@ ifeq ($(shell test $(nodes) && test $(nodes) -gt 1; echo $$?),0)
257257
else
258258
$(eval detach ?= "false")
259259
endif
260-
ifdef version
261-
ifneq (,$(findstring oss,$(version)))
262260
$(eval elasticsearch_url = "http://es1:9200")
263-
else
261+
ifeq ($(flavor), xpack)
264262
$(eval elasticsearch_url = "https://elastic:elastic@es1:9200")
265263
$(eval xpack_env += --env "ELASTIC_PASSWORD=elastic")
266264
$(eval xpack_env += --env "xpack.license.self_generated.type=trial")
@@ -279,7 +277,6 @@ else
279277
$(eval xpack_volumes += --volume "$(PWD)/.ci/certs/elasticsearch.crt:/usr/share/elasticsearch/config/certs/elasticsearch.crt")
280278
$(eval xpack_volumes += --volume "$(PWD)/.ci/certs/elasticsearch.key:/usr/share/elasticsearch/config/certs/elasticsearch.key")
281279
$(eval xpack_volumes += --volume "$(PWD)/.ci/certs/ca.crt:/usr/share/elasticsearch/config/certs/ca.crt")
282-
endif
283280
endif
284281
@docker network inspect elasticsearch > /dev/null 2>&1 || docker network create elasticsearch;
285282
@{ \
@@ -327,7 +324,7 @@ ifdef detach
327324
endif
328325

329326
cluster-update: ## Update the Docker image
330-
$(eval version ?= "elasticsearch-oss:7.x-SNAPSHOT")
327+
$(eval version ?= "elasticsearch:7.11.0-SNAPSHOT")
331328
@printf "\033[2m→ Updating the Docker image...\033[0m\n"
332329
@docker pull docker.elastic.co/elasticsearch/$(version);
333330

@@ -338,7 +335,7 @@ cluster-clean: ## Remove unused Docker volumes and networks
338335

339336
docker: ## Build the Docker image and run it
340337
docker build --file Dockerfile --tag elastic/go-elasticsearch .
341-
docker run -it --network elasticsearch --volume $(PWD)/tmp:/tmp:rw,delegated --rm elastic/go-elasticsearch
338+
docker run -it --name go-elasticsearch --network elasticsearch --volume $(PWD)/tmp:/tmp:rw,delegated --rm elastic/go-elasticsearch
342339

343340
##@ Generator
344341
gen-api: ## Generate the API package from the JSON specification

0 commit comments

Comments
 (0)