From 2fb49235c596c6286342abbe8568367a14f1e178 Mon Sep 17 00:00:00 2001
From: Jay Gabriels <jgabriels30@gmail.com>
Date: Sat, 25 May 2024 14:15:41 -0700
Subject: [PATCH] updates

---
 .github/workflows/gitlab-ee-integration-tests.yml |  1 +
 scripts/local-gitlab/run-ee.sh                    | 10 ++++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/gitlab-ee-integration-tests.yml b/.github/workflows/gitlab-ee-integration-tests.yml
index 5a894080f..7cf46336f 100644
--- a/.github/workflows/gitlab-ee-integration-tests.yml
+++ b/.github/workflows/gitlab-ee-integration-tests.yml
@@ -24,4 +24,5 @@ jobs:
       - name: Run GitLab Integration Test
         run: |
           echo "Using ghorg version: $(ghorg version)"
+          export GHORG_GHA_CI=true
           ./scripts/local-gitlab/start-ee.sh
diff --git a/scripts/local-gitlab/run-ee.sh b/scripts/local-gitlab/run-ee.sh
index 88ad4261b..c882726b0 100755
--- a/scripts/local-gitlab/run-ee.sh
+++ b/scripts/local-gitlab/run-ee.sh
@@ -19,6 +19,12 @@ PERSIST_GITLAB_LOCALLY=$4
 echo ""
 echo "Starting fresh install of GitLab Enterprise Edition, using tag: ${GITLAB_IMAGE_TAG}"
 
+if [ "${GHORG_GHA_CI}" == "true" ]; then
+  GHORG_SSH_PORT=2222
+else
+  GHORG_SSH_PORT=22
+fi
+
 
 if [ "${PERSIST_GITLAB_LOCALLY}" == "true" ];then
   echo "Removing any previous install at path: ${GITLAB_HOME}"
@@ -29,7 +35,7 @@ if [ "${PERSIST_GITLAB_LOCALLY}" == "true" ];then
   docker run \
     -d=true \
     --hostname "${GITLAB_HOST}" \
-    --publish 443:443 --publish 80:80 --publish 22:22 \
+    --publish 443:443 --publish 80:80 --publish "${GHORG_SSH_PORT}":22 \
     --name gitlab \
     gitlab/gitlab-ee:"${GITLAB_IMAGE_TAG}"
 else
@@ -37,7 +43,7 @@ else
   docker run \
     -d=true \
     --hostname "${GITLAB_HOST}" \
-    --publish 443:443 --publish 80:80 --publish 22:22 \
+    --publish 443:443 --publish 80:80 --publish "${GHORG_SSH_PORT}":22 \
     --name gitlab \
     gitlab/gitlab-ee:"${GITLAB_IMAGE_TAG}"
 fi