Skip to content

Commit 409fab4

Browse files
beniwohliv1v
andauthored
use a limited amount of Python versions for PR runs (elastic#1445)
* use a limited amount of Python versions for PR runs the CI runs on PRs are getting prohibitively long. To work around this, we can use only a limited set of Python versions for PR runs and do a full, nightly run (the same approach we already use for framework versions). * put the right matrix into the right files :) * fix file names, thanks @v1v Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com> Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com>
1 parent 67ce41e commit 409fab4

File tree

5 files changed

+12
-7
lines changed

5 files changed

+12
-7
lines changed

.ci/.jenkins_python.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
11
PYTHON_VERSION:
22
- python-3.6
3-
- python-3.7
4-
- python-3.8
5-
- python-3.9
63
- python-3.10
7-
- pypy-3

.ci/.jenkins_python_full.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
PYTHON_VERSION:
2+
- python-3.6
3+
- python-3.7
4+
- python-3.8
5+
- python-3.9
6+
- python-3.10
7+
- pypy-3

.ci/nightly.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ pipeline {
6262
pythonTasksGen = new PythonParallelTaskGenerator(
6363
xKey: 'PYTHON_VERSION',
6464
yKey: 'FRAMEWORK',
65-
xFile: ".ci/.jenkins_python.yml",
65+
xFile: ".ci/.jenkins_python_full.yml",
6666
yFile: ".ci/.jenkins_framework_full.yml",
6767
exclusionFile: ".ci/.jenkins_exclude.yml",
6868
tag: "Python",

.ci/packer_cache.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
source /usr/local/bin/bash_standard_lib.sh
44

55
if [ -x "$(command -v docker)" ]; then
6-
grep "-" .ci/.jenkins_python.yml | cut -d'-' -f2- | \
6+
grep "-" .ci/.jenkins_python_full.yml | cut -d'-' -f2- | \
77
while read -r version;
88
do
99
imageName="apm-agent-python:${version}"

Jenkinsfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,15 +117,17 @@ pipeline {
117117
dir("${BASE_DIR}"){
118118
script {
119119
// To enable the full test matrix upon GitHub PR comments
120+
def pythonFile = '.ci/.jenkins_python.yml'
120121
def frameworkFile = '.ci/.jenkins_framework.yml'
121122
if (env.GITHUB_COMMENT?.contains('full')) {
122123
log(level: 'INFO', text: 'Full test matrix has been enabled.')
123124
frameworkFile = '.ci/.jenkins_framework_full.yml'
125+
pythonFile = '.ci/.jenkins_python_full.yml'
124126
}
125127
pythonTasksGen = new PythonParallelTaskGenerator(
126128
xKey: 'PYTHON_VERSION',
127129
yKey: 'FRAMEWORK',
128-
xFile: ".ci/.jenkins_python.yml",
130+
xFile: pythonFile,
129131
yFile: frameworkFile,
130132
exclusionFile: ".ci/.jenkins_exclude.yml",
131133
tag: "Python",

0 commit comments

Comments
 (0)