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(jenkins): backport commits from long time ago #3438

Merged
merged 27 commits into from
Mar 9, 2020

Conversation

v1v
Copy link
Member

@v1v v1v commented Mar 6, 2020

Description:

Questions

  • What kind of merge do I use for this PR?
    • I'll proceed to squash and merge. Then I'll backport to the 7.x branch

Tests

  • build got 2160 tests.
  • 7.6 got 1080 tests.

image

v1v and others added 24 commits March 6, 2020 10:04
* Revert "ci(jenkins): Fix environment variable used to calculate git commit (elastic#2633)"
This reverts commit 602c10d.
* Revert "ci(jenkins): avoid using the any agent to skip running in the master-worker (elastic#2617)"
This reverts commit 674569a.
* feat: grab docker container logs after run tests

* fix: set execution permission on .ci/scripts/docker-get-logs.sh

* chore: make docker-info path shorter

* feat: grab system test junit results
* feat: enable DIAGNOSTIC_INTERVAL env var
* script/jenkins: simplify unit-test.sh

No need to use a separate tool for coverage
testing, recent versions of the go tool give
the ability to run tests for multiple packages
and capture coverage.

* script: remove GOPATH assumption in build_apm_docs

* script/jenkins: remove unused scripts

* Update script/build_apm_docs.sh

Co-Authored-By: Brandon Morelli <[email protected]>

Co-authored-by: Brandon Morelli <[email protected]>
* fix: build inside a Golang Docker container

* white spaces police suggestions :)

Co-Authored-By: Victor Martinez <[email protected]>
)

* ci: move benchmark stage to run in a tool Docker container

* Update script/jenkins/bench.sh
* add package install test, add labels to script steps
@@ -200,7 +200,7 @@ func TestPackagesInstall() error {
args = append(args, "-tags=package")

if out, err := goTest(args...); err != nil {
if !mg.Verbose() {
if mg.Verbose() {
Copy link
Member Author

Choose a reason for hiding this comment

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

@@ -347,3 +347,8 @@ func Check() error {
func Fmt() {
mg.Deps(mage.Format)
}

// PythonUnitTest executes the python system tests.
Copy link
Member Author

Choose a reason for hiding this comment

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

echo "Index document: ${index}"
index_path=$(basename $(dirname $index))
echo "Index path: $index_path"
echo "Building docs for ${name}..."
Copy link
Member Author

Choose a reason for hiding this comment

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


jenkins_setup

make test-deps
make bench | tee bench.out
Copy link
Member Author

Choose a reason for hiding this comment

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

@@ -1,15 +1,4 @@
#!/usr/bin/env bash
set -euo pipefail
set -xeuo pipefail
Copy link
Member Author

Choose a reason for hiding this comment

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

@@ -5,4 +5,4 @@ set -euox pipefail
# to prevent jenkins_release.sh from adding more PLATFORMS
export PLATFORMS="${PLATFORMS:-+linux/amd64}"

./_beats/dev-tools/jenkins_release.sh
mage -debug package
Copy link
Member Author

Choose a reason for hiding this comment

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


make update prepare-tests test-deps

(gotestcover -race -coverprofile=${COV_DIR}/unit.cov -v ./... 2>&1 | tee ${OUT_FILE}) || echo -e "\033[31;49mTests FAILED\033[0m"
(go test -race -covermode=atomic -coverprofile=${COV_DIR}/unit.cov -v ./... 2>&1 | tee ${OUT_FILE}) || echo -e "\033[31;49mTests FAILED\033[0m"
Copy link
Member Author

Choose a reason for hiding this comment

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

@v1v v1v requested review from simitt and a team March 6, 2020 12:58
@v1v v1v marked this pull request as ready for review March 6, 2020 12:58
@v1v v1v merged commit 8c32d8b into elastic:7.6 Mar 9, 2020
@v1v v1v deleted the fix/tests-for-7.6 branch March 9, 2020 09:04
v1v added a commit to v1v/apm-server that referenced this pull request Mar 9, 2020
* ci(jenkins): avoid builds in the master worker (elastic#2599)
* ci(jenkins): build and test stages are now merged. (elastic#2614)
* ci(jenkins): rename APM ITs to avoid any misleading (elastic#2629)
* ci(jenkins): revert none agent (elastic#2645)
* ci(jenkins): reuse top level agent (elastic#2774)
* ci(jenkins): update argument (elastic#2904)
* [apm-ci] When asciidoc speedup skip some stages (elastic#2891)
* ci(jenkins): change log rotation, use cached repo (elastic#2970)
* ci(jenkins): use git reference repo (elastic#2971)
* feat: grab docker container logs after run tests (elastic#2948)
* ci(jenkins): shallow cloning doesn't work with isGitRegionMatch (elastic#2998)
* ci(jenkins): cancel previous running builds (elastic#2983)
* feat: enable DIAGNOSTIC_INTERVAL env var (elastic#3032)
* ci(jenkins): when regexp comparator (elastic#2644)
* fix: trigger on _beats changes (elastic#3189)
* ci(jenkins): retry build docker image up to 3 times with some sleep
* Simplify build scripts (elastic#3371)
* ci(jenkins): apm-its-downstream params has changed (elastic#3406)
* fix: build inside a Golang Docker container (elastic#2375)
* ci: move benchmark stage to run in a tool Docker container (elastic#2391)
* add package install test, add labels to script steps (elastic#2268)
* [apm-ci] suppress the NativeCommandError in windows builds (elastic#2890)
* ci(jenkins): fix issues with python3 in branch 6.8 (elastic#3428)
* ci(jenkins): apm-its are not required in the CI Pipeline
v1v added a commit that referenced this pull request Mar 10, 2020
* ci(jenkins): backport commits from long time ago (#3438)
* ci(jenkins): avoid builds in the master worker (#2599)
* ci(jenkins): build and test stages are now merged. (#2614)
* ci(jenkins): rename APM ITs to avoid any misleading (#2629)
* ci(jenkins): revert none agent (#2645)
* ci(jenkins): reuse top level agent (#2774)
* ci(jenkins): update argument (#2904)
* [apm-ci] When asciidoc speedup skip some stages (#2891)
* ci(jenkins): change log rotation, use cached repo (#2970)
* ci(jenkins): use git reference repo (#2971)
* feat: grab docker container logs after run tests (#2948)
* ci(jenkins): shallow cloning doesn't work with isGitRegionMatch (#2998)
* ci(jenkins): cancel previous running builds (#2983)
* feat: enable DIAGNOSTIC_INTERVAL env var (#3032)
* ci(jenkins): when regexp comparator (#2644)
* fix: trigger on _beats changes (#3189)
* ci(jenkins): retry build docker image up to 3 times with some sleep
* Simplify build scripts (#3371)
* ci(jenkins): apm-its-downstream params has changed (#3406)
* fix: build inside a Golang Docker container (#2375)
* ci: move benchmark stage to run in a tool Docker container (#2391)
* add package install test, add labels to script steps (#2268)
* [apm-ci] suppress the NativeCommandError in windows builds (#2890)
* ci(jenkins): fix issues with python3 in branch 6.8 (#3428)
* ci(jenkins): apm-its are not required in the CI Pipeline
* Use python3
* ci(jenkins): remove leftovers from the APM-ITS
* fix: build inside a Golang Docker container (#2375)
* fix: use fixed dependencies on golang Docker container (#2410)
* ci(jenkins): build CI Docker images (#2498)
* partial cherry-pick from #3357

Co-authored-by: Ivan Fernandez Calvo <[email protected]>
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.

6 participants