-
Notifications
You must be signed in to change notification settings - Fork 2k
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
[18.09 backport] Fixes for e2e testing after Alpine bump #1729
[18.09 backport] Fixes for e2e testing after Alpine bump #1729
Conversation
... in preference to `chsh`, since in recent alpine 3.9.2 images that can fail with: Password: chsh: PAM: Authentication token manipulation error Which seems to relate to the use of `!` as the password for `root` in `/etc/shadow`gq Signed-off-by: Ian Campbell <[email protected]> (cherry picked from commit 5de2d9e) Signed-off-by: Sebastiaan van Stijn <[email protected]>
... for improved readability Signed-off-by: Ian Campbell <[email protected]> (cherry picked from commit e854a9c) Signed-off-by: Sebastiaan van Stijn <[email protected]>
Signed-off-by: Ian Campbell <[email protected]> (cherry picked from commit 0b0c578) Signed-off-by: Sebastiaan van Stijn <[email protected]>
Codecov Report
@@ Coverage Diff @@
## 18.09 #1729 +/- ##
=======================================
Coverage 54.09% 54.09%
=======================================
Files 290 290
Lines 19406 19406
=======================================
Hits 10498 10498
Misses 8236 8236
Partials 672 672 |
1 similar comment
Codecov Report
@@ Coverage Diff @@
## 18.09 #1729 +/- ##
=======================================
Coverage 54.09% 54.09%
=======================================
Files 290 290
Lines 19406 19406
=======================================
Hits 10498 10498
Misses 8236 8236
Partials 672 672 |
ping @vdemeester @silvin-lubecki PTAL 🤗 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM 🐯
backport of #1728 for 18.09
Somewhere between Thursday and Friday last week the
docker:test-dind
image was updated from an alpine 3.9.0 base to 3.9.2. This broke the use ofchsh
ine2e/testdata/Dockerfile.connhelper-ssh
:(this seems to relate to
root
's entry in/etc/shadow
changing fromroot:::0:::::\nbin:!::0:::::
toroot:!::0:::::\nbin:!::0:::::
).Avoid this by just using the
--shell
option touseradd
instead.Also simplify things by using
--password
instead ofusermod -p
(even though this was not broken) and also spell out-m
in full as--create-home
for clarity.