Skip to content

Commit

Permalink
Merge pull request #262 from LongLiveCHIEF/extract-gitlab-ci
Browse files Browse the repository at this point in the history
remove gitlab-ci-runner from module
  • Loading branch information
LongLiveCHIEF authored Aug 18, 2018
2 parents 11885fe + 1564144 commit 9094d6d
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 374 deletions.
47 changes: 0 additions & 47 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -230,49 +230,6 @@ gitlab::gitlab_rails:
user_filter: ''
```

### Gitlab CI Runner Config

Here is an example how to configure Gitlab CI runners using Hiera:

To use the Gitlab CI runners it is required to have the [puppetlabs/docker](https://forge.puppetlabs.com/puppetlabs/docker) module.

`$manage_docker` can be set to false if docker is managed externally.

```yaml
classes:
- gitlab::cirunner
gitlab::cirunner::concurrent: 4
gitlab::cirunner::metrics_server: "localhost:8888"
gitlab_ci_runners:
test_runner1:{}
test_runner2:{}
test_runner3:
url: "https://git.alternative.org/ci"
registration-token: "abcdef1234567890"
gitlab_ci_runners_defaults:
url: "https://git.example.com/ci"
registration-token: "1234567890abcdef"
executor: "docker"
docker-image: "ubuntu:trusty"
```

To unregister a specific runner you may use `ensure` param:

```yaml
gitlab_ci_runners:
test_runner1:{}
test_runner2:{}
test_runner3:
url: "https://git.alternative.org/ci"
registration-token: "abcdef1234567890"
ensure: absent
```


### NGINX Configuration

Configuration of the embedded NGINX instance is handled by the `/etc/gitlab/gitlab.rb` file. Details on available configuration options are available at http://doc.gitlab.com/omnibus/settings/nginx.html. Options listed here can be passed in to the `nginx` parameter as a hash. For example, to enable ssh redirection:
Expand Down Expand Up @@ -406,10 +363,6 @@ class {'gitlab':
}
```

### Gitlab CI Runner Limitations

The Gitlab CI runner installation is at the moment only tested on Ubuntu 14.04.

## Tasks

The Gitlab module has a task that allows a user to upgrade the pgsql database Gitlab uses if upgrading from version 9.2.18, which is required to upgrade Gitlab past 10. When running the tasks on the command line, you will need to use the `--sudo`, `--run-as-root`, and `--tty` flags to execute the commands as needed for your environment.
Expand Down
163 changes: 0 additions & 163 deletions manifests/cirunner.pp

This file was deleted.

60 changes: 0 additions & 60 deletions manifests/runner.pp

This file was deleted.

20 changes: 0 additions & 20 deletions spec/acceptance/gitlabci_spec.rb

This file was deleted.

84 changes: 0 additions & 84 deletions spec/classes/cirunner_spec.rb

This file was deleted.

0 comments on commit 9094d6d

Please sign in to comment.