PR#280: Update OSBS buildroot container to use Fedora 33 - fedora-infra/ansible

fedora-infra / ansible

#280 Update OSBS buildroot container to use Fedora 33

Merged 3 years ago by cverna. Opened 3 years ago by cverna.

fedora-infra/ cverna/ansible update-osbs-buildroot into master

Update OSBS buildroot container to use Fedora 33

Clement Verna • 3 years ago

86a0240

files/osbs/buildroot-Dockerfile-production.j2

file modified

+5 -5

		`@@ -1,12 +1,12 @@`
		`- FROM registry.fedoraproject.org/fedora:31`
		`- RUN dnf -y install --refresh dnf-plugins-core && dnf -y install docker git python3-setuptools e2fsprogs koji osbs-client\`
		`+ FROM registry.fedoraproject.org/fedora:33`
		`+ RUN dnf -y install --refresh dnf-plugins-core && dnf -y install moby-engine git python3-setuptools e2fsprogs koji osbs-client\`
		`python3-osbs-client gssproxy fedpkg python3-docker-squash atomic-reactor python3-atomic-reactor* go-md2man python3-productmd\`
		`python3-gobject python3-libmodulemd python3-pdc-client ostree flatpak-module-tools flatpak skopeo && dnf clean all`
		`ADD ./orchestrator_customize.json /usr/share/osbs/orchestrator_customize.json`
		`ADD ./worker_customize.json /usr/share/osbs/worker_customize.json`
		`ADD ./krb5.conf /etc`
		`- RUN printf '[libdefaults]\n default_ccache_name = DIR:/tmp/ccache_%%{uid}' >/etc/krb5.conf.d/ccache.conf`
		`- ADD ./krb5.osbs_{{osbs_url}}.keytab /etc/`
		`- ADD ./ca.crt /etc/pki/ca-trust/source/anchors/osbs.ca.crt`
		`+ #RUN printf '[libdefaults]\n default_ccache_name = DIR:/tmp/ccache_%%{uid}' >/etc/krb5.conf.d/ccache.conf`
		`+ #ADD ./krb5.osbs_{{osbs_url}}.keytab /etc/`
		`+ #ADD ./ca.crt /etc/pki/ca-trust/source/anchors/osbs.ca.crt`
		`RUN update-ca-trust`
		`CMD ["python3", "/usr/bin/atomic-reactor", "--verbose", "inside-build"]`

files/osbs/buildroot-Dockerfile-staging.j2

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- FROM registry.fedoraproject.org/fedora:31`
		`- RUN dnf -y install --refresh dnf-plugins-core && dnf -y install docker git python3-setuptools e2fsprogs koji osbs-client\`
		`+ FROM registry.fedoraproject.org/fedora:33`
		`+ RUN dnf -y install --refresh dnf-plugins-core && dnf -y install moby-engine git python3-setuptools e2fsprogs koji osbs-client\`
		`python3-osbs-client gssproxy fedpkg python3-docker-squash atomic-reactor python3-atomic-reactor* go-md2man python3-productmd\`
		`python3-gobject python3-libmodulemd python3-pdc-client ostree flatpak-module-tools flatpak skopeo && dnf clean all`
		`ADD ./orchestrator_customize.json /usr/share/osbs/orchestrator_customize.json`

cverna commented 3 years ago

Signed-off-by: Clement Verna cverna@tutanota.com

pingou commented 3 years ago

:thumbsup: for me

Should we staging only first?

Are we confident about doing this just before the final freeze?

kalev commented 3 years ago

I think we can revert it quickly if it turns out it regresses something. I'm around right now to test flatpak builds.

cverna commented 3 years ago

:thumbsup: for me

Should we staging only first?

AFAIK there is not OSBS in stg yet

Are we confident about doing this just before the final freeze?

Yes it is fairly easy to rollback since when we build the new buildroot we keep the old buildroot container. So going back to the old buildroot looks like podman tag buildroot:old buildroot:latest

rebased onto 15aca8ebcfff474739e34425bbb84c8f5979a083

3 years ago

rebased onto 86a0240

3 years ago

Pull-Request has been merged by cverna

3 years ago