Update Docker build arguments and directories

The templates are almost entirely modified and in order to provide a clean
configuration for the test case, it is better to not use them at all. This,
hopefully descreases the complexity and provides a clean overview of the
minimal configuration that the container is needed.
Furthermore, this commit is depended on the webui Dockerfile, which should be
provide the proxy configuration on the webui container for the build.

Depends-on: os-autoinst/openQA#6751
Signed-off-by: Ioannis Bonatakis <[email protected]>

Author: d3flex

tests/containers/single_container_webui.pm

@@ -3,26 +3,7 @@ use testapi;
 use utils;
 
 sub run {
-  script_run(
-        "echo  \"\$(cat <<EOF
-[localhost]
-key = 1234567890ABCDEF
-secret = 1234567890ABCDEF
-
-[scheduler]
-key = 1234567890ABCDEF
-secret = 1234567890ABCDEF
-
-[websockets]
-key = 1234567890ABCDEF
-secret = 1234567890ABCDEF
-
-[openqa_webui]
-key = 1234567890ABCDEF
-secret = 1234567890ABCDEF
-EOF
-)\" > /root/openQA/container/webui/conf/client.conf");
-  script_run(
+  assert_script_run(
         "echo  \"\$(cat <<EOF
 [global]
 # change to the URL the web UI will be available under so redirection for
@@ -31,12 +12,6 @@ base_url = http://openqa_webui
 
 [auth]
 method = Fake
-
-[logging]
-level = debug
-
-[openid]
-httpsonly = 0
 EOF
 )\" > /root/openQA/container/webui/conf/openqa.ini");
 
@@ -47,11 +22,7 @@ EOF
 
   assert_script_run("docker run -d --network testing $volumes $certificates -p 80:80 --hostname openqa_webui --name openqa_webui openqa_webui");
   wait_for_container_log('openqa_webui', 'Web application available at', 'docker');
-
-  assert_script_run('curl http://localhost');
-  assert_script_run(qq{docker exec openqa_webui sed -i "s/#ServerName your.server.name/ServerName openqa_webui/" /etc/apache2/vhosts.d/openqa.conf});
-  assert_script_run(qq{docker exec openqa_webui sh -c 'echo "ServerName openqa_webui" >> /etc/apache2/httpd.conf'});
-  assert_script_run(qq{docker exec openqa_webui apache2ctl restart});
+  assert_script_run('curl -v http://localhost');
 }
 
 sub post_fail_hook {

tests/containers/worker.pm

@@ -3,28 +3,27 @@ use testapi;
 use utils;
 
 sub run {
-    my $volumes = '-v "/root/data/factory:/data/factory" -v "/root/data/tests:/data/tests" -v "/root/openQA/container/openqa_data/data.template/conf/:/data/conf:ro"';
-    script_run(
+    my $confdir = '/tmp/openqa_worker_conf';
+    assert_script_run("mkdir -p $confdir");
+    assert_script_run(
         "echo  \"\$(cat <<EOF
 [openqa_webui]
 key = 1234567890ABCDEF
 secret = 1234567890ABCDEF
-
-[localhost]
-key = 1234567890ABCDEF
-secret = 1234567890ABCDEF
 EOF
-)\" > /root/openQA/container/openqa_data/data.template/conf/client.conf");
+)\" > $confdir/client.conf");
 
-    script_run(
+    assert_script_run(
         "echo  \"\$(cat <<EOF
 [global]
 BACKEND = qemu
 HOST = openqa_webui
 WORKER_HOSTNAME = openqa_worker
 EOF
-)\" > /root/openQA/container/openqa_data/data.template/conf/workers.ini");
-    assert_script_run(qq{docker run -d --network testing $volumes --entrypoint sh --hostname openqa_worker --name openqa_worker openqa_worker -c "curl -v http://openqa_webui/login && ./run_openqa_worker.sh"});
+)\" > $confdir/workers.ini");
+    my $volumes = qq{-v "/root/data/factory:/data/factory" -v "/root/data/tests:/data/tests" -v "$confdir:/data/conf:ro"};
+    assert_script_run('curl -v http://localhost/login');
+    assert_script_run(qq{docker run -d --network testing $volumes --hostname openqa_worker --name openqa_worker openqa_worker});
     wait_for_container_log('openqa_worker', 'Registered and connected', 'docker');
     clear_root_console;
 }