From 76c55949d2cc642e2ad635b5762e28cc95cfe15b Mon Sep 17 00:00:00 2001
From: Alexander Fisher <alex@linfratech.co.uk>
Date: Fri, 16 Jul 2021 12:16:30 +0100
Subject: [PATCH] Try using old start-gitlab.sh

---
 .github/workflows/ci.yml | 13 ++-----------
 scripts/start-gitlab.sh  |  5 -----
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ed92b39..0e8882d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -59,11 +59,6 @@ jobs:
         setfile: ${{fromJson(needs.setup_matrix.outputs.beaker_setfiles)}}
         puppet: ${{fromJson(needs.setup_matrix.outputs.puppet_major_versions)}}
     name: ${{ matrix.puppet.name }} - ${{ matrix.setfile.name }}
-    services:
-      gitlab:
-        image: gitlab/gitlab-ce
-        ports:
-          - 80:80
     steps:
       - uses: actions/checkout@v2
       - name: Setup ruby
@@ -71,12 +66,8 @@ jobs:
         with:
           ruby-version: '2.7'
           bundler-cache: true
-      - name: Set Gitlab variables
-        run: |
-          docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' ${{ job.services.gitlab.id }} > ~/GITLAB_IP
-          echo 'puts "INSTANCE TOKEN: #{Gitlab::CurrentSettings.current_application_settings.runners_registration_token}"' | \
-            docker exec -i ${{ job.services.gitlab.id }} gitlab-rails console | \
-            awk '/^INSTANCE TOKEN:/ {print $NF}' > ~/INSTANCE_TOKEN
+      - name: Start gitlab
+        run: ./scripts/start-gitlab.sh
       - name: Run tests
         run: bundle exec rake beaker
         env:
diff --git a/scripts/start-gitlab.sh b/scripts/start-gitlab.sh
index be389f4..7311ed7 100755
--- a/scripts/start-gitlab.sh
+++ b/scripts/start-gitlab.sh
@@ -1,10 +1,5 @@
 #!/bin/bash
 
-if [[ "${CHECK}" != "beaker" ]]; then
-  echo "Only starting Gitlab test container for beaker tests"
-  exit 0
-fi
-
 docker run --detach --rm \
   --name gitlab \
   --hostname gitlab \