save

gitlab-runner-z.yml

@@ -26,7 +26,7 @@
       - name: register
         shell: |
           {% for instance in instances %}
-          docker-compose exec -T runner gitlab-runner register --non-interactive --url '{{ instance.url }}' --token '{{ instance.token }}' --executor '{{ instance.type | default("docker") }}' --docker-volumes /cache {% if instance.docker | default(false) %} --docker-privileged --docker-volumes /var/run/docker.sock:/var/run/docker.sock --docker-image docker:20-git {% else %} --docker-image git-registry.moenext.com/mycard/docker-runner-base:latest {% endif %}
+          docker-compose exec -T runner gitlab-runner register --non-interactive --url '{{ instance.url }}' --token '{{ instance.token }}' --executor '{{ instance.type | default("docker") }}' --docker-volumes /cache {% if instance.docker | default(false) %} --docker-privileged --docker-volumes /var/run/docker.sock:/var/run/docker.sock --docker-image docker:28-git {% else %} --docker-image git-registry.moenext.com/mycard/docker-runner-base:latest {% endif %}
 
           {% endfor %}
         args:

gitlab-runner.yml

@@ -23,7 +23,7 @@
       - name: register
         shell: |
           {% for instance in instances %}
-          docker-compose exec -T runner gitlab-runner register --non-interactive --url '{{ instance.url }}' --registration-token '{{ instance.token }}' --description '{{ instance.desc }} runner on {{ inventory_hostname }}' --executor '{{ instance.type | default("docker") }}' --docker-volumes /cache {% if instance.docker | default(false) %} --tag-list docker{% if ansible_architecture == 'aarch64' %}-arm{% endif %} --docker-privileged --docker-volumes /var/run/docker.sock:/var/run/docker.sock --docker-image docker:20-git {% else %} --tag-list {% if ansible_architecture == 'aarch64' %}arm{% else %}linux{% endif %} --docker-image git-registry.moenext.com/mycard/docker-runner-base:latest {% endif %}
+          docker-compose exec -T runner gitlab-runner register --non-interactive --url '{{ instance.url }}' --registration-token '{{ instance.token }}' --description '{{ instance.desc }} runner on {{ inventory_hostname }}' --executor '{{ instance.type | default("docker") }}' --docker-volumes /cache {% if instance.docker | default(false) %} --tag-list docker{% if ansible_architecture == 'aarch64' %}-arm{% endif %} --docker-privileged --docker-volumes /var/run/docker.sock:/var/run/docker.sock --docker-image docker:{{ docker_version | default(25) }}-git {% else %} --tag-list {% if ansible_architecture == 'aarch64' %}arm{% else %}linux{% endif %} --docker-image git-registry.moenext.com/mycard/docker-runner-base:latest {% endif %}
 
           {% endfor %}
         args:

hypervisor.yml

@@ -32,7 +32,7 @@
       apt:
         # state: latest
         update_cache: true
-        name: qemu,qemu-kvm,bridge-utils,virtinst,libguestfs-tools,ksmtuned,dmidecode,cockpit,cockpit-machines,libvirt-daemon,libvirt-dev,python3,python3-libvirt,python3-lxml,ovmf
+        name: qemu-kvm,bridge-utils,virtinst,libguestfs-tools,ksmtuned,dmidecode,cockpit,cockpit-machines,libvirt-daemon,libvirt-dev,python3,python3-libvirt,python3-lxml,ovmf
     - name: packages for focal
       become: true
       when: ansible_os_family == 'Debian' and (ansible_distribution == 'Debian' and ansible_distribution_major_version|int >= 11 or ansible_distribution == 'Ubuntu' and ansible_distribution_major_version|int >= 20)

install_srvpro.yml

@@ -17,7 +17,7 @@
       become: true
       apt:
         update_cache: true
-        name: wget,git,build-essential,libreadline-dev,libsqlite3-dev,libevent-dev,p7zip-full,liblua5.3-dev
+        name: wget,git,build-essential,libreadline-dev,libsqlite3-dev,libevent-dev,p7zip-full,liblua5.4-dev
       when: ansible_os_family == 'Debian'
     - name: epel 7
       become: true

services-collect.yml

+---
+  - hosts: services
+    remote_user: root
+    tasks:
+      - name: Synchronize collects directory files to local
+        synchronize:
+          src: "{{ ansible_user_dir }}/{{ service_path }}/collects/"
+          dest: "../collector/{{ service_name }}/{{ inventory_hostname_short }}/"
+          mode: pull
+          delete: no
+          copy_links: yes
+          recursive: yes
+          verify_host: no
+          checksum: yes
+          archive: no
+          perms: yes
+          rsync_opts: '{{ collect_rsync_opts | default([]) }}'

services.yml

@@ -4,9 +4,13 @@
     tasks:
       - name: directory
         file:
-          path: '{{ ansible_user_dir }}/{{ service_path }}'
+          path: '{{ ansible_user_dir }}/{{ service_path }}/{{ item }}'
           state: directory
           recurse: true
+        with_items:
+          - data
+          - templates
+          - collects
       - name: docker-compose file
         template:
           src: 'files/services/{{ service_name }}/docker-compose.yml.j2'
@@ -23,15 +27,12 @@
           checksum: yes
           archive: no
           perms: yes
+          rsync_opts: '{{ upload_rsync_opts | default([]) }}'
         notify: handle
       - name: specific files
         copy: '{{item}}'
         with_items: '{{ specific_files }}'
         notify: handle
-      - name: templates directory
-        file:
-          path: '{{ ansible_user_dir }}/{{ service_path }}/templates'
-          state: directory
       - name: templates
         become: true
         with_items: '{{ template_list }}'

tasks/srvpro/common.yml

-- name: pre data
-  git:
-    repo: 'https://e.coding.net/mercury233/ygopro-pre-data.git'
-    dest: '{{home_path}}/ygopro-pre-data'
-    force: true
-    accept_hostkey: true
-    track_submodules: true
 - name: windbot
   include_tasks: ./windbot.yml
   when: server_type is not defined or server_type != "tournament"