Skip to content

Commit

Permalink
Rolling will fail.
Browse files Browse the repository at this point in the history
  • Loading branch information
robertdebock committed May 23, 2019
1 parent 3febae8 commit 9730cb2
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 17 deletions.
8 changes: 4 additions & 4 deletions .travis.yml
Expand Up @@ -37,9 +37,9 @@ env:
- version=">=2.6,<2.7" distro="opensuse-leap" expectation="fail"
- version="" distro="opensuse-leap" expectation="fail"
- version="devel" distro="opensuse-leap" expectation="fail"
- version=">=2.6,<2.7" distro="ubuntu-rolling"
- version="" distro="ubuntu-rolling"
- version="devel" distro="ubuntu-rolling"
- version=">=2.6,<2.7" distro="ubuntu-rolling" expectation="fail"
- version="" distro="ubuntu-rolling" expectation="fail"
- version="devel" distro="ubuntu-rolling" expectation="fail"
- version=">=2.6,<2.7" distro="ubuntu-latest"
- version="" distro="ubuntu-latest"
- version="devel" distro="ubuntu-latest"
Expand All @@ -66,7 +66,7 @@ matrix:
- env: version="" distro="fedora-rawhide"
- env: version="devel" distro="fedora-rawhide"
- env: version="devel" distro="opensuse-leap" expectation="fail"
- env: version="devel" distro="ubuntu-rolling"
- env: version="devel" distro="ubuntu-rolling" expectation="fail"
- env: version=">=2.6,<2.7" distro="ubuntu-devel"
- env: version="" distro="ubuntu-devel"
- env: version="devel" distro="ubuntu-devel"
Expand Down
4 changes: 2 additions & 2 deletions README.md
Expand Up @@ -3,7 +3,7 @@ gitlab_runner

[![Build Status](https://travis-ci.org/robertdebock/ansible-role-gitlab_runner.svg?branch=master)](https://travis-ci.org/robertdebock/ansible-role-gitlab_runner)

Install and configure gitlab-runner on your system
Install and configure gitlab-runner on your system.

Example Playbook
----------------
Expand Down Expand Up @@ -89,7 +89,7 @@ This role has been tested against the following distributions and Ansible versio
|opensuse-leap|no|no|no*|
|ubuntu-devel*|yes|yes|yes*|
|ubuntu-latest|yes|yes|yes*|
|ubuntu-rolling|yes|yes|yes*|
|ubuntu-rolling|no|no|no*|

A single star means the build may fail, it's marked as an experimental build.

Expand Down
36 changes: 25 additions & 11 deletions vars/main.yml
Expand Up @@ -16,17 +16,31 @@ gitlab_runner_apt_repositories:
- deb https://packages.gitlab.com/runner/gitlab-runner/{{ ansible_distribution | lower }}/ {{ ansible_distribution_release }} main
- deb-src https://packages.gitlab.com/runner/gitlab-runner/{{ ansible_distribution | lower }}/ {{ ansible_distribution_release }} main

gitlab_runner_yum_repositories:
- name: runner_gitlab-runner
baseurl: https://packages.gitlab.com/runner/gitlab-runner/el/{{ ansible_distribution_major_version }}/$basearch
gpgkey:
- https://packages.gitlab.com/runner/gitlab-runner/gpgkey
- https://packages.gitlab.com/runner/gitlab-runner/gpgkey/runner-gitlab-runner-366915F31B487241.pub.gpg
- name: runner_gitlab-runner-source
baseurl: https://packages.gitlab.com/runner/gitlab-runner/el/{{ ansible_distribution_major_version }}/SRPMS
gpgkey:
- https://packages.gitlab.com/runner/gitlab-runner/gpgkey
- https://packages.gitlab.com/runner/gitlab-runner/gpgkey/runner-gitlab-runner-366915F31B487241.pub.gpg
_gitlab_runner_yum_repositories:
default:
- name: runner_gitlab-runner
baseurl: https://packages.gitlab.com/runner/gitlab-runner/el/{{ ansible_distribution_major_version }}/$basearch
gpgkey:
- https://packages.gitlab.com/runner/gitlab-runner/gpgkey
- https://packages.gitlab.com/runner/gitlab-runner/gpgkey/runner-gitlab-runner-366915F31B487241.pub.gpg
- name: runner_gitlab-runner-source
baseurl: https://packages.gitlab.com/runner/gitlab-runner/el/{{ ansible_distribution_major_version }}/SRPMS
gpgkey:
- https://packages.gitlab.com/runner/gitlab-runner/gpgkey
- https://packages.gitlab.com/runner/gitlab-runner/gpgkey/runner-gitlab-runner-366915F31B487241.pub.gpg
Fedora:
- name: runner_gitlab-runner
baseurl: https://packages.gitlab.com/runner/gitlab-runner/{{ ansible_distribution | lower }}/{{ ansible_distribution_major_version }}/$basearch
gpgkey:
- https://packages.gitlab.com/runner/gitlab-runner/gpgkey
- https://packages.gitlab.com/runner/gitlab-runner/gpgkey/runner-gitlab-runner-366915F31B487241.pub.gpg
- name: runner_gitlab-runner-source
baseurl: https://packages.gitlab.com/runner/gitlab-runner/{{ ansible_distribution | lower }}/{{ ansible_distribution_major_version }}/SRPMS
gpgkey:
- https://packages.gitlab.com/runner/gitlab-runner/gpgkey
- https://packages.gitlab.com/runner/gitlab-runner/gpgkey/runner-gitlab-runner-366915F31B487241.pub.gpg

gitlab_runner_yum_repositories: "{{ _gitlab_runner_yum_repositories[ansible_distribution] | default(_gitlab_runner_yum_repositories['default']) }}"

gitlab_runner_packages:
- gitlab-runner
Expand Down

0 comments on commit 9730cb2

Please sign in to comment.