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

[7.x](backport #1171) fix: resolve issues in k8s-autodiscover test suite#1174

Merged
mdelapenya merged 2 commits into7.xfrom
mergify/bp/7.x/pr-1171
May 17, 2021
Merged

[7.x](backport #1171) fix: resolve issues in k8s-autodiscover test suite#1174
mdelapenya merged 2 commits into7.xfrom
mergify/bp/7.x/pr-1171

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented May 17, 2021

This is an automatic backport of pull request #1171 done by Mergify.
Cherry-pick of 9d505cc has failed:

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

You are currently cherry-picking commit 9d505cc6.
  (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:   internal/deploy/docker_client.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   e2e/_suites/kubernetes-autodiscover/autodiscover_test.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/

* chore: use timeout factor when tagging docker images

* fix: resolve alias version in k8s-autodiscover test suite

* fix: use common versions for k8s-autodiscover

(cherry picked from commit 9d505cc)

# Conflicts:
#	e2e/_suites/kubernetes-autodiscover/autodiscover_test.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

elasticmachine commented May 17, 2021

💚 Build Succeeded

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 #1174 updated

  • Start Time: 2021-05-17T14:08:16.670+0000

  • Duration: 29 min 39 sec

  • Commit: 5c9eeb3

Test stats 🧪

Test Results
Failed 0
Passed 159
Skipped 0
Total 159

Trends 🧪

Image of Build Times

Image of Tests

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test Results
Failed 0
Passed 159
Skipped 0
Total 159

Version was moved to defaults
@mdelapenya mdelapenya removed the conflicts There is a conflict in the backported pull request label May 17, 2021
@mdelapenya mdelapenya merged commit 36a55ce into 7.x May 17, 2021
@mergify mergify bot deleted the mergify/bp/7.x/pr-1171 branch May 17, 2021 14:38
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants