Skip to content
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.

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

[ci] Backport Jenkinsfile and supporting changes #17225

Merged
merged 2 commits into from
Mar 25, 2020

Conversation

andrewkroh
Copy link
Member

@andrewkroh andrewkroh commented Mar 24, 2020

What does this PR do?

Backports mutliple changes related to the Jenkinsfile and build system to 7.x from master (b82b9db).

Because there were many commits (not all Jenkinsfile related) I brought the Jenkinsfile and its scripts from master and then cherry-picked the fixes from #17071.

@andrewkroh andrewkroh changed the title Backport Jenkinsfile and supporting changes [ci] Backport Jenkinsfile and supporting changes Mar 24, 2020
@andrewkroh andrewkroh added the ci label Mar 24, 2020
@andrewkroh andrewkroh force-pushed the backport_jenkinsfile branch from 9eae4c2 to fd0035f Compare March 24, 2020 19:46
@andrewkroh
Copy link
Member Author

andrewkroh commented Mar 25, 2020

This will need a rebase after #17214 merges. That should make the functionbeat tests start passing. Done

@andrewkroh andrewkroh marked this pull request as ready for review March 25, 2020 00:49
@andrewkroh andrewkroh requested a review from a team as a code owner March 25, 2020 00:49
* Address failing tests and warnings

* Ensure mage unitTest works consistently

Windows will invoke `mage unitTest` that will run the Go and Python tests without requiring the integration tests environment.

Use an alias for goTestUnit in metricbeat

* Only include test output when `mage -v` is used

The full test output is written to a file and we archive that. Additionally if a test fails that output is still logged out stderr.

This helps speed things up because Jenkins doesn't need to deal with streaming megabytes of log output to the console.
It also makes it easier to spot errors in the log.

* Jenkinsfile updates

Changes:

- Disable macOS by default. These workers don't have python3 so they cannot a portion of the tests.
- Add python38 to the PATH on Windows.
- Various fixes to the environment variables on Windows.
- Always add the GVM GOROOT/bin to the PATH on POSIX. Same as was being done on Windows.
- Use bat instead of sh on Windows to run `mage dumpVariables`.

* Add MAGEFILE_VERBOSE to travis-ci env
Copy link
Contributor

@kuisathaverat kuisathaverat left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@andrewkroh andrewkroh merged commit 0a171b5 into elastic:7.x Mar 25, 2020
andrewkroh added a commit to andrewkroh/beats that referenced this pull request Mar 25, 2020
* Backport Jenkinsfile and supporting scripts

Files are from b82b9db

* [ci] Make tests pass in Jenkinsfile pipeline (elastic#17071)

* Address failing tests and warnings

* Ensure mage unitTest works consistently

Windows will invoke `mage unitTest` that will run the Go and Python tests without requiring the integration tests environment.

Use an alias for goTestUnit in metricbeat

* Only include test output when `mage -v` is used

The full test output is written to a file and we archive that. Additionally if a test fails that output is still logged out stderr.

This helps speed things up because Jenkins doesn't need to deal with streaming megabytes of log output to the console.
It also makes it easier to spot errors in the log.

* Jenkinsfile updates

Changes:

- Disable macOS by default. These workers don't have python3 so they cannot a portion of the tests.
- Add python38 to the PATH on Windows.
- Various fixes to the environment variables on Windows.
- Always add the GVM GOROOT/bin to the PATH on POSIX. Same as was being done on Windows.
- Use bat instead of sh on Windows to run `mage dumpVariables`.

* Add MAGEFILE_VERBOSE to travis-ci env

(cherry picked from commit 0a171b5)
andrewkroh added a commit that referenced this pull request Mar 26, 2020
* Backport Jenkinsfile and supporting scripts

Files are from b82b9db

* [ci] Make tests pass in Jenkinsfile pipeline (#17071)

* Address failing tests and warnings

* Ensure mage unitTest works consistently

Windows will invoke `mage unitTest` that will run the Go and Python tests without requiring the integration tests environment.

Use an alias for goTestUnit in metricbeat

* Only include test output when `mage -v` is used

The full test output is written to a file and we archive that. Additionally if a test fails that output is still logged out stderr.

This helps speed things up because Jenkins doesn't need to deal with streaming megabytes of log output to the console.
It also makes it easier to spot errors in the log.

* Jenkinsfile updates

Changes:

- Disable macOS by default. These workers don't have python3 so they cannot a portion of the tests.
- Add python38 to the PATH on Windows.
- Various fixes to the environment variables on Windows.
- Always add the GVM GOROOT/bin to the PATH on POSIX. Same as was being done on Windows.
- Use bat instead of sh on Windows to run `mage dumpVariables`.

* Add MAGEFILE_VERBOSE to travis-ci env

(cherry picked from commit 0a171b5)
@andrewkroh andrewkroh deleted the backport_jenkinsfile branch January 14, 2022 14:09
leweafan pushed a commit to leweafan/beats that referenced this pull request Apr 28, 2023
…stic#17252)

* Backport Jenkinsfile and supporting scripts

Files are from ae26cea

* [ci] Make tests pass in Jenkinsfile pipeline (elastic#17071)

* Address failing tests and warnings

* Ensure mage unitTest works consistently

Windows will invoke `mage unitTest` that will run the Go and Python tests without requiring the integration tests environment.

Use an alias for goTestUnit in metricbeat

* Only include test output when `mage -v` is used

The full test output is written to a file and we archive that. Additionally if a test fails that output is still logged out stderr.

This helps speed things up because Jenkins doesn't need to deal with streaming megabytes of log output to the console.
It also makes it easier to spot errors in the log.

* Jenkinsfile updates

Changes:

- Disable macOS by default. These workers don't have python3 so they cannot a portion of the tests.
- Add python38 to the PATH on Windows.
- Various fixes to the environment variables on Windows.
- Always add the GVM GOROOT/bin to the PATH on POSIX. Same as was being done on Windows.
- Use bat instead of sh on Windows to run `mage dumpVariables`.

* Add MAGEFILE_VERBOSE to travis-ci env

(cherry picked from commit 1de4267)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants