diff --git a/.ansible-lint b/.ansible-lint deleted file mode 100644 index e99d805..0000000 --- a/.ansible-lint +++ /dev/null @@ -1,5 +0,0 @@ -parseable: true -quiet: true -skip_list: - - '501' -use_default_rules: true diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e666ea1..6532692 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,40 +3,24 @@ stages: - test cache: - key: "$CI_COMMIT_REF_SLUG" + key: $CI_COMMIT_REF_SLUG paths: - .cache/pip - node_modules/ lint: - stage: lint - image: python:3.7 - before_script: - - pip install ansible ansible-lint --quiet - script: - - ansible-lint playbook.yml - only: - refs: - - development - - merge_requests - -pretty-lint: stage: lint image: node:12 before_script: - - npm install + - npm install prettier --no-save script: - - npx prettier "roles/**/*.yml" --check - only: - refs: - - development - - merge_requests + - npx prettier '**/*.yml' --check syntax-test: stage: test image: python:3.7 before_script: - - pip install ansible ansible-lint --quiet + - pip install ansible --quiet - ansible-galaxy install -r roles/requirements.yml script: - ansible-playbook playbook.yml --syntax-check diff --git a/.prettier.json b/.prettier.json deleted file mode 100644 index 9c76f6b..0000000 --- a/.prettier.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "singleQuote": true, - "printWidth": 90, - "tabWidth": 2, - "useTabs": false, - "bracketSpacing": true, - "parser": "yaml" -} - diff --git a/.prettierrc.yml b/.prettierrc.yml new file mode 100644 index 0000000..0cb31e6 --- /dev/null +++ b/.prettierrc.yml @@ -0,0 +1,5 @@ +singleQuote: true +printWidth: 90 +tabWidth: 2 +useTabs: false +bracketSpacing: true diff --git a/roles/gitlab_runner/handlers/main.yml b/handlers.yml similarity index 82% rename from roles/gitlab_runner/handlers/main.yml rename to handlers.yml index ebbdda8..9235841 100644 --- a/roles/gitlab_runner/handlers/main.yml +++ b/handlers.yml @@ -2,4 +2,4 @@ systemd: name: gitlab-runner state: restarted - enabled: yes + enabled: true diff --git a/inventory.yml b/inventory.yml index de55c7c..8927347 100644 --- a/inventory.yml +++ b/inventory.yml @@ -1,16 +1,16 @@ gitlab-runner: hosts: 192.168.178.87: - host_interface : "en*" - host_ip : "192.168.178.87" - host_subnet : "24" - host_gateway : "192.168.178.1" - host_dns : "192.168.178.1" - hostname: "gitlab-runner-2" + host_interface: 'en*' + host_ip: '192.168.178.87' + host_subnet: '24' + host_gateway: '192.168.178.1' + host_dns: '192.168.178.1' + hostname: 'gitlab-runner-2' 192.168.178.192: - host_interface : "en*" - host_ip : "192.168.178.192" - host_subnet : "24" - host_gateway : "192.168.178.1" - host_dns : "192.168.178.1" - hostname: "gitlab-runner-1" + host_interface: 'en*' + host_ip: '192.168.178.192' + host_subnet: '24' + host_gateway: '192.168.178.1' + host_dns: '192.168.178.1' + hostname: 'gitlab-runner-1' diff --git a/playbook.yml b/playbook.yml index e00ace7..8fa69b5 100644 --- a/playbook.yml +++ b/playbook.yml @@ -1,5 +1,11 @@ - hosts: gitlab-runner - become: yes + become: true become_method: sudo roles: - - gitlab_runner + - common + tasks: + - import_tasks: 'tasks.yml' + handlers: + - import_tasks: 'handlers.yml' + vars_files: + - 'vars.yml' diff --git a/roles/gitlab_runner/defaults/main.yml b/roles/gitlab_runner/defaults/main.yml deleted file mode 100644 index f006982..0000000 --- a/roles/gitlab_runner/defaults/main.yml +++ /dev/null @@ -1,8 +0,0 @@ -default_user: "sonny" - -gitlab_repo: "deb https://packages.gitlab.com/runner/gitlab-runner/debian/ buster main" -gitlab_runner_gpg: "https://packages.gitlab.com/runner/gitlab-runner/gpgkey" - -docker_repo: "deb https://download.docker.com/linux/debian buster stable" -docker_gpg: "https://download.docker.com/linux/debian/gpg" -docker_gpg_id: "0EBFCD88" diff --git a/roles/gitlab_runner/meta/main.yml b/roles/gitlab_runner/meta/main.yml deleted file mode 100644 index 775a80b..0000000 --- a/roles/gitlab_runner/meta/main.yml +++ /dev/null @@ -1,16 +0,0 @@ -dependencies: - - common - -galaxy_info: - author: sonny - description: "Gitlab-runner installation" - license: "license GPLv3" - min_ansible_version: 2.7 - issue_tracker_url: "https://git.fudiggity.nl/ansible/gitlab-runner/-/issues" - platforms: - - name: Debian - versions: - - buster - galaxy_tags: - - development - - system diff --git a/roles/gitlab_runner/tasks/main.yml b/tasks.yml similarity index 52% rename from roles/gitlab_runner/tasks/main.yml rename to tasks.yml index e11d362..b1340ea 100644 --- a/roles/gitlab_runner/tasks/main.yml +++ b/tasks.yml @@ -1,55 +1,51 @@ - include_role: name: common - tasks_from: "network.yml" + tasks_from: 'network.yml' - include_role: name: common - tasks_from: "host.yml" + tasks_from: 'host.yml' - name: copy apt preference file template: - src: "{{ item.src }}" - dest: "{{ item.dest }}" + src: '{{ item.src }}' + dest: '{{ item.dest }}' owner: root group: root - mode: "0600" + mode: '0600' loop: - { - src: "apt-pin.j2", - dest: "/etc/apt/preferences.d/pin-gitlab-runner.pref", + src: 'templates/apt-pin.j2', + dest: '/etc/apt/preferences.d/pin-gitlab-runner.pref', } - name: Add docker gpg key apt_key: - id: "{{ docker_gpg_id }}" - url: "{{ docker_gpg }}" - validate_certs: yes + id: '{{ docker_gpg_id }}' + url: '{{ docker_gpg }}' + validate_certs: true state: present - name: Add gitlab-runner gpg key apt_key: - url: "{{ gitlab_runner_gpg }}" - validate_certs: yes + url: '{{ gitlab_runner_gpg }}' + validate_certs: true state: present - name: Add docker repo apt_repository: - repo: "{{ docker_repo }}" - validate_certs: yes + repo: '{{ docker_repo }}' + validate_certs: true state: present - name: Add gitlab-runner repo apt_repository: - repo: "{{ gitlab_repo }}" - validate_certs: yes + repo: '{{ gitlab_repo }}' + validate_certs: true state: present - name: install packages # noqa 403 apt: - name: - - gitlab-runner - - docker-ce - - docker-ce-cli - - containerd.io + name: '{{ packages }}' update_cache: true state: latest notify: @@ -59,4 +55,7 @@ # see https://gitlab.com/gitlab-org/gitlab-runner/issues/305 - name: ensure docker is restarted - service: name=docker state=restarted enabled=yes + systemd: + name: docker + state: restarted + enabled: true diff --git a/roles/gitlab_runner/templates/apt-pin.j2 b/templates/apt-pin.j2 similarity index 100% rename from roles/gitlab_runner/templates/apt-pin.j2 rename to templates/apt-pin.j2 diff --git a/vars.yml b/vars.yml new file mode 100644 index 0000000..02205bc --- /dev/null +++ b/vars.yml @@ -0,0 +1,14 @@ +default_user: 'sonny' + +gitlab_repo: 'deb https://packages.gitlab.com/runner/gitlab-runner/debian/ buster main' +gitlab_runner_gpg: 'https://packages.gitlab.com/runner/gitlab-runner/gpgkey' + +docker_repo: 'deb https://download.docker.com/linux/debian buster stable' +docker_gpg: 'https://download.docker.com/linux/debian/gpg' +docker_gpg_id: '0EBFCD88' + +packages: + - gitlab-runner + - docker-ce + - docker-ce-cli + - containerd.io