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

[mrueg]

backport of #13860 and updating the used ubuntu base image to something that is not EOL.

[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)

[ahrtr]

It isn't necessary to keep using the same version across different releases. I'd defer to others (@serathius @ptabor @spzala ) to make a decision here.

[mrueg]

This one got updated due to ubuntu 20.10 being EOL and failing with

E: The repository 'http://security.ubuntu.com/ubuntu groovy-security Release' does not have a Release file.

when trying to build.

[ptabor]

Updating to 21.10 looks good to me.

[serathius]

Question: Are we using test docker image at all?

[mrueg]

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

[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.

[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.

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

[stale]

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.

[ahrtr]

@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.

[mrueg]

@ahrtr sure, done!

[ahrtr]

@ahrtr sure, done!

This PR is still based on an very old commit (mrueg@bf22ef3). 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.

[mrueg]

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

[ahrtr]

LGTM

Thank you @mrueg

[spzala]

@mrueg thanks! lgtm, defer to @serathius @ahrtr Also, how about v3.4 which use ubuntu 18.04 ?

[ahrtr]

Thanks @spzala

@mrueg would you mind backporting this PR to 3.4 ?

[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.

[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.

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