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

chore: abstract image pulling (backport #1137) #1138

Merged
merged 2 commits into from
May 6, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 5, 2021

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

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

You are currently cherry-picking commit 4c0075fb.
  (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/ingest_manager_test.go
	both modified:   internal/docker/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/

(cherry picked from commit 4c0075f)

# Conflicts:
#	e2e/_suites/fleet/ingest_manager_test.go
#	internal/docker/docker.go
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label May 5, 2021
@elasticmachine
Copy link
Contributor

elasticmachine commented May 5, 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 #1138 updated

  • Start Time: 2021-05-06T06:41:43.272+0000

  • Duration: 19 min 5 sec

  • Commit: e0c4009

Test stats 🧪

Test Results
Failed 0
Passed 152
Skipped 0
Total 152

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 152
Skipped 0
Total 152

@mdelapenya
Copy link
Contributor

Needs #1140 to be merged first

@mergify
Copy link
Contributor Author

mergify bot commented May 5, 2021

This pull request is now in conflict. Could you fix it @mergify[bot]? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b mergify/bp/7.x/pr-1137 upstream/mergify/bp/7.x/pr-1137
git merge upstream/7.x
git push upstream mergify/bp/7.x/pr-1137

* 7.x:
  Pull fresh docker images before suite (#1123) (#1140)
@mdelapenya mdelapenya removed the conflicts There is a conflict in the backported pull request label May 6, 2021
@mdelapenya
Copy link
Contributor

@Mergifyio refresh

@mergify
Copy link
Contributor Author

mergify bot commented May 6, 2021

Command refresh: success

Pull request refreshed

@mdelapenya mdelapenya merged commit 961ddff into 7.x May 6, 2021
@mergify mergify bot deleted the mergify/bp/7.x/pr-1137 branch May 6, 2021 07:59
mdelapenya added a commit that referenced this pull request May 6, 2021
* 7.x:
  chore: abstract image pulling (#1137) (#1138)
  Pull fresh docker images before suite (#1123) (#1140)
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