Skip to content

Commit

Permalink
Merge branch 'ubuntu-24.04' into gosu_noble
Browse files Browse the repository at this point in the history
  • Loading branch information
cjdcordeiro authored Dec 16, 2024
2 parents 965876d + 3231765 commit 883de03
Show file tree
Hide file tree
Showing 6 changed files with 106 additions and 0 deletions.
17 changes: 17 additions & 0 deletions slices/libjemalloc2.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
package: libjemalloc2

essential:
- libjemalloc2_copyright

slices:
libs:
essential:
- libc6_libs
- libgcc-s1_libs
- libstdc++6_libs
contents:
/usr/lib/*-linux-*/libjemalloc.so.2:

copyright:
contents:
/usr/share/doc/libjemalloc2/copyright:
15 changes: 15 additions & 0 deletions slices/liblzf1.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package: liblzf1

essential:
- liblzf1_copyright

slices:
libs:
essential:
- libc6_libs
contents:
/usr/lib/*-linux-*/liblzf.so.1*:

copyright:
contents:
/usr/share/doc/liblzf1/copyright:
27 changes: 27 additions & 0 deletions slices/redis-server.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
package: redis-server

essential:
- redis-server_copyright

slices:
bins:
essential:
- redis-server_config
- redis-tools_bins
contents:
/usr/bin/redis-server:

config:
contents:
/etc/redis/redis.conf:

services:
essential:
- redis-server_bins
contents:
/usr/lib/systemd/system/redis-server.service:
/usr/lib/systemd/system/[email protected]:

copyright:
contents:
/usr/share/doc/redis-server/copyright:
26 changes: 26 additions & 0 deletions slices/redis-tools.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
package: redis-tools

essential:
- redis-tools_copyright

slices:
bins:
# redis-tools actually depends on adduser as well to create and remove
# a user during package install/removal - however we don't support this
# currently so adduser is not added here.
essential:
- libatomic1_libs
- libc6_libs
- libjemalloc2_libs
- liblzf1_libs
- libssl3t64_libs
- libsystemd0_libs
contents:
/usr/bin/redis-benchmark:
/usr/bin/redis-check-aof:
/usr/bin/redis-check-rdb:
/usr/bin/redis-cli:

copyright:
contents:
/usr/share/doc/redis-tools/copyright:
8 changes: 8 additions & 0 deletions tests/spread/integration/redis-server/task.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
summary: Integration tests for redis-server

execute: |
# Chisel a minimum number of slices to give us a runnable system that we can
# test in.
rootfs="$(install-slices redis-server_bins)"
chroot "${rootfs}/" redis-server -v
13 changes: 13 additions & 0 deletions tests/spread/integration/redis-tools/task.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
summary: Integration tests for redis-tools

execute: |
# Chisel a minimum number of slices to give us a runnable system that we can
# test in.
rootfs="$(install-slices redis-tools_bins)"
touch "${rootfs}/foo"
chroot "${rootfs}/" redis-benchmark -v
chroot "${rootfs}/" redis-cli -v
chroot "${rootfs}/" redis-check-aof /foo
chroot "${rootfs}/" redis-check-rdb -v

0 comments on commit 883de03

Please sign in to comment.