From ef496469bf71062cbd7354e1521a7309da58f474 Mon Sep 17 00:00:00 2001
From: Antonio Ospite <antonio.ospite@collabora.com>
Date: Thu, 23 Jan 2025 18:02:12 +0100
Subject: [PATCH] ci/android: pass -vsock_guest_cid to launch_cvd

This reduces the risk of conflicting ports on the host system.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33499>
---
 .gitlab-ci/cuttlefish-runner.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.gitlab-ci/cuttlefish-runner.sh b/.gitlab-ci/cuttlefish-runner.sh
index 794144253ae..52fb4b89407 100755
--- a/.gitlab-ci/cuttlefish-runner.sh
+++ b/.gitlab-ci/cuttlefish-runner.sh
@@ -47,11 +47,15 @@ trap 'exit 2' HUP INT PIPE TERM
 
 ulimit -S -n 32768
 
+VSOCK_BASE=10000 # greater than all the default vsock ports
+VSOCK_CID=$((VSOCK_BASE + (CI_JOB_ID & 0xfff)))
+
 HOME=/cuttlefish launch_cvd \
   -daemon \
   -verbosity=VERBOSE \
   -file_verbosity=VERBOSE \
   -use_overlay=false \
+  -vsock_guest_cid=$VSOCK_CID \
   -enable_audio=false \
   -enable_bootanimation=false \
   -enable_minimal_mode=true \