[WIP] R4.2: add gentoo

dockerfiles/Makefile

@@ -8,6 +8,7 @@ DOCKER_IMAGES ?= \
 	vm-bullseye \
 	vm-archlinux \
 	vm-centos-stream8 \
+	vm-gentoo \
 	vm-jammy \
 	vm-fc39 \
 	vm-fc40 \

dockerfiles/vm-gentoo.Dockerfile

@@ -0,0 +1,24 @@
+FROM gentoo/stage3:latest
+
+## TODO
+# - add notset(?) gentoo mirror keys
+# - add notset(?) gentoo repositories
+# - add package use (see https://github.com/QubesOS/qubes-builder-gentoo/blob/main/prepare-chroot-base#L149)
+# - install packages (see https://github.com/QubesOS/qubes-builder-gentoo/blob/main/prepare-chroot-base#L154)
+
+# ArchLinux example as a reference:
+# RUN pacman-key --init && pacman-key --populate && pacman -Syu --noconfirm wget sudo
+# RUN wget -O /tmp/qubes-repo-archlinux-key.asc https://raw.githubusercontent.com/QubesOS/qubes-builderv2/main/qubesbuilder/plugins/chroot_archlinux/keys/qubes-repo-archlinux-key.asc
+# RUN pacman-key --add - < /tmp/qubes-repo-archlinux-key.asc
+# RUN pacman-key --lsign "$(gpg --with-colons --show-key /tmp/qubes-repo-archlinux-key.asc -| grep ^fpr: | cut -d : -f 10)"
+# 
+# RUN printf '\
+# [qubes-r4.2-current-testing]\n\
+# Server = https://archlinux.qubes-os.org/r4.2/current-testing/vm/archlinux/pkgs\n\
+# [qubes-r4.2-current]\n\
+# Server = https://archlinux.qubes-os.org/r4.2/current/vm/archlinux/pkgs\n\
+# '\ >> /etc/pacman.conf
+# 
+# RUN wget -O /usr/local/bin/faketime https://raw.githubusercontent.com/rustybird/realfaketime/main/faketime
+# 
+# RUN useradd -m user

r4.2/gitlab-host-vm-openqa.yml

@@ -7,3 +7,4 @@ r4.2:publish:repo:
     - r4.2:build:vm-fc41
     - r4.2:build:vm-fc42
     - r4.2:build:vm-archlinux
+    - r4.2:build:vm-gentoo

r4.2/gitlab-vm-gentoo-build-template.yml

@@ -0,0 +1,4 @@
+r4.2:build:vm-gentoo:
+  extends: .r4.2_templates_build
+  needs:
+    - r4.2:prep:sources

r4.2/gitlab-vm-gentoo-build.yml

@@ -0,0 +1,4 @@
+r4.2:build:vm-gentoo:
+  extends: .r4.2_components_build
+  needs:
+    - r4.2:prep:sources

r4.2/gitlab-vm-gentoo-chroot.yml

@@ -0,0 +1,35 @@
+chroot:vm-gentoo:
+  extends: .chroot_prepare
+  tags:
+    - vm
+    - long-living-job
+  needs:
+    - prep:sources
+  variables:
+    DISTS_VM: gentoo
+    USE_QUBES_REPO_VERSION: "4.1"
+    USE_QUBES_REPO_TESTING: "1"
+
+# chroot:vm-gentoo-minimal:
+#   extends: .chroot_prepare
+#   tags:
+#     - vm
+#     - long-living-job
+#   needs:
+#     - prep:sources
+#   variables:
+#     DISTS_VM: gentoo+minimal
+#     USE_QUBES_REPO_VERSION: "4.1"
+#     USE_QUBES_REPO_TESTING: "1"
+#
+# chroot:vm-gentoo-xfce:
+#   extends: .chroot_prepare
+#   tags:
+#     - vm
+#     - long-living-job
+#   needs:
+#     - prep:sources
+#   variables:
+#     DISTS_VM: gentoo+xfce
+#     USE_QUBES_REPO_VERSION: "4.1"
+#     USE_QUBES_REPO_TESTING: "1"

r4.2/gitlab-vm-gentoo-install.yml

@@ -0,0 +1,5 @@
+r4.2:build:vm-gentoo:
+  extends: .r4.2_components_install
+  needs:
+    - r4.2:prep:sources
+    - r4.2:build:vm-gentoo

r4.2/gitlab-vm-gentoo.yml

@@ -0,0 +1,3 @@
+include:
+  - '/r4.2/gitlab-vm-gentoo-build.yml'
+  - '/r4.2/gitlab-vm-gentoo-install.yml'

r4.2/gitlab-vm.yml

@@ -3,4 +3,4 @@ include:
   - '/r4.2/gitlab-vm-debian.yml'
   - '/r4.2/gitlab-vm-archlinux.yml'
   - '/r4.2/gitlab-vm-ubuntu.yml'
-#  - '/r4.2/gitlab-vm-gentoo.yml'
+  - '/r4.2/gitlab-vm-gentoo.yml'

scripts/gitlab-builderv2.yml

@@ -43,6 +43,7 @@ distributions:
   - vm-focal
   - vm-jammy
   - vm-noble
+  - vm-gentoo
 
 +templates:
   - fedora-40:
@@ -99,6 +100,8 @@ distributions:
       dist: centos-stream10
   - archlinux:
       dist: archlinux
+  - gentoo:
+      dist: gentoo
 
 executor:
   type: docker

scripts/gitlab-installv2

@@ -57,6 +57,9 @@ def main(release: str, qubes_distribution: QubesDistribution, repository: Path):
             f"sed -i -e 's/4\\.2/{release}/g ' /etc/pacman.conf && "
             "pacman -Sy --noprogressbar  && pacman -U --noconfirm --noprogressbar"
         )
+    elif qubes_distribution.fullname == "gentoo":
+        pkgext = "ebuild"
+        run_cmd = "emerge --sync && emerge --usepkg"
     else:
         raise CIError("Unsupported distribution!")