commit: 72a6e1e8bfdb606a6b6acee0abef43fdc13d5820
Author: Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 7 21:33:45 2023 +0000
Commit: Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Wed Jun 7 21:33:45 2023 +0000
URL:
https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=72a6e1e8
Add support for xz compression
Signed-off-by: Magnus Granberg <zorry <AT> gentoo.org>
docker/GentooBuildbotWorkerBuild.Dockerfile | 5 ++++-
docker/GentooBuildbotWorkerLog.Dockerfile | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/docker/GentooBuildbotWorkerBuild.Dockerfile
b/docker/GentooBuildbotWorkerBuild.Dockerfile
index 23fc3f0..e700203 100644
--- a/docker/GentooBuildbotWorkerBuild.Dockerfile
+++ b/docker/GentooBuildbotWorkerBuild.Dockerfile
@@ -35,6 +35,8 @@ RUN echo -e "[binhost]\npriority = 9999\nsync-uri =
${BINHOSTURL}/${PROJECTUUID}
&& echo 'USE="X elogind"' | >> /etc/portage/make.conf\
# && echo 'PYTHON_TARGETS="python3_10 python3_9 python3_8 python3_11"' | >>
/etc/portage/make.conf\
&& echo 'ACCEPT_LICENSE="*"'\
+ && echo 'PORTAGE_COMPRESS="xz"'\
+ && echo 'BINPKG_COMPRESS="xz"'\
#&& echo 'dev-vcs/git -webdev -gnome-keyring' | cat >>
/etc/portage/package.use/git\
#&& echo 'dev-util/buildbot-worker' | cat >>
/etc/portage/package.accept_keywords/buildbot\
#&& echo 'dev-libs/glib' | cat >> /etc/portage/package.mask/git\
@@ -62,7 +64,8 @@ RUN echo 'app-text/ansifilter' | cat >>
/var/lib/portage/world\
&& echo 'dev-lang/rust-bin' | cat >> /var/lib/portage/world\
&& echo 'app-admin/eclean-kernel' | cat >> /var/lib/portage/world\
&& echo 'app-portage/gentoolkit' | cat >> /var/lib/portage/world\
- && echo 'app-editors/nano' | cat >> /var/lib/portage/world
+ && echo 'app-editors/nano' | cat >> /var/lib/portage/world\
+ && echo 'app-arch/xz-utils' | cat >> /var/lib/portage/world
# Run emerge update and install buildbot-worker
# update perl
diff --git a/docker/GentooBuildbotWorkerLog.Dockerfile
b/docker/GentooBuildbotWorkerLog.Dockerfile
index 492be36..0164b94 100644
--- a/docker/GentooBuildbotWorkerLog.Dockerfile
+++ b/docker/GentooBuildbotWorkerLog.Dockerfile
@@ -18,7 +18,7 @@ RUN echo -e "[binhost]\npriority = 9999\nsync-uri =
https://gentoo.osuosl.org/ex
&& echo 'FEATURES="${FEATURES} buildpkg"' | cat >> /etc/portage/make.conf\
&& echo 'MAKEOPTS="-j8"' | cat >> /etc/portage/make.conf\
&& echo 'dev-libs/glib' | cat >> /etc/portage/package.mask/git\
- && emerge -qv buildbot-worker sqlalchemy dev-python/psycopg:2 rust-bin
dev-vcs/git
+ && emerge -qv buildbot-worker sqlalchemy dev-python/psycopg:2 rust-bin
dev-vcs/git utils-xz
# We don't need the gentoo repo any longer
RUN rm -R /var/db/repos/gentoo
