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

Merge ecs-secrets-phase2 branch to dev #1713

Merged
merged 8 commits into from
Dec 4, 2018
Merged

Conversation

yumex93
Copy link
Contributor

@yumex93 yumex93 commented Nov 30, 2018

Summary

Finished manual testing for secrets phase2, merge ecs-secrets-phase2 branch to dev branch and manually fix conflicts

Implementation details

git merge ecs-secrets-phase2 on dev branch

Testing

  • Builds on Linux (make release)
  • Builds on Windows (go build -out amazon-ecs-agent.exe ./agent)
  • Unit tests on Linux (make test) pass
  • Unit tests on Windows (go test -timeout=25s ./agent/...) pass
  • Integration tests on Linux (make run-integ-tests) pass
  • Integration tests on Windows (.\scripts\run-integ-tests.ps1) pass
  • Functional tests on Linux (make run-functional-tests) pass
  • Functional tests on Windows (.\scripts\run-functional-tests.ps1) pass

Licensing

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

@yumex93 yumex93 requested a review from a team November 30, 2018 20:26
@yumex93 yumex93 added bot/test and removed bot/test labels Nov 30, 2018
"Version": 17
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

isnt this 18?

Copy link
Contributor Author

@yumex93 yumex93 Dec 3, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the test case for secrets integrating with ssm(phase 1).

@yumex93 yumex93 added bot/test and removed bot/test labels Dec 4, 2018
@yumex93 yumex93 merged commit 668bee5 into aws:dev Dec 4, 2018
@yumex93 yumex93 added this to the 1.23.0 milestone Dec 4, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants