Merge branch 'dev' into ipv6 #2629
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This reverts commit 899e233.
…2608) * Centralize DockerID getting, make it more resilient * Fix unit tests for containerID/containerName changes
Previously, the dockerID in the dockerContainer struct of a container is only saved in termination handler. This means that if the agent is forcefully stopped (e.g. via SIGKILL instead of SIGTERM), the dockerID is not saved, and as a result loses track of container if it is stopped by SIGKILL. This commit fixes the issue by saving the dockerID after creating the container.
Check that gogenerate does not generate a diff in CI Install mockgen 1.3.1 automatically in get-deps make target Remove static analysis and xplatform checks from travis job
This reverts commit a2299e2. This needs to be in a feature branch for now.
Next step will be to delete .travis.yml and the travis webhook from agent repo settings. That will be done after we've had time to evaluate and verify that github actions are working well and providing consistent test results.
yhlee-aws
approved these changes
Sep 11, 2020
cyastella
approved these changes
Sep 11, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Merge dev branch into ipv6 branch to test feature with latest code.
Implementation details
git mergeno merge conflict.Testing
Rely on existing tests.
Description for the changelog
N/A
Licensing
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.