Skip to content

Commit

Permalink
Add F42 testing on R4.3
Browse files Browse the repository at this point in the history
Don't add it for R4.2 yet, and also skip openQA builds for now - until
all packages are built.

QubesOS/qubes-issues#9807
  • Loading branch information
marmarek committed Feb 26, 2025
1 parent b9bf934 commit f207d02
Show file tree
Hide file tree
Showing 7 changed files with 67 additions and 1 deletion.
3 changes: 2 additions & 1 deletion dockerfiles/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ DOCKER_IMAGES ?= \
vm-jammy \
vm-fc39 \
vm-fc40 \
vm-fc41
vm-fc41 \
vm-fc42

.ONESHELL:
build: $(DOCKER_IMAGES:%=build-%)
Expand Down
24 changes: 24 additions & 0 deletions dockerfiles/vm-fc42.Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
FROM quay.io/fedora/fedora:42
RUN dnf -y update && dnf -y install sudo ca-certificates wget gnupg dnf-plugins-core reprotest && dnf -y clean all
RUN wget -O /etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-4.2-primary https://raw.githubusercontent.com/QubesOS/qubes-builderv2/main/qubesbuilder/plugins/chroot_rpm/keys/RPM-GPG-KEY-qubes-4.2-primary
RUN wget -O /etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-4.3-primary https://raw.githubusercontent.com/QubesOS/qubes-builderv2/main/qubesbuilder/plugins/chroot_rpm/keys/RPM-GPG-KEY-qubes-4.3-primary
RUN printf '\
[qubes-current]\n\
name=qubes-vm-current\n\
baseurl=https://yum.qubes-os.org/r4.2/current/vm/fc42\n\
enabled=1\n\
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-4.2-primary\n\
gpgcheck=1\n\
repo_gpgcheck = 1\n\
[qubes-current-testing]\n\
name=qubes-vm-testing\n\
baseurl=https://yum.qubes-os.org/r4.2/current-testing/vm/fc42\n\
enabled=1\n\
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-4.2-primary\n\
gpgcheck=1\n\
repo_gpgcheck = 1\n\
'\ >> /etc/yum.repos.d/qubes.repo
RUN wget -O /usr/local/bin/faketime https://raw.githubusercontent.com/rustybird/realfaketime/main/faketime
RUN chmod +x /usr/local/bin/faketime
RUN rm -f /etc/fstab
RUN useradd -m user
10 changes: 10 additions & 0 deletions r4.3/gitlab-vm-fedora-build-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,13 @@ r4.3:build:fedora-41-minimal:
extends: .r4.3_templates_build
needs:
- r4.3:prep:sources

r4.3:build:fedora-42:
extends: .r4.3_templates_build
needs:
- r4.3:prep:sources

r4.3:build:fedora-42-minimal:
extends: .r4.3_templates_build
needs:
- r4.3:prep:sources
5 changes: 5 additions & 0 deletions r4.3/gitlab-vm-fedora-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,8 @@ r4.3:build:vm-fc41:
extends: .r4.3_components_build
needs:
- r4.3:prep:sources

r4.3:build:vm-fc42:
extends: .r4.3_components_build
needs:
- r4.3:prep:sources
6 changes: 6 additions & 0 deletions r4.3/gitlab-vm-fedora-install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,9 @@ r4.3:install:vm-fc41:
needs:
- r4.3:prep:sources
- r4.3:build:vm-fc41

r4.3:install:vm-fc42:
extends: .r4.3_components_install
needs:
- r4.3:prep:sources
- r4.3:build:vm-fc42
7 changes: 7 additions & 0 deletions r4.3/gitlab-vm-fedora-repro.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,10 @@ r4.3:repro:vm-fc41:
- r4.3:prep:sources
- r4.3:build:vm-fc41
allow_failure: true

r4.3:repro:vm-fc42:
extends: .r4.3_components_repro
needs:
- r4.3:prep:sources
- r4.3:build:vm-fc42
allow_failure: true
13 changes: 13 additions & 0 deletions scripts/gitlab-builderv2-r4.3.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ distributions:
- vm-fc39
- vm-fc40
- vm-fc41
- vm-fc42
- vm-archlinux
- vm-jammy
- vm-noble
Expand All @@ -62,6 +63,18 @@ distributions:
- fedora-41-minimal:
dist: fc41
flavor: minimal
- fedora-42:
dist: fc42
options:
- selinux
- fedora-42-xfce:
dist: fc42
flavor: xfce
options:
- selinux
- fedora-42-minimal:
dist: fc42
flavor: minimal
- debian-12:
dist: bookworm
options:
Expand Down

0 comments on commit f207d02

Please sign in to comment.