Use gitlab-runner instead of gitlab-ci-multi-runner

znz · Oct 30, 2017 · 616a9da · 616a9da
1 parent 2ef1d13
commit 616a9da
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/examples/spec/default/gitlab_spec.rb b/examples/spec/default/gitlab_spec.rb
@@ -1,5 +1,5 @@
 require 'spec_helper'
 
-describe package('gitlab-ci-multi-runner') do
+describe package('gitlab-runner') do
   it { should be_installed }
 end
diff --git a/files/pin-gitlab-runner.pref b/files/pin-gitlab-runner.pref
@@ -1,4 +1,4 @@
 Explanation: Prefer GitLab provided packages over the Debian native ones
-Package: gitlab-ci-multi-runner
+Package: gitlab-runner
 Pin: origin packages.gitlab.com
 Pin-Priority: 1001
diff --git a/tasks/main.yml b/tasks/main.yml
@@ -1,22 +1,26 @@
 ---
-# tasks file for ansible-role-gitlab-ce
+# tasks file for ansible-role-gitlab-runner
-- name: "Add gitlab-ce apt key"
+- name: "Add gitlab-runner apt key"
   apt_key:
-    url: "https://packages.gitlab.com/runner/gitlab-ci-multi-runner/gpgkey"
+    url: "https://packages.gitlab.com/runner/gitlab-runner/gpgkey"
     id: "14219A96E15E78F4"
-- name: "Add apt repository of gitlab-ci-multi-runner"
+- name: "Remove apt repository of gitlab-ci-multi-runner"
   apt_repository:
     repo: "deb https://packages.gitlab.com/runner/gitlab-ci-multi-runner/{{ ansible_distribution | lower }} {{ ansible_lsb.codename }} main"
+    state: absent
+- name: "Add apt repository of gitlab-runner"
+  apt_repository:
+    repo: "deb https://packages.gitlab.com/runner/gitlab-runner/{{ ansible_distribution | lower }} {{ ansible_lsb.codename }} main"
 - name: "Pin gitlab runner"
   copy:
     src: pin-gitlab-runner.pref
     dest: /etc/apt/preferences.d/pin-gitlab-runner.pref
     owner: root
     group: root
     mode: 0644
-- name: "Install gitlab-ci-multi-runner"
+- name: "Install gitlab-runner"
   apt:
-    name: gitlab-ci-multi-runner
+    name: gitlab-runner
 
 - name: "List configured runners"
   command: gitlab-runner list