From ce718c16d53850d3b3ca58a295884dbe0b5f9591 Mon Sep 17 00:00:00 2001
From: Huan Truong <huan.truong@kasmweb.com>
Date: Thu, 13 Nov 2025 09:49:20 -0600
Subject: [PATCH 1/2] QA-213 update kasm for 1.18.0

---
 .gitlab-ci.yml                | 6 ++++--
 ci-scripts/gitlab-ci.template | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f62683b..b753abb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,9 +10,11 @@ stages:
 variables:
   BASE_TAG: "develop"
   USE_PRIVATE_IMAGES: 0
-  KASM_RELEASE: "1.17.0"
-  TEST_INSTALLER: "https://kasm-static-content.s3.amazonaws.com/kasm_release_1.17.0.bbc15c.tar.gz"
+  KASM_RELEASE: "1.18.0"
+  TEST_INSTALLER: "https://kasm-static-content.s3.amazonaws.com/kasm_release_1.18.0.09f70a.tar.gz"
   MIRROR_ORG_NAME: "kasmtech"
+default:
+  retry: 2
 before_script:
   - export SANITIZED_BRANCH="$(echo $CI_COMMIT_REF_NAME | sed -r 's#^release/##' | sed 's/\//_/g')"
 
diff --git a/ci-scripts/gitlab-ci.template b/ci-scripts/gitlab-ci.template
index 1ae170b..07411aa 100644
--- a/ci-scripts/gitlab-ci.template
+++ b/ci-scripts/gitlab-ci.template
@@ -1,9 +1,9 @@
 ############
 # Settings #
 ############
-image: docker:24.0.6
+image: docker:28.0.0
 services:
-  - docker:24.0.6-dind
+  - docker:28.0.0-dind
 stages:
   - readme
   - revert
@@ -18,6 +18,8 @@ variables:
   DOCKER_TLS_CERTDIR: ""
   TEST_INSTALLER: "{{ TEST_INSTALLER }}"
   MIRROR_ORG_NAME: "{{ MIRROR_ORG_NAME }}"
+default:
+  retry: 2
 before_script:
   - docker login --username $DOCKER_HUB_USERNAME --password $DOCKER_HUB_PASSWORD
   - if [ "$CI_COMMIT_REF_PROTECTED" == "true" ]; then docker login --username $QUAY_USERNAME --password $QUAY_PASSWORD quay.io; fi 

From 98c548e680f6ff9ff7deaa39a26f065af3e12f67 Mon Sep 17 00:00:00 2001
From: Huan Truong <huan.truong@kasmweb.com>
Date: Thu, 13 Nov 2025 10:46:36 -0600
Subject: [PATCH 2/2] QA-213 fix rhel9 dep

---
 src/oracle/install/tools/install_tools_deluxe.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/oracle/install/tools/install_tools_deluxe.sh b/src/oracle/install/tools/install_tools_deluxe.sh
index 6379400..a2e6beb 100644
--- a/src/oracle/install/tools/install_tools_deluxe.sh
+++ b/src/oracle/install/tools/install_tools_deluxe.sh
@@ -2,7 +2,7 @@
 set -ex
 
 if [ -f /usr/bin/dnf ]; then
-  dnf install -y vlc git tmux xz glibc-locale-source glibc-langpack-en
+  dnf install -y --nobest vlc git tmux xz glibc-locale-source glibc-langpack-en
   if [ -z ${SKIP_CLEAN+x} ]; then
     dnf clean all
   fi