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

[7.13](backport #420) Propagate checkin status to agent record #442

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 8, 2021

This is an automatic backport of pull request #420 done by Mergify.
Cherry-pick of 73fcdb4 has failed:

On branch mergify/bp/7.13/pr-420
Your branch is up to date with 'origin/7.13'.

You are currently cherry-picking commit 73fcdb4.
  (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)

Changes to be committed:
	modified:   cmd/fleet/schema.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   cmd/fleet/handleCheckin.go
	deleted by us:   internal/pkg/checkin/bulk.go
	deleted by us:   internal/pkg/checkin/bulk_test.go
	both modified:   internal/pkg/dl/constants.go

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/

(cherry picked from commit 73fcdb4)

# Conflicts:
#	cmd/fleet/handleCheckin.go
#	internal/pkg/checkin/bulk.go
#	internal/pkg/checkin/bulk_test.go
#	internal/pkg/dl/constants.go
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Jun 8, 2021
@elasticmachine
Copy link
Contributor

elasticmachine commented Jun 8, 2021

💔 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: Branch indexing

  • Start Time: 2021-06-25T22:28:23.009+0000

  • Duration: 2 min 14 sec

  • Commit: c40bb98

Trends 🧪

Image of Build Times

Steps errors 1

Expand to view the steps failures

check
  • Took 0 min 9 sec . View more details on here
  • Description: make check

Log output

Expand to view the last 100 lines of log output

[2021-06-25T22:30:17.937Z] Masking supported pattern matches of $GITHUB_TOKEN
[2021-06-25T22:30:18.895Z] [WARN] githubApiCall: The REST API call https://api.github.com/repos/elastic/fleet-server/pulls/442/reviews return 0 elements
[2021-06-25T22:30:18.919Z] [INFO] githubPrCheckApproved: Title: [7.13](backport #420) Propagate checkin status to agent record - User: mergify[bot] - Author Association: NONE
[2021-06-25T22:30:19.748Z] Stashed 1026 file(s)
[2021-06-25T22:30:19.795Z] Running in /var/lib/jenkins/workspace/gest-manager_fleet-server_PR-442/src/github.com/elastic/fleet-server
[2021-06-25T22:30:21.075Z] + gvm 1.15.8
[2021-06-25T22:30:26.387Z] export GOROOT="/var/lib/jenkins/workspace/gest-manager_fleet-server_PR-442/.gvm/versions/go1.15.8.linux.amd64"
[2021-06-25T22:30:26.387Z] export PATH="/var/lib/jenkins/workspace/gest-manager_fleet-server_PR-442/.gvm/versions/go1.15.8.linux.amd64/bin:$PATH"
[2021-06-25T22:30:26.443Z] Running in /var/lib/jenkins/workspace/gest-manager_fleet-server_PR-442/src/github.com/elastic/fleet-server
[2021-06-25T22:30:26.732Z] + make check
[2021-06-25T22:30:26.732Z] make[1]: Entering directory '/var/lib/jenkins/workspace/gest-manager_fleet-server_PR-442/src/github.com/elastic/fleet-server'
[2021-06-25T22:30:26.732Z] ✓ Installing module for go generate
[2021-06-25T22:30:26.732Z] go install github.com/aleksmaus/generate/...
[2021-06-25T22:30:27.673Z] go: downloading github.com/aleksmaus/generate v0.0.0-20210326194607-c630e07a2742
[2021-06-25T22:30:27.934Z] ✓ Running go generate
[2021-06-25T22:30:27.934Z] go generate ./...
[2021-06-25T22:30:27.934Z] go: downloading github.com/elastic/go-elasticsearch/v8 v8.0.0-20210414074309-f7ffd04b8d6a
[2021-06-25T22:30:27.934Z] go: downloading github.com/rs/zerolog v1.19.0
[2021-06-25T22:30:27.934Z] go: downloading github.com/elastic/beats/v7 v7.11.1
[2021-06-25T22:30:27.934Z] go: downloading golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208
[2021-06-25T22:30:27.934Z] go: downloading github.com/julienschmidt/httprouter v1.3.0
[2021-06-25T22:30:27.934Z] go: downloading github.com/elastic/go-ucfg v0.8.3
[2021-06-25T22:30:27.934Z] go: downloading github.com/spf13/cobra v0.0.5
[2021-06-25T22:30:27.934Z] go: downloading github.com/miolini/datacounter v1.0.2
[2021-06-25T22:30:27.934Z] go: downloading golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e
[2021-06-25T22:30:27.934Z] go: downloading github.com/elastic/elastic-agent-client/v7 v7.0.0-20200709172729-d43b7ad5833a
[2021-06-25T22:30:27.934Z] go: downloading github.com/hashicorp/golang-lru v0.5.2-0.20190520140433-59383c442f7d
[2021-06-25T22:30:27.934Z] go: downloading github.com/hashicorp/go-version v1.3.0
[2021-06-25T22:30:27.934Z] go: downloading github.com/spf13/pflag v1.0.5
[2021-06-25T22:30:28.194Z] go: downloading google.golang.org/protobuf v1.24.0
[2021-06-25T22:30:28.194Z] go: downloading google.golang.org/grpc v1.29.1
[2021-06-25T22:30:28.194Z] go: downloading github.com/golang/protobuf v1.4.2
[2021-06-25T22:30:28.456Z] go: downloading github.com/pkg/errors v0.9.1
[2021-06-25T22:30:28.456Z] go: downloading golang.org/x/net v0.0.0-20200822124328-c89045814202
[2021-06-25T22:30:28.456Z] go: downloading github.com/dgraph-io/ristretto v0.0.3
[2021-06-25T22:30:28.456Z] go: downloading go.uber.org/zap v1.14.0
[2021-06-25T22:30:28.456Z] go: downloading github.com/gofrs/uuid v3.3.0+incompatible
[2021-06-25T22:30:28.456Z] go: downloading golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae
[2021-06-25T22:30:28.456Z] go: downloading go.uber.org/atomic v1.5.0
[2021-06-25T22:30:28.456Z] go: downloading google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013
[2021-06-25T22:30:28.717Z] go: downloading gopkg.in/yaml.v2 v2.3.0
[2021-06-25T22:30:28.717Z] go: downloading go.uber.org/multierr v1.3.0
[2021-06-25T22:30:28.717Z] go: downloading golang.org/x/text v0.3.3
[2021-06-25T22:30:29.659Z] go: downloading github.com/cespare/xxhash v1.1.0
[2021-06-25T22:30:34.941Z] go: downloading github.com/elastic/gosigar v0.13.0
[2021-06-25T22:30:34.941Z] go: downloading github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901
[2021-06-25T22:30:34.941Z] go: downloading github.com/elastic/go-sysinfo v1.3.0
[2021-06-25T22:30:34.941Z] go: downloading go.elastic.co/ecszap v0.3.0
[2021-06-25T22:30:34.941Z] go: downloading go.elastic.co/apm v1.8.1-0.20200909061013-2aef45b9cf4b
[2021-06-25T22:30:34.941Z] go: downloading github.com/hashicorp/go-multierror v1.1.0
[2021-06-25T22:30:34.941Z] go: downloading golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
[2021-06-25T22:30:34.941Z] go: downloading github.com/mattn/go-colorable v0.0.8
[2021-06-25T22:30:34.941Z] go: downloading github.com/hashicorp/errwrap v1.0.0
[2021-06-25T22:30:34.941Z] go: downloading github.com/fatih/color v1.5.0
[2021-06-25T22:30:34.941Z] go: downloading howett.net/plist v0.0.0-20181124034731-591f970eefbb
[2021-06-25T22:30:34.941Z] go: downloading github.com/prometheus/procfs v0.0.11
[2021-06-25T22:30:34.941Z] go: downloading github.com/mattn/go-isatty v0.0.2
[2021-06-25T22:30:34.941Z] go: downloading go.elastic.co/fastjson v1.1.0
[2021-06-25T22:30:34.941Z] go: downloading github.com/armon/go-radix v1.0.0
[2021-06-25T22:30:34.941Z] internal/pkg/model/schema.go
[2021-06-25T22:30:34.941Z] internal/pkg/es/mapping.go
[2021-06-25T22:30:34.941Z] make[1]: Leaving directory '/var/lib/jenkins/workspace/gest-manager_fleet-server_PR-442/src/github.com/elastic/fleet-server'
[2021-06-25T22:30:34.941Z] make[1]: Entering directory '/var/lib/jenkins/workspace/gest-manager_fleet-server_PR-442/src/github.com/elastic/fleet-server'
[2021-06-25T22:30:34.941Z] go: downloading github.com/elastic/go-licenser v0.3.1
[2021-06-25T22:30:35.512Z] make[1]: Leaving directory '/var/lib/jenkins/workspace/gest-manager_fleet-server_PR-442/src/github.com/elastic/fleet-server'
[2021-06-25T22:30:35.512Z] make[1]: Entering directory '/var/lib/jenkins/workspace/gest-manager_fleet-server_PR-442/src/github.com/elastic/fleet-server'
[2021-06-25T22:30:35.771Z] cmd/fleet/handleCheckin.go:167:1: expected statement, found '<<'
[2021-06-25T22:30:35.771Z] cmd/fleet/handleCheckin.go:201:1: expected statement, found '<<'
[2021-06-25T22:30:35.771Z] cmd/fleet/handleCheckin.go:242:1: expected statement, found '<<'
[2021-06-25T22:30:35.771Z] cmd/fleet/handleCheckin.go:260:37: missing ',' in argument list
[2021-06-25T22:30:35.771Z] cmd/fleet/handleCheckin.go:263:2: missing ',' in argument list
[2021-06-25T22:30:35.771Z] cmd/fleet/handleCheckin.go:264:3: expected operand, found 'return'
[2021-06-25T22:30:35.771Z] cmd/fleet/handleCheckin.go:265:3: missing ',' before newline in argument list
[2021-06-25T22:30:35.771Z] cmd/fleet/handleCheckin.go:267:19: missing ',' in argument list
[2021-06-25T22:30:35.771Z] cmd/fleet/handleCheckin.go:268:20: missing ',' in argument list
[2021-06-25T22:30:35.771Z] cmd/fleet/handleCheckin.go:270:2: expected operand, found 'if'
[2021-06-25T22:30:35.771Z] cmd/fleet/handleCheckin.go:272:13: missing ',' in argument list
[2021-06-25T22:30:35.771Z] exit status 2
[2021-06-25T22:30:35.771Z] internal/pkg/dl/constants.go:34:1: expected 'IDENT', found '<<'
[2021-06-25T22:30:35.771Z] internal/pkg/dl/constants.go:57:1: expected 'IDENT', found 'const'
[2021-06-25T22:30:35.771Z] internal/pkg/dl/constants.go:57:1: missing constant value
[2021-06-25T22:30:35.771Z] internal/pkg/dl/constants.go:58:19: expected ')', found '='
[2021-06-25T22:30:35.771Z] internal/pkg/dl/constants.go:60:3: expected ')', found 'EOF'
[2021-06-25T22:30:35.771Z] exit status 2
[2021-06-25T22:30:35.771Z] Makefile:63: recipe for target 'check-go' failed
[2021-06-25T22:30:35.771Z] make[1]: *** [check-go] Error 1
[2021-06-25T22:30:35.771Z] make[1]: Leaving directory '/var/lib/jenkins/workspace/gest-manager_fleet-server_PR-442/src/github.com/elastic/fleet-server'
[2021-06-25T22:30:35.771Z] Makefile:50: recipe for target 'check' failed
[2021-06-25T22:30:35.771Z] make: *** [check] Error 2
[2021-06-25T22:30:35.816Z] Stage "Local" skipped due to earlier failure(s)
[2021-06-25T22:30:35.835Z] Stage "Test" skipped due to earlier failure(s)
[2021-06-25T22:30:36.601Z] Running on Jenkins in /var/lib/jenkins/workspace/gest-manager_fleet-server_PR-442
[2021-06-25T22:30:36.819Z] [INFO] getVaultSecret: Getting secrets
[2021-06-25T22:30:36.857Z] Masking supported pattern matches of $VAULT_ADDR or $VAULT_ROLE_ID or $VAULT_SECRET_ID
[2021-06-25T22:30:37.519Z] + chmod 755 generate-build-data.sh
[2021-06-25T22:30:37.519Z] + ./generate-build-data.sh https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Ingest-manager/fleet-server/PR-442/ https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Ingest-manager/fleet-server/PR-442/runs/10 FAILURE 134247
[2021-06-25T22:30:37.519Z] INFO: curl https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Ingest-manager/fleet-server/PR-442/runs/10/steps/?limit=10000 -o steps-info.json
[2021-06-25T22:30:37.519Z] INFO: curl https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Ingest-manager/fleet-server/PR-442/runs/10/tests/?status=FAILED -o tests-errors.json
[2021-06-25T22:30:37.769Z] Retry 1/3 exited 22, retrying in 1 seconds...
[2021-06-25T22:30:38.681Z] Retry 2/3 exited 22, retrying in 2 seconds...

@ph ph closed this Jun 28, 2021
@mergify mergify bot deleted the mergify/bp/7.13/pr-420 branch June 28, 2021 13:14
@ph
Copy link
Contributor

ph commented Jun 28, 2021

@jen-huang I've played with the conflicts and tried to resolve them but I think this would require a more investment to bring more commit into this PR. I think this is too risky to do. I will close this PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport conflicts There is a conflict in the backported pull request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants