Also build for CentOS 9. #270

Romain-Geissler-1A · 2022-03-07T09:34:25Z

Note: I have removed the btrfs support unconditionally as IMO the old condition "%if 1%{!?el8:1}" was always true, on every distros.

This includes changes inspired from #231.

thaJeztah · 2022-03-08T23:45:32Z

dockerfiles/rpm.dockerfile

+# Don't try to run runc on RHEL/CentOS as we don't package it anymore.
+RUN if [ "${BASE}" != "rhel" ] && [ "${BASE}" != "centos" ]; then runc --version; fi


I'd rather keep this change for a separate PR (sorry haven't been able to spend time to respond on the linked ticket); this definitely needs a wider discussion (and not something we should change overnight).

I'm ok with adding the stream9 to the list in CI though (note that this Jenkinsfile is used for CI, but the actual matrix for which we built is in our internal release pipeline, so it may not be included (yet) on the next build)

thaJeztah · 2022-03-08T23:45:32Z

dockerfiles/rpm.dockerfile

+# Don't try to run runc on RHEL/CentOS as we don't package it anymore.
+RUN if [ "${BASE}" != "rhel" ] && [ "${BASE}" != "centos" ]; then runc --version; fi


I'd rather keep this change for a separate PR (sorry haven't been able to spend time to respond on the linked ticket); this definitely needs a wider discussion (and not something we should change overnight).

I'm ok with adding the stream9 to the list in CI though (note that this Jenkinsfile is used for CI, but the actual matrix for which we built is in our internal release pipeline, so it may not be included (yet) on the next build)

I have updated this pull request to focus just on CentOS 9. I have split it in two commits, the second commit being now tracked in #272.

Romain-Geissler-1A · 2022-03-09T09:15:47Z

Note: it looks like Ci is failing, but external contributor can't see the logs (Access Denied Romain-Geissler-1A is missing the Global/Read permission), so I don't know why it's failing and can't fix it myself. Locally make quay.io/centos/centos:stream9 works for me.

Romain-Geissler-1A · 2022-03-12T21:07:52Z

I saw you have release docker 20.10.13 with Ubuntu Jammy this week, would it be possible to also tackle CentOS 9 ?

Romain-Geissler-1A · 2022-03-21T13:58:23Z

Note for maintainers: CI build is failing, but open source contributor can't see the output of Jenkins, so I would need you to tell me what's wrong in order to fix the build.

Romain-Geissler-1A · 2022-04-10T08:38:51Z

Ping (I don't know why the build fails)

Romain-Geissler-1A · 2022-04-18T16:08:18Z

Ping

Romain-Geissler-1A · 2022-04-25T22:42:42Z

Ping

rumpl · 2022-04-29T13:17:04Z

@Romain-Geissler-1A I looked at the failure, it's 'go get' is no longer supported outside a module., this should be fixed if you rebase your branch, see this commit for more info

Signed-off-by: Romain Geissler <romain.geissler@amadeus.com>

rumpl · 2022-04-29T13:54:33Z

On to the next error:

#13 19.02 Fetched 79.5 MB in 8s (9666 kB/s)

#13 19.02 E: Failed to fetch http://archive.raspbian.org/raspbian/pool/main/libh/libhtml-parser-perl/libhtml-parser-perl_3.75-1%2bb1_armhf.deb  Undetermined Error [IP: 93.93.128.191 80]

#13 19.02 E: Unable to fetch some archives, maybe run apt-get update or try with --fix-missing?

Not sure if it's related, @thaJeztah any ideas?

thaJeztah · 2022-04-29T15:23:14Z

I saw failures on docker/docker-ce-packaging#681 (comment) as well; looks like it's now green, so I'm guessing it was some failures with those package servers (or just general networking issues); let me give Jenkins another kick

thaJeztah · 2022-04-29T18:26:47Z

rpm/containerd.spec

-# Should only return true if `el8` (rhel8) is NOT defined
-%if 0%{!?el8:1}
-%if 0%{?suse_version}
-BuildRequires: libbtrfs-devel
-%else
-BuildRequires: btrfs-progs-devel
-%endif
-%endif


Not sure if this is correct; I think the intent here was to

include libbtrfs-devel on centos / rhel 7 (which still had btrfs?), and Fedora (?)

include btrfs-progs-devel on SUSE flavours (which default to using BTRFS as filesystem)

If I'm reading the current changes correctly, we're now excluding btrfs on all RPM variants (not just RHEL/CentOS > 7

Actually the removal of all this related to btrfs is linked not to these "ifs", but to another one further down:

%if 1%{!?el8:1} BUILDTAGS="${BUILDTAGS} no_btrfs" %endif

This "if" expression can only expand to a "true" value, so my understanding is that right now, we always build with flag "no_btrfs", no matter which distro is being used. Assuming that btrfs was never used, I also removed all dependency on btrfs build requires packages.

thaJeztah · 2022-04-29T18:29:33Z

rpm/containerd.spec

-# For some reason on rhel 8 if we "provide" runc then it makes this package unsearchable
-%if 0%{!?el8:1}
+# For some reason on rhel >= 8 if we "provide" runc then it makes this package unsearchable
+%if 0%{?rhel} <= 7


This may also be excluding this rule on Fedora, (open)SUSE, Oracle etc (assuming those don't have rhel defined), so a larger change than only "exclude on RHEL >= 8

Romain-Geissler-1A · 2022-05-03T08:14:34Z

Hi,

Are my replies to all concerns ok or I still need to change something ?

Note that RHEL 9 will be officially released this months, so people will start to need the CentOS 9 package ;)

Cheers,
Romain

thaJeztah · 2022-05-04T16:50:58Z

I worked on various permutations of these conditions, and opened #283, based on your commit; let me know if that looks good to you

Romain-Geissler-1A force-pushed the master branch 3 times, most recently from 6e1fe91 to 48ba0e0 Compare March 7, 2022 10:25

Romain-Geissler-1A mentioned this pull request Mar 7, 2022

[master] Build for CentOS 9. docker/docker-ce-packaging#634

Merged

thaJeztah reviewed Mar 8, 2022

View reviewed changes

Romain-Geissler-1A force-pushed the master branch from 48ba0e0 to b79cc82 Compare March 9, 2022 00:19

Romain-Geissler-1A mentioned this pull request Mar 9, 2022

Don't package runc for RHEL/CentOS >= 8 #272

Open

Also build for CentOS 9.

ee47082

Signed-off-by: Romain Geissler <romain.geissler@amadeus.com>

Romain-Geissler-1A force-pushed the master branch from b79cc82 to ee47082 Compare April 29, 2022 13:29

thaJeztah reviewed Apr 29, 2022

View reviewed changes

thaJeztah mentioned this pull request May 4, 2022

Also build for CentOS 9. #283

Merged

thaJeztah closed this in #283 May 4, 2022

		# Don't try to run runc on RHEL/CentOS as we don't package it anymore.
		RUN if [ "${BASE}" != "rhel" ] && [ "${BASE}" != "centos" ]; then runc --version; fi

Also build for CentOS 9. #270

Also build for CentOS 9. #270

Uh oh!

Conversation

Romain-Geissler-1A commented Mar 7, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

thaJeztah Mar 8, 2022

Choose a reason for hiding this comment

Uh oh!

thaJeztah Mar 8, 2022

Choose a reason for hiding this comment

Uh oh!

Romain-Geissler-1A Mar 9, 2022

Choose a reason for hiding this comment

Uh oh!

Romain-Geissler-1A commented Mar 9, 2022

Uh oh!

Romain-Geissler-1A commented Mar 12, 2022

Uh oh!

Romain-Geissler-1A commented Mar 21, 2022

Uh oh!

Romain-Geissler-1A commented Apr 10, 2022

Uh oh!

Romain-Geissler-1A commented Apr 18, 2022

Uh oh!

Romain-Geissler-1A commented Apr 25, 2022

Uh oh!

rumpl commented Apr 29, 2022

Uh oh!

rumpl commented Apr 29, 2022

Uh oh!

thaJeztah commented Apr 29, 2022

Uh oh!

thaJeztah Apr 29, 2022

Choose a reason for hiding this comment

Uh oh!

Romain-Geissler-1A Apr 29, 2022

Choose a reason for hiding this comment

Uh oh!

thaJeztah Apr 29, 2022

Choose a reason for hiding this comment

Uh oh!

Romain-Geissler-1A commented May 3, 2022

Uh oh!

thaJeztah commented May 4, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Romain-Geissler-1A commented Mar 7, 2022 •

edited

Loading