From a9d04aab36a4c5dd30c0c0ca546b42021b97e884 Mon Sep 17 00:00:00 2001 From: Jeremy Norris Date: Mon, 16 Dec 2024 11:05:25 -0600 Subject: [PATCH 1/3] feat(24.10): add slice for gosu (#431) --- slices/gosu.yaml | 13 +++++++++++++ tests/spread/integration/gosu/task.yaml | 11 +++++++++++ 2 files changed, 24 insertions(+) create mode 100644 slices/gosu.yaml create mode 100644 tests/spread/integration/gosu/task.yaml diff --git a/slices/gosu.yaml b/slices/gosu.yaml new file mode 100644 index 00000000..91939ebc --- /dev/null +++ b/slices/gosu.yaml @@ -0,0 +1,13 @@ +package: gosu + +essential: + - gosu_copyright + +slices: + bins: + contents: + /usr/sbin/gosu: + + copyright: + contents: + /usr/share/doc/gosu/copyright: diff --git a/tests/spread/integration/gosu/task.yaml b/tests/spread/integration/gosu/task.yaml new file mode 100644 index 00000000..dcb1fd83 --- /dev/null +++ b/tests/spread/integration/gosu/task.yaml @@ -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 From e0877284cc2248a1308636a81cd8124a227f5ac8 Mon Sep 17 00:00:00 2001 From: Rafid Bin Mostofa Date: Mon, 16 Dec 2024 12:07:16 -0500 Subject: [PATCH 2/3] feat(24.10): add python3-pip slices (#428) --- slices/python3-pip.yaml | 25 +++++++++++++++++++ slices/python3-wheel.yaml | 16 ++++++++++++ .../spread/integration/python3-pip/task.yaml | 10 ++++++++ 3 files changed, 51 insertions(+) create mode 100644 slices/python3-pip.yaml create mode 100644 slices/python3-wheel.yaml create mode 100644 tests/spread/integration/python3-pip/task.yaml diff --git a/slices/python3-pip.yaml b/slices/python3-pip.yaml new file mode 100644 index 00000000..f144c4dc --- /dev/null +++ b/slices/python3-pip.yaml @@ -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: diff --git a/slices/python3-wheel.yaml b/slices/python3-wheel.yaml new file mode 100644 index 00000000..22efca18 --- /dev/null +++ b/slices/python3-wheel.yaml @@ -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: diff --git a/tests/spread/integration/python3-pip/task.yaml b/tests/spread/integration/python3-pip/task.yaml new file mode 100644 index 00000000..e00e24b2 --- /dev/null +++ b/tests/spread/integration/python3-pip/task.yaml @@ -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 From c88c891342b53d3e3c89b6fb1a62e43d14b9f25d Mon Sep 17 00:00:00 2001 From: Jeremy Norris Date: Wed, 18 Dec 2024 05:17:58 -0600 Subject: [PATCH 3/3] feat(24.10): add slice for libnginx-mod-http-headers-more-filter (#438) --- ...libnginx-mod-http-headers-more-filter.yaml | 26 +++++++++++++++++++ slices/nginx.yaml | 1 + .../task.yaml | 9 +++++++ 3 files changed, 36 insertions(+) create mode 100644 slices/libnginx-mod-http-headers-more-filter.yaml create mode 100644 tests/spread/integration/libnginx-mod-http-headers-more-filter/task.yaml diff --git a/slices/libnginx-mod-http-headers-more-filter.yaml b/slices/libnginx-mod-http-headers-more-filter.yaml new file mode 100644 index 00000000..54c28022 --- /dev/null +++ b/slices/libnginx-mod-http-headers-more-filter.yaml @@ -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: diff --git a/slices/nginx.yaml b/slices/nginx.yaml index 7d148250..2399e0a5 100644 --- a/slices/nginx.yaml +++ b/slices/nginx.yaml @@ -14,6 +14,7 @@ slices: - libpcre2-8-0_libs - libssl3t64_libs - nginx-common_config + - nginx-common_modules - zlib1g_libs contents: /usr/sbin/nginx: diff --git a/tests/spread/integration/libnginx-mod-http-headers-more-filter/task.yaml b/tests/spread/integration/libnginx-mod-http-headers-more-filter/task.yaml new file mode 100644 index 00000000..62b0b23d --- /dev/null +++ b/tests/spread/integration/libnginx-mod-http-headers-more-filter/task.yaml @@ -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