mkosi: Move TEST-24-CRYPTSETUP files to mkosi/ directory

If the integration tests have been installed in the systemd-tests
package, the path to these in mkosi.postinst.chroot will be wrong.
Let's fix the issue by moving these files into the mkosi/ directory
as they're only used by mkosi regardless so they make more sense to
be there anyway.

(cherry picked from commit e2b01571d01dd120584f7be93e2cfdd7f87296d3)

diff --git a/test/integration-tests/TEST-24-CRYPTSETUP/keydev.repart/00-root.conf b/mkosi/keydev.repart/00-root.conf
similarity index 100%
rename from test/integration-tests/TEST-24-CRYPTSETUP/keydev.repart/00-root.conf
rename to mkosi/keydev.repart/00-root.conf

diff --git a/test/integration-tests/TEST-24-CRYPTSETUP/keyfile b/mkosi/mkosi.credentials/keyfile
similarity index 100%
rename from test/integration-tests/TEST-24-CRYPTSETUP/keyfile
rename to mkosi/mkosi.credentials/keyfile

diff --git a/mkosi/mkosi.postinst.chroot b/mkosi/mkosi.postinst.chroot
index 8c838cc7cc93e91c3513d0bae749513326e8bd9a..d1f67a9e39a89071b46499629f013673f0c24c10 100755 (executable)
--- a/mkosi/mkosi.postinst.chroot
+++ b/mkosi/mkosi.postinst.chroot
@@ -60,8 +60,8 @@ SYSTEMD_REPART_MKFS_OPTIONS_EXT4="" \
     --dry-run=no \
     --size=auto \
     --offline=true \
-    --root test/integration-tests/TEST-24-CRYPTSETUP \
-    --definitions test/integration-tests/TEST-24-CRYPTSETUP/keydev.repart \
+    --root mkosi/mkosi.credentials \
+    --definitions mkosi/keydev.repart \
     "$OUTPUTDIR/keydev.raw"
 
 can_test_pkcs11() {
@@ -134,7 +134,7 @@ EOF
     certtool --generate-self-signed \
       --load-privkey="pkcs11:token=TestToken;object=RSATestKey;type=private" \
       --load-pubkey="pkcs11:token=TestToken;object=RSATestKey;type=public" \
-      --template "test/integration-tests/TEST-24-CRYPTSETUP/template.cfg" \
+      --template "mkosi/template.cfg" \
       --outder --outfile "/tmp/rsa_test.crt"
 
     pkcs11-tool --module "$SOFTHSM_MODULE" --token-label "TestToken" --pin "env:GNUTLS_PIN" --so-pin "env:GNUTLS_SO_PIN" --write-object "/tmp/rsa_test.crt" --type cert --label "RSATestKey"
@@ -146,7 +146,7 @@ EOF
     certtool --generate-self-signed \
       --load-privkey="pkcs11:token=TestToken;object=ECTestKey;type=private" \
       --load-pubkey="pkcs11:token=TestToken;object=ECTestKey;type=public" \
-      --template "test/integration-tests/TEST-24-CRYPTSETUP/template.cfg" \
+      --template "mkosi/template.cfg" \
       --outder --outfile "/tmp/ec_test.crt"
 
     pkcs11-tool --module "$SOFTHSM_MODULE" --token-label "TestToken" --pin "env:GNUTLS_PIN" --so-pin "env:GNUTLS_SO_PIN" --write-object "/tmp/ec_test.crt" --type cert --label "ECTestKey"

diff --git a/test/integration-tests/TEST-24-CRYPTSETUP/template.cfg b/mkosi/template.cfg
similarity index 100%
rename from test/integration-tests/TEST-24-CRYPTSETUP/template.cfg
rename to mkosi/template.cfg

diff --git a/test/integration-tests/TEST-24-CRYPTSETUP/meson.build b/test/integration-tests/TEST-24-CRYPTSETUP/meson.build
index c9e0271e963f87860be3b1015ee66908f95a9f6c..bb2b2a15f5ebb1894df037137098e63ffd1e9b56 100644 (file)
--- a/test/integration-tests/TEST-24-CRYPTSETUP/meson.build
+++ b/test/integration-tests/TEST-24-CRYPTSETUP/meson.build
@@ -4,7 +4,6 @@ integration_tests += [
         integration_test_template + {
                 'name' : fs.name(meson.current_source_dir()),
                 'credentials' : integration_test_template['credentials'] + [
-                        files('keyfile'),
                         'fstab.extra="/dev/mapper/test24_varcrypt /var ext4 defaults 0 1"',
                 ],
                 'cmdline' : [