Skip to content

Commit 84a6fbc

Browse files
committed
ansible: converge s390x runners with the rest of runners
Now, the only thing that s390x role is doing is to: - sync libbpf/ci - build the docker image. All docker jobs will now use the same image (while before they used to be a docker image per worker flavor). Once we build the image under kernel-patches/runner, the remainder of main-s390x.yml will go. This was pushed to `bpf-ci-runner-s390x-7`. The runners could attach to the orgnization and are available to the repositories. Signed-off-by: Manu Bretelle <[email protected]>
1 parent f914f3a commit 84a6fbc

File tree

3 files changed

+6
-71
lines changed

3 files changed

+6
-71
lines changed

ansible/roles/runner/tasks/main-s390x.yml

Lines changed: 6 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -14,49 +14,13 @@
1414
version: "{{ runner_libbpf_ci_repo_branch }}"
1515
accept_hostkey: yes
1616

17+
- name: Set docker image URL
18+
set_fact:
19+
runner_docker_image_url: kernel-patches/runner
20+
1721
- name: Build runner docker image
1822
become: yes
1923
shell:
20-
"docker build --pull -f actions-runner-libbpf.Dockerfile -t iiilinuxibmcom/actions-runner-{{ item.normalized }} ."
24+
"docker build --pull -f actions-runner-libbpf.Dockerfile -t {{ runner_docker_image_url }}:{{ runner_docker_tag }} ."
2125
args:
22-
chdir: "{{ account_homedir.stdout }}/libbpf-ci/rootfs/s390x-self-hosted-builder"
23-
with_items: "{{ runners }}"
24-
25-
26-
- name: Runner configuration file
27-
become: yes
28-
ansible.builtin.template:
29-
src: actions-runner.j2
30-
dest: "{{ runner_base_dir }}/actions-runner-{{ item.0.normalized }}-worker-{{ item.1 }}"
31-
mode: 0640
32-
owner: root
33-
group: root
34-
loop: "{{ runners | subelements('workers') }}"
35-
36-
37-
- name: Runner systemd unit
38-
become: yes
39-
ansible.builtin.template:
40-
src: actions-runner.service.j2
41-
dest: /etc/systemd/system/actions-runner-{{ item.normalized }}@.service
42-
mode: 0644
43-
owner: root
44-
group: root
45-
# Register is used to collect the runner projects that were modified.
46-
# We can use this information in the handler to restart only the runners that had their
47-
# systemd unit modified/created.
48-
register: runner_projects
49-
with_items: "{{ runners }}"
50-
notify:
51-
- reload systemd daemon
52-
- restart actions-runners
53-
54-
- name: Enable runner service
55-
become: yes
56-
ansible.builtin.service:
57-
name: actions-runner-{{ item.0.normalized }}@{{ item.1 }}
58-
enabled: yes
59-
state: started
60-
loop: "{{ runners | subelements('workers') }}"
61-
62-
26+
chdir: "{{ account_homedir.stdout }}/libbpf-ci/rootfs/s390x-self-hosted-builder"

ansible/roles/runner/templates/actions-runner.j2

Lines changed: 0 additions & 3 deletions
This file was deleted.

ansible/roles/runner/templates/actions-runner.service.j2

Lines changed: 0 additions & 26 deletions
This file was deleted.

0 commit comments

Comments
 (0)