[7.x] Move junit XML out of Docker
This commit is contained in:
committed by
GitHub
parent
9cc48b3e66
commit
2f8c0843a6
+3
-5
@@ -1,9 +1,7 @@
|
||||
ARG PYTHON_VERSION=3.8
|
||||
FROM python:${PYTHON_VERSION}
|
||||
|
||||
COPY dev-requirements.txt /tmp
|
||||
RUN python -m pip install -r /tmp/dev-requirements.txt
|
||||
|
||||
WORKDIR /code/elasticsearch-py
|
||||
|
||||
COPY dev-requirements.txt .
|
||||
RUN python -m pip install -r dev-requirements.txt
|
||||
|
||||
COPY . .
|
||||
|
||||
@@ -72,5 +72,5 @@
|
||||
- email:
|
||||
recipients: infra-root+build@elastic.co
|
||||
- junit:
|
||||
results: "*-junit.xml"
|
||||
results: "junit/*-junit.xml"
|
||||
allow-empty-results: true
|
||||
|
||||
@@ -0,0 +1,12 @@
|
||||
---
|
||||
- job:
|
||||
name: elastic+elasticsearch-py+6.x
|
||||
display-name: 'elastic / elasticsearch-py # 6.x'
|
||||
description: Testing the elasticsearch-py 6.x branch.
|
||||
junit_results: "junit/*-junit.xml"
|
||||
parameters:
|
||||
- string:
|
||||
name: branch_specifier
|
||||
default: refs/heads/6.x
|
||||
description: the Git branch specifier to build (<branchName>, <tagName>,
|
||||
<commitId>, etc.)
|
||||
@@ -3,7 +3,7 @@
|
||||
name: elastic+elasticsearch-py+7.x
|
||||
display-name: 'elastic / elasticsearch-py # 7.x'
|
||||
description: Testing the elasticsearch-py 7.x branch.
|
||||
junit_results: "*-junit.xml"
|
||||
junit_results: "junit/*-junit.xml"
|
||||
parameters:
|
||||
- string:
|
||||
name: branch_specifier
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
name: elastic+elasticsearch-py+master
|
||||
display-name: 'elastic / elasticsearch-py # master'
|
||||
description: Testing the elasticsearch-py master branch.
|
||||
junit_results: "*-junit.xml"
|
||||
junit_results: "junit/*-junit.xml"
|
||||
parameters:
|
||||
- string:
|
||||
name: branch_specifier
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
name: elastic+elasticsearch-py+pull-request
|
||||
display-name: 'elastic / elasticsearch-py # pull-request'
|
||||
description: Testing of elasticsearch-py pull requests.
|
||||
junit_results: "*-junit.xml"
|
||||
junit_results: "junit/*-junit.xml"
|
||||
scm:
|
||||
- git:
|
||||
branches:
|
||||
|
||||
@@ -31,6 +31,7 @@ docker build \
|
||||
|
||||
echo -e "\033[1m>>>>> Run [elastic/elasticsearch-py container] >>>>>>>>>>>>>>>>>>>>>>>>>>>>>\033[0m"
|
||||
|
||||
mkdir -p junit
|
||||
docker run \
|
||||
--network=${NETWORK_NAME} \
|
||||
--env "ELASTICSEARCH_HOST=${ELASTICSEARCH_URL}" \
|
||||
@@ -38,5 +39,6 @@ docker run \
|
||||
--env "PYTHON_CONNECTION_CLASS=${PYTHON_CONNECTION_CLASS}" \
|
||||
--name elasticsearch-py \
|
||||
--rm \
|
||||
--volume `pwd`:/code/elasticsearch-py \
|
||||
elastic/elasticsearch-py \
|
||||
python setup.py test
|
||||
|
||||
Reference in New Issue
Block a user