updates

gabrie30 · May 25, 2024 · 2fb4923 · 2fb4923
1 parent 5d15d9c
commit 2fb4923
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git 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
@@ -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,15 +35,15 @@ 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
 
   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