etcd icon indicating copy to clipboard operation
etcd copied to clipboard

Published 20 hours ago • verified publisher icon etcd-io

[Release-3.5] Makefile: additional logic fix / Update Ubuntu base

Open mrueg opened this issue 3 years ago • 6 comments

backport of https://github.com/etcd-io/etcd/pull/13860 and updating the used ubuntu base image to something that is not EOL.

mrueg avatar Mar 31 '22 09:03 mrueg

@ptabor let me know if you're okay with 21.10 (will only have support till July) here or want to revert it to 20.04 (it was 18.04 originally, then moved to 20.10)

mrueg avatar Mar 31 '22 09:03 mrueg

Question: Are we using test docker image at all?

serathius avatar Apr 04 '22 08:04 serathius

It's referenced in https://github.com/etcd-io/etcd/blob/main/Makefile#L69 which builds gcr.io/etcd-development/etcd-test:go-1.x which is used in https://github.com/etcd-io/etcd/blob/main/Makefile#L124

mrueg avatar Apr 04 '22 13:04 mrueg

Sure

It's referenced in https://github.com/etcd-io/etcd/blob/main/Makefile#L69 which builds gcr.io/etcd-development/etcd-test:go-1.x which is used in https://github.com/etcd-io/etcd/blob/main/Makefile#L124

Sure, however we no longer use docker-test in CI. Instead of fixing the commands we are unsure anyone uses we should decide whether it's worth to maintain them. I think we should open an issue to propose dropping support for testing in docker and ask if anyone uses them.

serathius avatar Apr 04 '22 13:04 serathius

Sure

It's referenced in https://github.com/etcd-io/etcd/blob/main/Makefile#L69 which builds gcr.io/etcd-development/etcd-test:go-1.x which is used in https://github.com/etcd-io/etcd/blob/main/Makefile#L124

Sure, however we no longer use docker-test in CI. Instead of fixing the commands we are unsure anyone uses we should decide whether it's worth to maintain them. I think we should open an issue to propose dropping support for testing in docker and ask if anyone uses them.

Sounds good, I guess for the release-3.5 it still makes sense to keep changes minimal?

mrueg avatar Apr 04 '22 14:04 mrueg

This issue has been automatically marked as stale because it has not had recent activity. It will be closed after 21 days if no further activity occurs. Thank you for your contributions.

stale[bot] avatar Jul 10 '22 05:07 stale[bot]

@mrueg Could you please rebase this PR and signoff each commit? Although docker test has already been removed from main, this PR makes sense for 3.5.

ahrtr avatar Oct 09 '22 06:10 ahrtr

@ahrtr sure, done!

mrueg avatar Oct 09 '22 17:10 mrueg

@ahrtr sure, done!

This PR is still based on an very old commit (https://github.com/mrueg/etcd/commit/bf22ef3b03e003480fa2c60679160579e17733d7). You need to sync your local branch release-3.5 with the upstream release-3.5, and then rebase this PR against your local release-3.5 branch.

It should can resolve the semaphoreci failure.

ahrtr avatar Oct 09 '22 21:10 ahrtr

Rebased and switched it to ubuntu 22.04, as ubuntu 21.10 went EOL in July.

mrueg avatar Oct 10 '22 20:10 mrueg

Thanks @spzala

@mrueg would you mind backporting this PR to 3.4 ?

ahrtr avatar Oct 12 '22 18:10 ahrtr

@ahrtr which part do you want to see backported to 3.4? release-3.4 uses ubuntu 18.04 which should be EOL Apr 2023.

mrueg avatar Oct 14 '22 16:10 mrueg

@ahrtr which part do you want to see backported to 3.4? release-3.4 uses ubuntu 18.04 which should be EOL Apr 2023.

Thanks for the info. 3.4 will be out of support once v3.6.0 is released. But it isn't clear when 3.6.0 will be available for now. So It might be better to bump to 22.04 for 3.4 as well.

https://wiki.ubuntu.com/Releases

ahrtr avatar Oct 14 '22 19:10 ahrtr