Skip to content

use a limited amount of Python versions for PR runs #1445

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jan 17, 2022
Merged

use a limited amount of Python versions for PR runs #1445

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ed009e2
use a limited amount of Python versions for PR runs
beniwohli Jan 11, 2022
a3d1158
put the right matrix into the right files :)
beniwohli Jan 11, 2022
97dcf96
fix file names, thanks @v1v
beniwohli Jan 11, 2022
02e17e6
Merge branch 'master' into limited_python_matrix
beniwohli Jan 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .ci/.jenkins_python.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
PYTHON_VERSION:
- python-3.6
- python-3.7
- python-3.8
- python-3.9
- python-3.10
- pypy-3
7 changes: 7 additions & 0 deletions .ci/.jenkins_python_full.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
PYTHON_VERSION:
- python-3.6
- python-3.7
- python-3.8
- python-3.9
- python-3.10
- pypy-3
2 changes: 1 addition & 1 deletion .ci/nightly.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ pipeline {
pythonTasksGen = new PythonParallelTaskGenerator(
xKey: 'PYTHON_VERSION',
yKey: 'FRAMEWORK',
xFile: ".ci/.jenkins_python.yml",
xFile: ".ci/.jenkins_python_full.yml",
yFile: ".ci/.jenkins_framework_full.yml",
exclusionFile: ".ci/.jenkins_exclude.yml",
tag: "Python",
Expand Down
2 changes: 1 addition & 1 deletion .ci/packer_cache.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
source /usr/local/bin/bash_standard_lib.sh

if [ -x "$(command -v docker)" ]; then
grep "-" .ci/.jenkins_python.yml | cut -d'-' -f2- | \
grep "-" .ci/.jenkins_python_full.yml | cut -d'-' -f2- | \
while read -r version;
do
imageName="apm-agent-python:${version}"
Expand Down
4 changes: 3 additions & 1 deletion Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,15 +117,17 @@ pipeline {
dir("${BASE_DIR}"){
script {
// To enable the full test matrix upon GitHub PR comments
def pythonFile = '.ci/.jenkins_python.yml'
def frameworkFile = '.ci/.jenkins_framework.yml'
if (env.GITHUB_COMMENT?.contains('full')) {
log(level: 'INFO', text: 'Full test matrix has been enabled.')
frameworkFile = '.ci/.jenkins_framework_full.yml'
pythonFile = '.ci/.jenkins_python_full.yml'
}
pythonTasksGen = new PythonParallelTaskGenerator(
xKey: 'PYTHON_VERSION',
yKey: 'FRAMEWORK',
xFile: ".ci/.jenkins_python.yml",
xFile: pythonFile,
yFile: frameworkFile,
exclusionFile: ".ci/.jenkins_exclude.yml",
tag: "Python",
Expand Down