third_codes/eland
1
0
Fork 0
mirror of https://github.com/elastic/eland.git synced 2025-07-24 00:00:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add PANDAS_VERSION to Jenkins matrix

Browse Source
This commit is contained in:
P. Sai Vinay 2021-07-26 21:47:46 +05:30 committed by GitHub
parent 1555ea9534
commit 22475cdc46
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.ci/jobs/defaults.yml
View File

@ -50,11 +50,15 @@
- axis: - axis:
type: yaml type: yaml
filename: .ci/test-matrix.yml filename: .ci/test-matrix.yml
name: TEST_SUITE name: PYTHON_VERSION
- axis: - axis:
type: yaml type: yaml
filename: .ci/test-matrix.yml filename: .ci/test-matrix.yml
name: PYTHON_VERSION name: PANDAS_VERSION
- axis:
type: yaml
filename: .ci/test-matrix.yml
name: TEST_SUITE
yaml-strategy: yaml-strategy:
exclude-key: exclude exclude-key: exclude
filename: .ci/test-matrix.yml filename: .ci/test-matrix.yml

3
.ci/run-repository.sh
View File

@ -21,6 +21,7 @@ echo -e "\033[34;1mINFO:\033[0m VERSION ${ELASTICSEARCH_VERSION}\033[0m"
echo -e "\033[34;1mINFO:\033[0m CONTAINER ${ELASTICSEARCH_CONTAINER}\033[0m" echo -e "\033[34;1mINFO:\033[0m CONTAINER ${ELASTICSEARCH_CONTAINER}\033[0m"
echo -e "\033[34;1mINFO:\033[0m TEST_SUITE ${TEST_SUITE}\033[0m" echo -e "\033[34;1mINFO:\033[0m TEST_SUITE ${TEST_SUITE}\033[0m"
echo -e "\033[34;1mINFO:\033[0m PYTHON_VERSION ${PYTHON_VERSION}\033[0m" echo -e "\033[34;1mINFO:\033[0m PYTHON_VERSION ${PYTHON_VERSION}\033[0m"
echo -e "\033[34;1mINFO:\033[0m PANDAS_VERSION ${PANDAS_VERSION}\033[0m"
echo -e "\033[1m>>>>> Build [elastic/eland container] >>>>>>>>>>>>>>>>>>>>>>>>>>>>>\033[0m" echo -e "\033[1m>>>>> Build [elastic/eland container] >>>>>>>>>>>>>>>>>>>>>>>>>>>>>\033[0m"
@ -35,4 +36,4 @@ docker run \
--name eland-test-runner \ --name eland-test-runner \
--rm \ --rm \
elastic/eland \ elastic/eland \
nox -s lint test-${PYTHON_VERSION} nox -s lint "test-${PYTHON_VERSION}(pandas_version='${PANDAS_VERSION}')"

2
.ci/run-tests
View File

@ -12,6 +12,7 @@ set -euxo pipefail
TEST_SUITE=${TEST_SUITE-xpack} TEST_SUITE=${TEST_SUITE-xpack}
NODE_NAME=localhost NODE_NAME=localhost
PANDAS_VERSION=${PANDAS_VERSION-1.3.0}
elasticsearch_image=elasticsearch elasticsearch_image=elasticsearch
@ -55,5 +56,6 @@ ELASTICSEARCH_CONTAINER=${elasticsearch_image}:${ELASTICSEARCH_VERSION} \
NODE_NAME=${NODE_NAME} \ NODE_NAME=${NODE_NAME} \
ELASTICSEARCH_URL=${elasticsearch_url} \ ELASTICSEARCH_URL=${elasticsearch_url} \
TEST_SUITE=${TEST_SUITE} \ TEST_SUITE=${TEST_SUITE} \
PANDAS_VERSION=${PANDAS_VERSION} \
bash .ci/run-repository.sh bash .ci/run-repository.sh

8
.ci/test-matrix.yml
View File

@ -5,8 +5,9 @@ ELASTICSEARCH_VERSION:
- 7.x-SNAPSHOT - 7.x-SNAPSHOT
- 7.10-SNAPSHOT - 7.10-SNAPSHOT
TEST_SUITE: PANDAS_VERSION:
- xpack - 1.2.0
- 1.3.0
PYTHON_VERSION: PYTHON_VERSION:
- 3.9 - 3.9
@ -14,4 +15,7 @@ PYTHON_VERSION:
- 3.7 - 3.7
- 3.6 - 3.6
TEST_SUITE:
- xpack
exclude: ~ exclude: ~

6
noxfile.py
View File

@ -90,10 +90,12 @@ def lint(session):
@nox.session(python=["3.6", "3.7", "3.8", "3.9"]) @nox.session(python=["3.6", "3.7", "3.8", "3.9"])
def test(session): @nox.parametrize("pandas_version", ["1.2.0", "1.3.0"])
def test(session, pandas_version: str):
session.install("-r", "requirements-dev.txt") session.install("-r", "requirements-dev.txt")
session.run("python", "-m", "tests.setup_tests")
session.install(".") session.install(".")
session.run("python", "-m", "pip", "install", f"pandas=={pandas_version}")
session.run("python", "-m", "tests.setup_tests")
# Notebooks are only run on Python 3.7+ due to pandas 1.2.0 # Notebooks are only run on Python 3.7+ due to pandas 1.2.0
if session.python == "3.6": if session.python == "3.6":