Skip to content

Commit

Permalink
Merge branch 'ubuntu-24.10' into 24.10/libtheora0_libx11-xcb1
Browse files Browse the repository at this point in the history
  • Loading branch information
cjdcordeiro authored Dec 18, 2024
2 parents 58b0f80 + c88c891 commit 9a2e007
Show file tree
Hide file tree
Showing 8 changed files with 111 additions and 0 deletions.
13 changes: 13 additions & 0 deletions slices/gosu.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package: gosu

essential:
- gosu_copyright

slices:
bins:
contents:
/usr/sbin/gosu:

copyright:
contents:
/usr/share/doc/gosu/copyright:
26 changes: 26 additions & 0 deletions slices/libnginx-mod-http-headers-more-filter.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
package: libnginx-mod-http-headers-more-filter

essential:
- libnginx-mod-http-headers-more-filter_copyright

slices:
modules:
essential:
# libnginx-mod-http-headers-more-filter depends on nginx-abi, which is
# a virtual package provided by nginx, hence the dependency on nginx_bins.
- libc6_libs
- libnginx-mod-http-headers-more-filter_config
- nginx_bins
contents:
/usr/lib/nginx/modules/ngx_http_headers_more_filter_module.so:

config:
contents:
# This symlink is created by the maintainer scipts
/etc/nginx/modules-enabled/50-mod-http-headers-more-filter.conf:
symlink: /usr/share/nginx/modules-available/mod-http-headers-more-filter.conf
/usr/share/nginx/modules-available/mod-http-headers-more-filter.conf:

copyright:
contents:
/usr/share/doc/libnginx-mod-http-headers-more-filter/copyright:
1 change: 1 addition & 0 deletions slices/nginx.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ slices:
- libpcre2-8-0_libs
- libssl3t64_libs
- nginx-common_config
- nginx-common_modules
- zlib1g_libs
contents:
/usr/sbin/nginx:
Expand Down
25 changes: 25 additions & 0 deletions slices/python3-pip.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
package: python3-pip

essential:
- python3-pip_copyright

slices:
bins:
essential:
- python3-pip_libs
contents:
/usr/bin/pip:
/usr/bin/pip3:

libs:
essential:
- ca-certificates_data
- python3-wheel_libs
- python3_standard
contents:
/usr/lib/python3/dist-packages/pip-*.dist-info/**:
/usr/lib/python3/dist-packages/pip/**:

copyright:
contents:
/usr/share/doc/python3-pip/copyright:
16 changes: 16 additions & 0 deletions slices/python3-wheel.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package: python3-wheel

essential:
- python3-wheel_copyright

slices:
libs:
essential:
- python3_standard
contents:
/usr/lib/python3/dist-packages/wheel-*.dist-info/**:
/usr/lib/python3/dist-packages/wheel/**:

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

execute: |
# Chisel a minimum number of slices to give us a runnable system that we can
# test in.
rootfs="$(install-slices gosu_bins)"
mkdir -p "${rootfs}"/proc/self
ln -sf /usr/sbin/gosu "${rootfs}"/proc/self/exe
chroot "${rootfs}/" gosu -h
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
summary: Integration tests for libnginx-mod-http-headers-more-filter

execute: |
# Chisel a minimum number of slices to give us a runnable system that we can
# test in.
rootfs="$(install-slices base-files_var base-passwd_data libnginx-mod-http-headers-more-filter_modules)"
# This will fail if loading of the NGINX module fails.
chroot "${rootfs}/" nginx -t
10 changes: 10 additions & 0 deletions tests/spread/integration/python3-pip/task.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
summary: Integration tests for python3-pip

execute: |
rootfs="$(install-slices python3-pip_bins)"
cp /etc/resolv.conf "${rootfs}/etc/"
# Smoke tests.
chroot ${rootfs} /usr/bin/pip --version
chroot ${rootfs} /usr/bin/pip install --upgrade setuptools

0 comments on commit 9a2e007

Please sign in to comment.