Skip to content
This repository was archived by the owner on Sep 17, 2024. It is now read-only.

[7.x](backport #1159) feat: simplify the initialisation of versions#1176

Closed
mergify[bot] wants to merge 1 commit into7.xfrom
mergify/bp/7.x/pr-1159
Closed

[7.x](backport #1159) feat: simplify the initialisation of versions#1176
mergify[bot] wants to merge 1 commit into7.xfrom
mergify/bp/7.x/pr-1159

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented May 17, 2021

This is an automatic backport of pull request #1159 done by Mergify.
Cherry-pick of 4c3d3eb has failed:

On branch mergify/bp/7.x/pr-1159
Your branch is up to date with 'origin/7.x'.

You are currently cherry-picking commit 4c3d3ebe.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   e2e/_suites/fleet/stand-alone.go
	both modified:   e2e/_suites/kubernetes-autodiscover/autodiscover_test.go
	both modified:   e2e/_suites/metricbeat/metricbeat_test.go
	both modified:   internal/common/defaults.go
	both modified:   internal/installer/docker.go

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

* chore: use fixed version in shell scripts

* chore: move retry to utils

We could move it to its own package, but at this moment it's very small

* chore: initialise stackVesion at one single place

* chore: initialise agent version base at one single place

* chore: initialise agent version at one single place

* chore: reduce the number of requests to Elastic's artifacts endpoint

* chore: rename AgentVersionBase variable to BeatVersionBase

* chore: rename AgentVersion variable to BeatVersion

* chore: use Beat version in metricbeat test suite

* chore: check if the version must use the fallback after coming from a Git SHA

(cherry picked from commit 4c3d3eb)

# Conflicts:
#	e2e/_suites/fleet/stand-alone.go
#	e2e/_suites/kubernetes-autodiscover/autodiscover_test.go
#	e2e/_suites/metricbeat/metricbeat_test.go
#	internal/common/defaults.go
#	internal/installer/docker.go
@mergify mergify Bot added the conflicts There is a conflict in the backported pull request label May 17, 2021
@elasticmachine
Copy link
Copy Markdown
Contributor

💔 Build Failed

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: Pull request #1176 opened

  • Start Time: 2021-05-17T13:15:02.578+0000

  • Duration: 4 min 16 sec

  • Commit: 1d08a36

Test stats 🧪

Test Results
Failed 0
Passed 11
Skipped 0
Total 11

Trends 🧪

Image of Build Times

Image of Tests

Steps errors 4

Expand to view the steps failures

Install dependencies
  • Took 0 min 16 sec . View more details on here
  • Description: .ci/scripts/install-dependencies.sh
Install dependencies
  • Took 0 min 2 sec . View more details on here
  • Description: .ci/scripts/install-dependencies.sh
Build and test
  • Took 0 min 22 sec . View more details on here
  • Description: .ci/scripts/build-test.sh
Archive the artifacts
  • Took 0 min 0 sec . View more details on here
  • Description: [2021-05-17T13:17:52.974Z] Archiving artifacts script returned exit code 2

Log output

Expand to view the last 100 lines of log output

[2021-05-17T13:18:54.895Z] github.com/emirpasic/gods/trees/binaryheap
[2021-05-17T13:18:54.895Z] gopkg.in/src-d/go-git.v4/plumbing/protocol/packp/capability
[2021-05-17T13:18:54.895Z] github.com/kevinburke/ssh_config
[2021-05-17T13:18:54.895Z] gopkg.in/src-d/go-git.v4/utils/merkletrie/internal/frame
[2021-05-17T13:18:54.895Z] gopkg.in/src-d/go-git.v4/plumbing/protocol/packp/sideband
[2021-05-17T13:18:54.895Z] gopkg.in/src-d/go-git.v4/storage
[2021-05-17T13:18:54.895Z] golang.org/x/crypto/ed25519
[2021-05-17T13:18:54.896Z] golang.org/x/crypto/internal/subtle
[2021-05-17T13:18:54.896Z] gopkg.in/src-d/go-git.v4/storage/memory
[2021-05-17T13:18:54.896Z] golang.org/x/crypto/curve25519
[2021-05-17T13:18:54.896Z] gopkg.in/src-d/go-git.v4/utils/merkletrie
[2021-05-17T13:18:54.896Z] golang.org/x/crypto/poly1305
[2021-05-17T13:18:54.896Z] golang.org/x/crypto/chacha20
[2021-05-17T13:18:55.157Z] golang.org/x/crypto/blowfish
[2021-05-17T13:18:55.157Z] gopkg.in/src-d/go-git.v4/plumbing/protocol/packp
[2021-05-17T13:18:55.157Z] gopkg.in/src-d/go-git.v4/utils/merkletrie/filesystem
[2021-05-17T13:18:55.157Z] gopkg.in/src-d/go-git.v4/plumbing/object
[2021-05-17T13:18:55.157Z] gopkg.in/src-d/go-git.v4/plumbing/format/objfile
[2021-05-17T13:18:55.157Z] golang.org/x/crypto/ssh/internal/bcrypt_pbkdf
[2021-05-17T13:18:55.157Z] gopkg.in/src-d/go-git.v4/utils/merkletrie/index
[2021-05-17T13:18:55.157Z] github.com/elastic/e2e-testing/internal/sanitizer
[2021-05-17T13:18:55.157Z] golang.org/x/crypto/ssh
[2021-05-17T13:18:55.418Z] github.com/spf13/pflag
[2021-05-17T13:18:55.418Z] gopkg.in/src-d/go-git.v4/storage/filesystem/dotgit
[2021-05-17T13:18:55.679Z] gopkg.in/src-d/go-git.v4/storage/filesystem
[2021-05-17T13:18:55.679Z] gopkg.in/src-d/go-git.v4/plumbing/transport
[2021-05-17T13:18:55.679Z] gopkg.in/src-d/go-git.v4/plumbing/transport/internal/common
[2021-05-17T13:18:55.679Z] gopkg.in/src-d/go-git.v4/plumbing/revlist
[2021-05-17T13:18:55.679Z] google.golang.org/protobuf/internal/filetype
[2021-05-17T13:18:55.940Z] gopkg.in/src-d/go-git.v4/plumbing/transport/server
[2021-05-17T13:18:55.940Z] gopkg.in/src-d/go-git.v4/plumbing/transport/git
[2021-05-17T13:18:55.940Z] gopkg.in/src-d/go-git.v4/plumbing/transport/http
[2021-05-17T13:18:55.940Z] google.golang.org/protobuf/runtime/protoimpl
[2021-05-17T13:18:55.940Z] gopkg.in/src-d/go-git.v4/plumbing/transport/file
[2021-05-17T13:18:55.940Z] github.com/golang/protobuf/proto
[2021-05-17T13:18:55.940Z] google.golang.org/protobuf/types/known/anypb
[2021-05-17T13:18:55.940Z] google.golang.org/protobuf/types/known/durationpb
[2021-05-17T13:18:55.940Z] google.golang.org/protobuf/types/known/timestamppb
[2021-05-17T13:18:55.940Z] github.com/spf13/cobra
[2021-05-17T13:18:56.211Z] github.com/golang/protobuf/ptypes/duration
[2021-05-17T13:18:56.211Z] github.com/golang/protobuf/ptypes/any
[2021-05-17T13:18:56.211Z] github.com/golang/protobuf/ptypes/timestamp
[2021-05-17T13:18:56.211Z] golang.org/x/crypto/ssh/knownhosts
[2021-05-17T13:18:56.211Z] golang.org/x/crypto/ssh/agent
[2021-05-17T13:18:56.477Z] google.golang.org/genproto/googleapis/rpc/status
[2021-05-17T13:18:56.477Z] github.com/golang/protobuf/ptypes
[2021-05-17T13:18:56.477Z] github.com/xanzy/ssh-agent
[2021-05-17T13:18:56.477Z] google.golang.org/grpc/internal/status
[2021-05-17T13:18:56.477Z] gopkg.in/src-d/go-git.v4/plumbing/transport/ssh
[2021-05-17T13:18:56.477Z] google.golang.org/grpc/status
[2021-05-17T13:18:56.477Z] github.com/containerd/containerd/errdefs
[2021-05-17T13:18:56.477Z] gopkg.in/src-d/go-git.v4/plumbing/transport/client
[2021-05-17T13:18:56.477Z] github.com/containerd/containerd/platforms
[2021-05-17T13:18:56.477Z] github.com/docker/docker/errdefs
[2021-05-17T13:18:56.477Z] gopkg.in/src-d/go-git.v4
[2021-05-17T13:18:56.739Z] github.com/docker/docker/client
[2021-05-17T13:18:56.999Z] github.com/elastic/e2e-testing/internal/git
[2021-05-17T13:18:56.999Z] github.com/testcontainers/testcontainers-go
[2021-05-17T13:18:57.265Z] Makefile:11: recipe for target 'install' failed
[2021-05-17T13:18:57.265Z] make: *** [install] Error 2
[2021-05-17T13:18:57.265Z] make: Leaving directory '/var/lib/jenkins/workspace/2e-tests_e2e-testing-mbp_PR-1176/src/github.com/elastic/e2e-testing/cli'
[2021-05-17T13:18:57.295Z] Sleeping for 5 sec
[2021-05-17T13:19:02.306Z] ERROR: script returned exit code 2
[2021-05-17T13:19:02.306Z] Retrying
[2021-05-17T13:19:02.655Z] + .ci/scripts/install-dependencies.sh
[2021-05-17T13:19:02.655Z] + curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh
[2021-05-17T13:19:02.655Z] ++ go env GOPATH
[2021-05-17T13:19:02.655Z] + sh -s -- -b /var/lib/jenkins/workspace/2e-tests_e2e-testing-mbp_PR-1176/bin v1.34.1
[2021-05-17T13:19:02.655Z] golangci/golangci-lint info checking GitHub for tag 'v1.34.1'
[2021-05-17T13:19:02.916Z] golangci/golangci-lint info found version: 1.34.1 for v1.34.1/linux/amd64
[2021-05-17T13:19:03.860Z] golangci/golangci-lint info installed /var/lib/jenkins/workspace/2e-tests_e2e-testing-mbp_PR-1176/bin/golangci-lint
[2021-05-17T13:19:03.860Z] + go get -v golang.org/x/lint/golint
[2021-05-17T13:19:03.860Z] go: found golang.org/x/lint/golint in golang.org/x/lint v0.0.0-20210508222113-6edffad5e616
[2021-05-17T13:19:04.121Z] + make -C cli install
[2021-05-17T13:19:04.121Z] make: Entering directory '/var/lib/jenkins/workspace/2e-tests_e2e-testing-mbp_PR-1176/src/github.com/elastic/e2e-testing/cli'
[2021-05-17T13:19:04.121Z] go get -v -t ./...
[2021-05-17T13:19:04.694Z] github.com/elastic/e2e-testing/internal/common
[2021-05-17T13:19:04.694Z] # github.com/elastic/e2e-testing/internal/common
[2021-05-17T13:19:04.694Z] ../internal/common/defaults.go:32:1: syntax error: non-declaration statement outside function body
[2021-05-17T13:19:04.694Z] ../internal/common/defaults.go:34:1: syntax error: non-declaration statement outside function body
[2021-05-17T13:19:04.694Z] ../internal/common/defaults.go:35:5: BeatVersionBase redeclared in this block
[2021-05-17T13:19:04.694Z] 	previous declaration at ../internal/common/defaults.go:33:5
[2021-05-17T13:19:04.694Z] ../internal/common/defaults.go:36:1: syntax error: non-declaration statement outside function body
[2021-05-17T13:19:04.694Z] ../internal/common/defaults.go:36:68: invalid character U+0023 '#'
[2021-05-17T13:19:04.694Z] Makefile:11: recipe for target 'install' failed
[2021-05-17T13:19:04.694Z] make: *** [install] Error 2
[2021-05-17T13:19:04.694Z] make: Leaving directory '/var/lib/jenkins/workspace/2e-tests_e2e-testing-mbp_PR-1176/src/github.com/elastic/e2e-testing/cli'
[2021-05-17T13:19:04.723Z] Sleeping for 10 sec
[2021-05-17T13:19:16.072Z] Failed in branch Sanity checks
[2021-05-17T13:19:16.238Z] Stage "Build Docs" skipped due to earlier failure(s)
[2021-05-17T13:19:16.331Z] Stage "End-To-End Tests" skipped due to earlier failure(s)
[2021-05-17T13:19:16.427Z] Stage "Release" skipped due to earlier failure(s)
[2021-05-17T13:19:17.201Z] Running on Jenkins in /var/lib/jenkins/workspace/2e-tests_e2e-testing-mbp_PR-1176
[2021-05-17T13:19:17.481Z] [INFO] getVaultSecret: Getting secrets
[2021-05-17T13:19:17.530Z] Masking supported pattern matches of $VAULT_ADDR or $VAULT_ROLE_ID or $VAULT_SECRET_ID
[2021-05-17T13:19:18.478Z] + chmod 755 generate-build-data.sh
[2021-05-17T13:19:18.478Z] + ./generate-build-data.sh https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/e2e-tests/e2e-testing-mbp/PR-1176/ https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/e2e-tests/e2e-testing-mbp/PR-1176/runs/1 FAILURE 255629
[2021-05-17T13:19:18.478Z] INFO: curl https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/e2e-tests/e2e-testing-mbp/PR-1176/runs/1/steps/?limit=10000 -o steps-info.json
[2021-05-17T13:19:19.029Z] INFO: curl https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/e2e-tests/e2e-testing-mbp/PR-1176/runs/1/tests/?status=FAILED -o tests-errors.json
[2021-05-17T13:19:19.029Z] INFO: curl https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/e2e-tests/e2e-testing-mbp/PR-1176/runs/1/log/ -o pipeline-log.txt

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test Results
Failed 0
Passed 11
Skipped 0
Total 11

@mdelapenya mdelapenya closed this May 17, 2021
@mergify mergify Bot deleted the mergify/bp/7.x/pr-1159 branch May 17, 2021 14:03
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

conflicts There is a conflict in the backported pull request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants