110353 add windows testing to python agent #726

ElWPenn · 2020-02-19T07:51:04Z

What does this pull request do?

Adds additional tests for windows on different versions of python

Why is it important?

Resolves potential flakiness from Appveyor tests by deprecating them

Related issues

closes

cla-checker-service · 2020-02-19T08:04:42Z

Author of the following commits did not sign a Contributor Agreement:
99e68d9, a69ef7e

Please, read and sign the above mentioned agreement if you want to contribute to this project

…indows

cla-checker-service · 2020-02-19T08:20:19Z

Author of the following commits did not sign a Contributor Agreement:
99e68d9, a69ef7e, aa4b9a2, af93be4

Please, read and sign the above mentioned agreement if you want to contribute to this project

Jenkinsfile

tests/scripts/download_json_schema.ps1

tests/scripts/install_modules.ps1

tests/scripts/install_python.ps1

beniwohli · 2020-02-19T08:58:28Z

Great stuff! This is in no way required, but would it be possible to always install the newest version of a certain major.minor release train? That way, when e.g. a new 3.8 patch version comes out, we don't need to update the Jenkinsfile.

I did a quick search for defining version ranges with Chocolatey, and from what I can tell it doesn't seem to be supported. So the answer to this might very well be "not possible" :)

kuisathaverat · 2020-02-19T13:45:16Z

I did a quick search for defining version ranges with Chocolatey, and from what I can tell it doesn't seem to be supported. So the answer to this might very well be "not possible" :)

It is more a not in an easy way, we can open a follow-up issue to investigate if install the edge version is not complicated.

beniwohli · 2020-02-19T14:00:48Z

@kuisathaverat OK, thanks for the update. If it isn't easily solvable, I don't think it's worth the needed effort. Hardcoding the exact version numbers in Jenkinsfile is fine for now.

…lls of python in logic

cla-checker-service · 2020-02-19T21:26:08Z

Author of the following commits did not sign a Contributor Agreement:
99e68d9, a69ef7e, aa4b9a2, af93be4, c88e611

Please, read and sign the above mentioned agreement if you want to contribute to this project

cla-checker-service · 2020-02-20T00:59:57Z

Author of the following commits did not sign a Contributor Agreement:
99e68d9, a69ef7e, aa4b9a2, af93be4, c88e611, bd0af6e

Please, read and sign the above mentioned agreement if you want to contribute to this project

cla-checker-service · 2020-02-20T01:23:22Z

Author of the following commits did not sign a Contributor Agreement:
99e68d9, a69ef7e, aa4b9a2, af93be4, c88e611, bd0af6e, 45760a8

Please, read and sign the above mentioned agreement if you want to contribute to this project

cla-checker-service · 2020-02-20T01:31:18Z

Author of the following commits did not sign a Contributor Agreement:
99e68d9, a69ef7e, aa4b9a2, af93be4, c88e611, bd0af6e, 45760a8, fa8d3ab

Please, read and sign the above mentioned agreement if you want to contribute to this project

v1v · 2020-02-20T08:20:34Z

@beniwohli, @kuisathaverat and @ElWPenn , regarding installing the latest version for the given major.minor I did code something similar for the Node.js for the major version using chocolatey, see:

https://github.com/elastic/apm-agent-nodejs/pull/1393/files#diff-860c4fe077b91b560f207db63e491a6a

I guess something like the above script could be modified potentially to search for <major>.<minor>.

I managed to create a PR with the proposal, see #730

cla-checker-service · 2020-02-20T08:23:57Z

Author of the following commits did not sign a Contributor Agreement:
99e68d9, a69ef7e, aa4b9a2, af93be4, c88e611, bd0af6e, 45760a8, fa8d3ab, 0020034

Please, read and sign the above mentioned agreement if you want to contribute to this project

cla-checker-service · 2020-02-20T08:31:37Z

Author of the following commits did not sign a Contributor Agreement:
99e68d9, a69ef7e, aa4b9a2, af93be4, c88e611, bd0af6e, 45760a8, fa8d3ab, 0020034, 0c57059

Please, read and sign the above mentioned agreement if you want to contribute to this project

beniwohli · 2020-02-20T08:50:52Z

@ElWPenn any chance you could set your git email to your elastic.co email to keep down the CLAchecker noise? Thanks :)

…python2 vs python3

cla-checker-service · 2020-02-20T18:54:17Z

Author of the following commits did not sign a Contributor Agreement:
99e68d9, a69ef7e, aa4b9a2, af93be4, c88e611, bd0af6e, 45760a8, fa8d3ab, 0020034, 0c57059, 3e452ae

Please, read and sign the above mentioned agreement if you want to contribute to this project

cla-checker-service · 2020-02-25T06:03:44Z

❌ Author of the following commits did not sign a Contributor Agreement:
99e68d9, a69ef7e, aa4b9a2, af93be4, c88e611, bd0af6e, 45760a8, fa8d3ab, 0020034, 0c57059, 3e452ae, 6c7c36c, 7f2bb57, 7f86139, 8525ac9, 608537b

Please, read and sign the above mentioned agreement if you want to contribute to this project

beniwohli · 2020-02-25T08:39:50Z

tests/scripts/install_modules.bat

@@ -0,0 +1,12 @@
+py -m pip install -U pytest


This list of install calls can be replaced by py -m pip install .\tests\requirements\requirements-base.txt I believe

…ion of python

v1v · 2020-02-25T11:41:27Z

tests/scripts/configure_windows_instance.bat

@@ -0,0 +1,10 @@
+call .\tests\scripts\install_chocolatey.bat


Will it be possible to add some docs/headers about how this particular script works, what arguments are required and what requirements are needed?

v1v · 2020-02-25T11:41:36Z

tests/scripts/download_gherkin_features.bat

@@ -0,0 +1,6 @@
+mkdir .\tests\tempFeatures


Will it be possible to add some docs/headers about how this particular script works, what arguments are required and what requirements are needed?

v1v · 2020-02-25T11:44:13Z

tests/scripts/download_gherkin_features.bat

@@ -0,0 +1,6 @@
+mkdir .\tests\tempFeatures
+curl https://codeload.github.com/elastic/apm/zip/master -o .\tests\tempFeatures\features.zip


is codeload.github.com the official and supported URL?

It's the URL they use when you click on the download button on the website. We use it for a long time already and never had problems (other than the occasional network glitch)

I was not familiar with that particular entrypoint, then I searched and found that's not officially supported but some internal entrypoint which it could potentially be changed. The reference I found is below one:

Support codeload.github.com adobe/git-server#5 (comment)

We could potentially use curl -L https://github.com/elastic/apm/archive/master.zip to fetch the artifact, similar to what we do in the apm-integration-testing, what do you think?

Sure, although I don't anticipate them changing those URLs anytime soon, they are mentioned in the docs, even if only as en example response: https://developer.github.com/v3/repos/contents/#get-archive-link

It's not clear what they do support or not! Anyway, no strong opinion, up to @ElWPenn how to proceed then. I'm glad to know a bit more about this! Thanks Beni for the feedback

v1v · 2020-02-25T11:45:00Z

tests/scripts/install_chocolatey.bat

@@ -0,0 +1 @@
+@"%SystemRoot%\System32\WindowsPowerShell\v1.0\powershell.exe" -NoProfile -InputFormat None -ExecutionPolicy Bypass -Command " [System.Net.ServicePointManager]::SecurityProtocol = 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))" && SET "PATH=%PATH%;%ALLUSERSPROFILE%\chocolatey\bin"


Is this required? IIUC, the choco binary is available for the Windows CI Workers

v1v · 2020-02-25T11:45:07Z

tests/scripts/install_modules.bat

@@ -0,0 +1,12 @@
+%1 -m pip install -U pytest


Will it be possible to add some docs/headers about how this particular script works, what arguments are required and what requirements are needed?

v1v · 2020-02-25T11:45:17Z

tests/scripts/install_python.bat

@@ -0,0 +1,8 @@
+SETLOCAL EnableDelayedExpansion


Will it be possible to add some docs/headers about how this particular script works, what arguments are required and what requirements are needed?

…llowing-downgrade suffices since we are renaming python to appropriate version

…t for executing pytest

… don't run or fail

…lly install

…we are using 3.7.2 since it is already installed on the machine

…t losing error code from previous statement

v1v · 2020-03-10T09:28:43Z

This PR has been superseded with #746

DESKTOP-HJUTBFV\timp6 added 3 commits February 18, 2020 23:45

Adding scripts for testing multiple versions of python on windows

99e68d9

merging master and resolving conflicts

0fbb2a6

Commenting out the other tests

a69ef7e

DESKTOP-HJUTBFV\timp6 added 2 commits February 19, 2020 00:08

Moving anonymous parralel steps out of parallel step

aa4b9a2

Testing the difference between \'s and /'s in a powershell label on w…

af93be4

…indows

kuisathaverat reviewed Feb 19, 2020

View reviewed changes

Jenkinsfile Outdated Show resolved Hide resolved

kuisathaverat reviewed Feb 19, 2020

View reviewed changes

Jenkinsfile Outdated Show resolved Hide resolved

kuisathaverat reviewed Feb 19, 2020

View reviewed changes

Jenkinsfile Show resolved Hide resolved

kuisathaverat reviewed Feb 19, 2020

View reviewed changes

tests/scripts/download_json_schema.ps1 Outdated Show resolved Hide resolved

kuisathaverat reviewed Feb 19, 2020

View reviewed changes

tests/scripts/install_modules.ps1 Outdated Show resolved Hide resolved

kuisathaverat reviewed Feb 19, 2020

View reviewed changes

tests/scripts/install_python.ps1 Outdated Show resolved Hide resolved

changing power shell files to bats, and accounting for existing insta…

c88e611

…lls of python in logic

Adding system32 to the environmental path

bd0af6e

Adding install chcolatey back to build step

45760a8

Missed a slash in folder path

fa8d3ab

Fixing 7zip syntax, adding all steps to a central file temporarily

0020034

Adding missing parameters, and executing pytest via python

0c57059

Adding env refresh between batch calls, include logic for installing …

3e452ae

…python2 vs python3

Adding gherkin feature download

6c7c36c

DESKTOP-HJUTBFV\timp6 added 3 commits February 24, 2020 22:23

Adding async module for pytest

7f2bb57

Removing extra argument and adding argument for python2

7f86139

Adding -vv to pytest to triage skipped tests

8525ac9

beniwohli reviewed Feb 25, 2020

View reviewed changes

DESKTOP-HJUTBFV\timp6 and others added 4 commits February 25, 2020 00:55

renaming python.exe to pythonXX.exe to ensure we execute correct vers…

608537b

…ion of python

Forcing python to re-install via choco

2731a38

Replacing install module bat with using requirements file

37c6b9e

Removing hyphen from pip install command

1d2030c

v1v reviewed Feb 25, 2020

View reviewed changes

ElWPenn added 14 commits February 25, 2020 08:22

Removing switch that was breaking move, removing python3 uninstall, a…

754571f

…llowing-downgrade suffices since we are renaming python to appropriate version

Removing version call

3144df8

Adding pytest batch to handle python version arguments

fc07eb6

adding arguments to call for pytest.bat

9b51a72

account for python2 requirements for install modules, adjusting scrip…

1c05ab6

…t for executing pytest

fixing switch in pip install

07027a1

Removing call from executing pytest so failures are caught when tests…

c8d4f48

… don't run or fail

Modifying batch to not mask failures

ffae864

Adding a dir to see c:\ for python 3.7 to triage why it isn't working

86c5ddb

Getting contents of python directory for debugging

2522d9d

Changing python3.7.2 command to python since installing it doesn't fu…

8608515

…lly install

removing debugging data, adding logic to skip renaming python.exe if …

15aa5e7

…we are using 3.7.2 since it is already installed on the machine

Removing closing SETLOCAL DisableDelayedExpansion statement to preven…

7fdb816

…t losing error code from previous statement

Changing python 3.7.2 to use py when executing tests

f306165

beniwohli mentioned this pull request Mar 4, 2020

ci(jenkins): use CI Windows workers #746

Merged

4 tasks

v1v closed this Mar 10, 2020

		@@ -0,0 +1,6 @@
		mkdir .\tests\tempFeatures
		curl https://codeload.github.com/elastic/apm/zip/master -o .\tests\tempFeatures\features.zip

		@@ -0,0 +1 @@
		@"%SystemRoot%\System32\WindowsPowerShell\v1.0\powershell.exe" -NoProfile -InputFormat None -ExecutionPolicy Bypass -Command " [System.Net.ServicePointManager]::SecurityProtocol = 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))" && SET "PATH=%PATH%;%ALLUSERSPROFILE%\chocolatey\bin" No newline at end of file

110353 add windows testing to python agent #726

110353 add windows testing to python agent #726

Uh oh!

Conversation

ElWPenn commented Feb 19, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What does this pull request do?

Why is it important?

Related issues

Uh oh!

cla-checker-service bot commented Feb 19, 2020

Uh oh!

cla-checker-service bot commented Feb 19, 2020

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

beniwohli commented Feb 19, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

kuisathaverat commented Feb 19, 2020

Uh oh!

beniwohli commented Feb 19, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

cla-checker-service bot commented Feb 19, 2020

Uh oh!

cla-checker-service bot commented Feb 20, 2020

Uh oh!

cla-checker-service bot commented Feb 20, 2020

Uh oh!

cla-checker-service bot commented Feb 20, 2020

Uh oh!

v1v commented Feb 20, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

cla-checker-service bot commented Feb 20, 2020

Uh oh!

cla-checker-service bot commented Feb 20, 2020

Uh oh!

beniwohli commented Feb 20, 2020

Uh oh!

cla-checker-service bot commented Feb 20, 2020

Uh oh!

cla-checker-service bot commented Feb 25, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

v1v commented Mar 10, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

ElWPenn commented Feb 19, 2020 •

edited

Loading

beniwohli commented Feb 19, 2020 •

edited

Loading

beniwohli commented Feb 19, 2020 •

edited

Loading

v1v commented Feb 20, 2020 •

edited

Loading

cla-checker-service bot commented Feb 25, 2020 •

edited

Loading