Move html to separate template file

KuxaBeast · KuxaBeast · commit f26e6721b9af · 2025-09-05T18:35:19.000+02:00
diff --git a/data/containers/helm/kiosk/audio.html b/data/containers/helm/kiosk/audio.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Sample audio file</title>
+</head>
+<body>
+  <audio loop controls> <!-- autoplay is blocked in modern browsers -->
+    <source src="%DATA_URL%/bar.wav" type="audio/wav">
+    Your browser does not support the audio tag.
+  </audio>
+</body>
+</html>
diff --git a/tests/containers/charts/kiosk_firefox.pm b/tests/containers/charts/kiosk_firefox.pm
@@ -16,33 +16,18 @@ use utils;
 use containers::helm;
 use containers::k8s qw(install_helm);
 
-
-my $base_url = autoinst_url;
-my $audio_html = <<_EOF_;
-<!DOCTYPE html>
-<html>
-<head>
-  <title>Sample audio file</title>
-</head>
-<body>
-  <audio loop controls> <!-- autoplay is blocked in modern browsers -->
-    <source src="$base_url/data/bar.wav" type="audio/wav">
-    Your browser does not support the audio tag.
-  </audio>
-</body>
-</html>
-_EOF_
-
 sub run {
     my ($self) = @_;
 
     select_serial_terminal;
     my $helm_chart = get_required_var("HELM_CHART");
-    my $helm_values = autoinst_url("/data/containers/helm/kiosk/values.yaml");
+    my $helm_values = data_url("/containers/helm/kiosk/values.yaml");
 
     # Run an nginx container with a test page and wait for it
-    assert_script_run("kubectl create configmap audio-html-config --from-literal=audio.html='$audio_html'");
-    assert_script_run("kubectl apply -f " . autoinst_url("/data/containers/helm/kiosk/nginx.yaml"));
+    assert_script_run("curl -O " . data_url("/containers/helm/kiosk/audio.html"));
+    file_content_replace("audio.html", '%DATA_URL%' => data_url);
+    assert_script_run("kubectl create configmap audio-html-config --from-file=audio.html");
+    assert_script_run("kubectl apply -f " . data_url("/containers/helm/kiosk/nginx.yaml"));
     assert_script_run("kubectl wait --for=condition=Ready pod/nginx-test --timeout=60s");
 
     # login to graphical tty before starting
@@ -64,7 +49,7 @@ sub run {
     validate_script_output("kubectl exec $pod_name -c pulseaudio -- sh -c 'pactl list sink-inputs'", qr/application.name = "Firefox"/m && qr/application.process.host = "$pod_name"/m, fail_message => 'firefox did not allocate an audio sink');
 
     assert_script_run("helm uninstall kiosk");
-    script_run("kubectl delete -f " . autoinst_url("/data/containers/helm/kiosk/nginx.yaml"));
+    script_run("kubectl delete -f " . data_url("/containers/helm/kiosk/nginx.yaml"));
     script_run("kubectl create configmap audio-html-config");
 }
 
