From 2f7d2d90be709a506ad352661231452869ec280b Mon Sep 17 00:00:00 2001
From: Dmitry Maksyoma <ledestin@gmail.com>
Date: Fri, 15 Aug 2025 15:08:08 +1200
Subject: [PATCH 1/4] Bump functional tests to release/1.0.6

---
 .gitlab-ci.yml           | 3 +++
 kasmvnc-functional-tests | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index abe98b8..fe77053 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -72,6 +72,9 @@ functional_test:
   artifacts:
     paths:
       - kasmvnc-functional-tests/output/
+    reports:
+      junit:
+        - kasmvnc-functional-tests/report/*.xml
 
 build_www:
   stage: www
diff --git a/kasmvnc-functional-tests b/kasmvnc-functional-tests
index d7242d7..bcdc4d2 160000
--- a/kasmvnc-functional-tests
+++ b/kasmvnc-functional-tests
@@ -1 +1 @@
-Subproject commit d7242d738eab59865d4fdab7231f7a3c9c6de640
+Subproject commit bcdc4d2bb680df0abaab70c0cf73b0113a7f2e6c

From 46b49ba37e06a00001b6ceadeded1666e8b66b76 Mon Sep 17 00:00:00 2001
From: Dmitry Maksyoma <ledestin@gmail.com>
Date: Fri, 15 Aug 2025 15:24:57 +1200
Subject: [PATCH 2/4] VNC-252 CI: Functional tests: set proper content type for
 report files

---
 .ci/helpers.sh | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/.ci/helpers.sh b/.ci/helpers.sh
index 3d22720..442a8aa 100644
--- a/.ci/helpers.sh
+++ b/.ci/helpers.sh
@@ -85,7 +85,6 @@ prepare_functional_tests_source_and_cd_into_it() {
 upload_report_to_s3() {
   s3_tests_directory="kasmvnc/${CI_COMMIT_SHA}/tests"
   upload_directory_to_s3 report "$s3_tests_directory" "$S3_BUCKET"
-  aws s3 cp report/index.html "s3://${S3_BUCKET}/${s3_tests_directory}/report/index.html" --metadata-directive REPLACE --content-type "text/html"
 }
 
 put_report_into_ci_pipeline() {
@@ -106,7 +105,6 @@ prepare_kasmvnc_built_packages_to_replace_workspaces_image_packages() {
 prepare_to_run_functional_tests() {
   install_packages_needed_for_functional_tests
   prepare_functional_tests_source_and_cd_into_it
-  prepare_s3_uploader
   prepare_kasmvnc_built_packages_to_replace_workspaces_image_packages
   heed_debug_variable_and_toggle_debug_in_functional_tests
 }
@@ -122,10 +120,8 @@ heed_debug_variable_and_toggle_debug_in_functional_tests() {
 }
 
 install_packages_needed_for_functional_tests() {
-  export DEBIAN_FRONTEND=noninteractive
-  apt-get update && apt-get install -y git tree curl docker.io awscli
-  apt-get install -y ruby3.1 wget
-  apt-get install -y python3 python3-pip python3-boto3 curl pkg-config libxmlsec1-dev
+  prepare_to_run_scripts_and_s3_uploads
+  apt-get install -y tree docker.io
 }
 
 is_build_this_distro() {
@@ -139,21 +135,18 @@ function upload_to_s3() {
   local s3_bucket="$3";
 
   # Transfer to S3
-  python3 amazon-s3-bitbucket-pipelines-python/s3_upload.py "$s3_bucket" "$file_to_upload" "$s3_url_for_file";
+  aws s3 cp "$file_to_upload" \
+    "s3://${S3_BUCKET}/${s3_url_for_file}" \
+    --metadata-directive REPLACE \
+    --content-type "$(file --mime-type -b \"$file_to_upload\")"
   # Use the Gitlab API to tell Gitlab where the artifact was stored
   export S3_URL="https://${s3_bucket}.s3.amazonaws.com/${s3_url_for_file}";
 };
 
-function prepare_s3_uploader() {
-  git clone https://bitbucket.org/awslabs/amazon-s3-bitbucket-pipelines-python.git
-}
-
 function prepare_to_run_scripts_and_s3_uploads() {
   export DEBIAN_FRONTEND=noninteractive
   apt-get update
-  apt-get install -y ruby3.1 git wget
-  apt-get install -y python3 python3-pip python3-boto3 curl pkg-config libxmlsec1-dev
-  prepare_s3_uploader
+  apt-get install -y ruby3.1 wget curl file awscli
 }
 
 detect_release_branch() {

From ca71e145fad992963126e939ec3281b8607d9a05 Mon Sep 17 00:00:00 2001
From: Dmitry Maksyoma <ledestin@gmail.com>
Date: Sat, 16 Aug 2025 15:34:15 +1200
Subject: [PATCH 3/4] Bump functional tests to release/1.0.7

---
 kasmvnc-functional-tests | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kasmvnc-functional-tests b/kasmvnc-functional-tests
index bcdc4d2..ce3f4db 160000
--- a/kasmvnc-functional-tests
+++ b/kasmvnc-functional-tests
@@ -1 +1 @@
-Subproject commit bcdc4d2bb680df0abaab70c0cf73b0113a7f2e6c
+Subproject commit ce3f4db9b96084fcb8b8b75ce62836b72ce59738

From e5999705b4b268812b4f4e79d4c58683d36e028c Mon Sep 17 00:00:00 2001
From: Dmitry Maksyoma <ledestin@gmail.com>
Date: Wed, 27 Aug 2025 13:42:16 +1200
Subject: [PATCH 4/4] Bump functional tests to release/1.0.8

---
 kasmvnc-functional-tests | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kasmvnc-functional-tests b/kasmvnc-functional-tests
index ce3f4db..8af65a3 160000
--- a/kasmvnc-functional-tests
+++ b/kasmvnc-functional-tests
@@ -1 +1 @@
-Subproject commit ce3f4db9b96084fcb8b8b75ce62836b72ce59738
+Subproject commit 8af65a338e92c055fbdc958404a87d719cf05d8a