Merge branch 'bugfix/wrong_branches_cyberbro_vulkan' into 'develop'

Fix feature/bugfix branches that were committed.

See merge request kasm-technologies/internal/workspaces-images!331

.gitlab-ci.yml

@@ -8,8 +8,8 @@ stages:
   - template
   - run
 variables:
-  BASE_TAG: "feature_VNC-204_vulkan_support"
-  USE_PRIVATE_IMAGES: 1
+  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"
   MIRROR_ORG_NAME: "kasmtech"

ci-scripts/test.sh

@@ -188,7 +188,7 @@ ssh \
 ready_check
 
 # Pull tester image
-docker pull ${ORG_NAME}/kasm-tester:bugfix_KASM-7221-fix_cyberbro_tests
+docker pull ${ORG_NAME}/kasm-tester:1.18.0
 
 # Run test
 cp /root/.ssh/id_rsa $(dirname ${CI_PROJECT_DIR})/sshkey
@@ -210,7 +210,7 @@ docker run --rm \
   -e REPO=workspaces-images \
   -e AUTOMATED=true \
   -v $(dirname ${CI_PROJECT_DIR})/sshkey:/sshkey:ro  ${SLIM_FLAG} \
-  kasmweb/kasm-tester:bugfix_KASM-7221-fix_cyberbro_tests
+  kasmweb/kasm-tester:1.18.0
 
 # Shutdown Instances
 turnoff