Skip to content

Commit

Permalink
Try using old start-gitlab.sh
Browse files Browse the repository at this point in the history
  • Loading branch information
alexjfisher committed Jul 16, 2021
1 parent 141538e commit 76c5594
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 16 deletions.
13 changes: 2 additions & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,24 +59,15 @@ 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
uses: ruby/setup-ruby@v1
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:
Expand Down
5 changes: 0 additions & 5 deletions scripts/start-gitlab.sh
Original file line number Diff line number Diff line change
@@ -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 \
Expand Down

0 comments on commit 76c5594

Please sign in to comment.