[elbe-devel] [PATCH v1 15/15] tests: add empty hashed password element

Holger Dengler holger at hdengler.de
Wed Jun 8 22:39:58 CEST 2022


Add an empty "passwd_hashed" element to each test XML. The hashed
password will be updated at the first run.

Also set the "keep_plain" attribute to "true" in all test, which also
has a login action.

Signed-off-by: Holger Dengler <holger at hdengler.de>
---
 tests/pbuilder-amd64.xml              | 1 +
 tests/simple-amd64-bookworm.xml       | 3 ++-
 tests/simple-amd64-with-grub-uefi.xml | 3 ++-
 tests/simple-amd64-with-grub.xml      | 3 ++-
 tests/simple-arm64.xml                | 3 ++-
 tests/simple-armhf.xml                | 3 ++-
 tests/xinclude/simple.xml             | 3 ++-
 7 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/tests/pbuilder-amd64.xml b/tests/pbuilder-amd64.xml
index aa602b38b..4b613f1d8 100644
--- a/tests/pbuilder-amd64.xml
+++ b/tests/pbuilder-amd64.xml
@@ -29,6 +29,7 @@
 			<variant>minbase</variant>
 		</debootstrap>
 		<passwd>foo</passwd>
+		<passwd_hashed></passwd_hashed>
 
 		<!-- generate a pbuilder environment (before image will be built) -->
 		<pbuilder>
diff --git a/tests/simple-amd64-bookworm.xml b/tests/simple-amd64-bookworm.xml
index fe2c31a73..6f80f0728 100644
--- a/tests/simple-amd64-bookworm.xml
+++ b/tests/simple-amd64-bookworm.xml
@@ -24,7 +24,8 @@
 	<target>
 		<hostname>amd64-bookworm</hostname>
 		<domain>elbe-ci</domain>
-		<passwd>root</passwd>
+		<passwd keep_plain="true">root</passwd>
+		<passwd_hashed></passwd_hashed>
 		<console>ttyS0,115200</console>
 
 		<images>
diff --git a/tests/simple-amd64-with-grub-uefi.xml b/tests/simple-amd64-with-grub-uefi.xml
index cbe9b99d4..b4d29307a 100644
--- a/tests/simple-amd64-with-grub-uefi.xml
+++ b/tests/simple-amd64-with-grub-uefi.xml
@@ -25,7 +25,8 @@
 	<target>
 		<hostname>amd64-grub-uefi</hostname>
 		<domain>elbe-ci</domain>
-		<passwd>foo</passwd>
+		<passwd keep_plain="true">foo</passwd>
+		<passwd_hashed></passwd_hashed>
 		<console>ttyS0,115200</console>
 		<images>
 			<!-- use GPT for UEFI -->
diff --git a/tests/simple-amd64-with-grub.xml b/tests/simple-amd64-with-grub.xml
index 5ad310297..4ea657b8a 100644
--- a/tests/simple-amd64-with-grub.xml
+++ b/tests/simple-amd64-with-grub.xml
@@ -24,7 +24,8 @@
 	<target>
 		<hostname>amd64-bullseye</hostname>
 		<domain>elbe-ci</domain>
-		<passwd>root</passwd>
+		<passwd keep_plain="true">root</passwd>
+		<passwd_hashed></passwd_hashed>
 		<console>ttyS0,115200</console>
 
 		<images>
diff --git a/tests/simple-arm64.xml b/tests/simple-arm64.xml
index cdca7e20c..f67e123f0 100644
--- a/tests/simple-arm64.xml
+++ b/tests/simple-arm64.xml
@@ -24,7 +24,8 @@
 	<target>
 		<hostname>arm64-bullseye</hostname>
 		<domain>elbe-ci</domain>
-		<passwd>root</passwd>
+		<passwd keep_plain="true">root</passwd>
+		<passwd_hashed></passwd_hashed>
 		<console>ttyS0,115200</console>
 
 		<images>
diff --git a/tests/simple-armhf.xml b/tests/simple-armhf.xml
index f5f3e2c30..742f852fc 100644
--- a/tests/simple-armhf.xml
+++ b/tests/simple-armhf.xml
@@ -24,7 +24,8 @@
 	<target>
 		<hostname>armhf-bullseye</hostname>
 		<domain>elbe-ci</domain>
-		<passwd>root</passwd>
+		<passwd keep_plain="true">root</passwd>
+		<passwd_hashed></passwd_hashed>
 		<console>ttyS0,115200</console>
 
 		<images>
diff --git a/tests/xinclude/simple.xml b/tests/xinclude/simple.xml
index 334e122f4..7dbed74e9 100644
--- a/tests/xinclude/simple.xml
+++ b/tests/xinclude/simple.xml
@@ -23,7 +23,8 @@
 	<target>
 		<hostname>armhf-buster</hostname>
 		<domain>elbe-ci</domain>
-		<passwd>root</passwd>
+		<passwd keep_plain="true">root</passwd>
+		<passwd_hashed></passwd_hashed>
 		<console>ttyS0,115200</console>
 
 		<images>
-- 
2.36.1



More information about the elbe-devel mailing list