Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ubuntu-images.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
build-and-push-images:
strategy:
matrix:
release: ['16.04', '18.04', '20.04', '22.04', '22.10', '23.04']
release: ['16.04', '18.04', '20.04', '22.04', '23.04', '23.10']

runs-on: ubuntu-latest
steps:
Expand Down
14 changes: 0 additions & 14 deletions .zuul.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -81,24 +81,12 @@
pre-run: playbooks/setup-env.yaml
run: playbooks/system-test.yaml

- job:
name: system-test-fedora-37
description: Run Toolbx's system tests in Fedora 37
timeout: 3000
nodeset:
nodes:
- name: fedora-37
label: cloud-fedora-37
pre-run: playbooks/setup-env.yaml
run: playbooks/system-test.yaml

- project:
periodic:
jobs:
- system-test-fedora-rawhide
- system-test-fedora-39
- system-test-fedora-38
- system-test-fedora-37
check:
jobs:
- unit-test
Expand All @@ -107,7 +95,6 @@
- system-test-fedora-rawhide
- system-test-fedora-39
- system-test-fedora-38
- system-test-fedora-37
gate:
jobs:
- unit-test
Expand All @@ -116,4 +103,3 @@
- system-test-fedora-rawhide
- system-test-fedora-39
- system-test-fedora-38
- system-test-fedora-37
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM docker.io/library/ubuntu:22.10
FROM docker.io/library/ubuntu:23.10

LABEL com.github.containers.toolbox="true" \
name="ubuntu-toolbox" \
version="22.10" \
version="23.10" \
usage="This image is meant to be used with the toolbox command" \
summary="Base image for creating Ubuntu toolbox containers" \
maintainer="Ievgen Popovych <jmennius@gmail.com>"
Expand Down Expand Up @@ -38,5 +38,9 @@ RUN mkdir /usr/share/empty
# Add flatpak-spawn to /usr/bin
RUN ln -s /usr/libexec/flatpak-xdg-utils/flatpak-spawn /usr/bin/

# Having anything in /home prevents toolbox from symlinking /var/home there,
# and 'ubuntu' user with UID 1000 will most likely conflict with host user as well
RUN userdel --remove ubuntu

# Disable APT ESM hook which tries to enable some systemd services on each apt invocation
RUN rm /etc/apt/apt.conf.d/20apt-esm-hook.conf