ansible: Deploy glibc builder to a-fsn-de

Author: the-maldridge

ansible/group_vars/build.yml

@@ -5,22 +5,22 @@ buildslave_buildslaves:
   - name: x86_64-primary
     sname: x86_64_void
     mach: x86_64
-    zone: FI-2
+    zone: DE-1
 
   - name: i686-primary
     sname: i686_void
     mach: i686
-    zone: FI-2
+    zone: DE-1
 
   - name: armv6l-primary
     sname: cross-rpi_void
     mach: armv6l
-    zone: FI-2
+    zone: DE-1
 
   - name: armv7l-primary
     sname: cross-armv7l_void
     mach: armv7l
-    zone: FI-2
+    zone: DE-1
 
   - name: x86_64-musl-primary
     sname: x86_64-musl_void
@@ -57,6 +57,13 @@ buildslave_buildslaves:
     zone: DE-2
 
 buildslave_zones:
+  DE-1:
+    admin:
+      nick: maldridge
+      name: maldridge
+      mail: maldridge@voidlinux.org
+    xbps:
+      makejobs: 16
   DE-2:
     admin:
       nick: leah2
@@ -70,15 +77,7 @@ buildslave_zones:
       mail: maldridge@voidlinux.org
     xbps:
       makejobs: 6
-  FI-2:
-    admin:
-      nick: maldridge
-      name: maldridge
-      mail: maldridge@voidlinux.org
-    xbps:
-      makejobs: 16
 
 buildmaster_remote_zones:
   - DE-2
-  - US-MCI
   - FI-1

ansible/host_vars/a-fsn-de.m.voidlinux.org.yml

@@ -1,6 +1,22 @@
 ---
+xbps_repository_main: /data/pkgs
+xbps_repository_nonfree: /data/pkgs/nonfree
+xbps_repository_multilib: /data/pkgs/multilib
+xbps_repository_multilib_nonfree: /data/pkgs/multilib/nonfree
+
 sshd_AllowGroups:
   - build-ops
-  - syncpeers
+  - void-buildsync
+
+buildslave_zone: DE-1
 
-buildslave_zone: FI-2
+nomad_host_volumes:
+  - name: void-packages
+    path: /data/void-packages
+    read_only: false
+  - name: root-pkgs
+    path: /hostdir/binpkgs
+    read_only: false
+  - name: glibc_hostdir
+    path: /hostdir
+    read_only: false

ansible/host_vars/b-hel-fi.m.voidlinux.org.yml

@@ -7,19 +7,3 @@ xbps_repository_multilib_nonfree: /mnt/data/pkgs/multilib/nonfree
 sshd_AllowGroups:
   - build-ops
   - syncpeers
-
-buildslave_zone: FI-2
-
-nomad_host_volumes:
-  - name: void-packages
-    path: /mnt/data/void-packages
-    read_only: false
-  - name: root-pkgs
-    path: /mnt/data/pkgs
-    read_only: false
-  - name: glibc_hostdir
-    path: /hostdir
-    read_only: false
-  - name: debuginfod-data
-    path: /mnt/data/debuginfod
-    read_only: false

ansible/inventory

@@ -5,6 +5,7 @@ a-hel-fi.m.voidlinux.org
 a-hel-fi.m.voidlinux.org
 b-hel-fi.m.voidlinux.org
 c-lej-de.m.voidlinux.org
+a-fsn-de.m.voidlinux.org
 
 [build:children]
 buildmaster

ansible/roles/buildmaster/templates/master.cfg.j2

@@ -149,7 +149,7 @@ bash -c 'for repo in {hostdir}/binpkgs/multilib {hostdir}/binpkgs/multilib/nonfr
 	m['bulk_factory_steps'] = [
 		bulk_clean_step, git_clean_step, bootinst_step,
 		bootup_step, conf_step, get_pkgs_step, make_step,
-		remove_obsoletes_step
+        remove_obsoletes_step
 	]
 
 	# since i686 writes the x86_64 multilib repository,

services/nomad/build/buildsync-dist.nomad

@@ -32,8 +32,8 @@ job "buildsync-dist" {
       }
 
       env {
-        CRON_TASK_1="* * * * * flock -n /run/sync.lock rsync -vurk --delete-after -e 'ssh -i /secrets/id_rsa -o UserKnownHostsFile=/local/known_hosts' void-buildsync@b-hel-fi.node.consul:/mnt/data/pkgs/ /pkgs/"
-        CRON_TASK_2="* * * * * flock -n /run/srcs.lock rsync -vurk  --delete-after -e 'ssh -i /secrets/id_rsa -o UserKnownHostsFile=/local/known_hosts' void-buildsync@b-hel-fi.node.consul:/hostdir/sources/ /sources/"
+        CRON_TASK_1="* * * * * flock -n /run/sync.lock rsync -vurk --delete-after -e 'ssh -i /secrets/id_rsa -o UserKnownHostsFile=/local/known_hosts' void-buildsync@a-fsn-de.node.consul:/data/pkgs/ /pkgs/"
+        CRON_TASK_2="* * * * * flock -n /run/srcs.lock rsync -vurk  --delete-after -e 'ssh -i /secrets/id_rsa -o UserKnownHostsFile=/local/known_hosts' void-buildsync@a-fsn-de.node.consul:/hostdir/sources/ /sources/"
       }
 
       resources {
@@ -62,7 +62,7 @@ EOF
 
       template {
         data = <<EOF
-b-hel-fi.node.consul ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMU4d2VBQ3GYGdPOFlvjsJupPnnCk+42hLhrGuCrGLgT
+a-fsn-de.node.consul ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDjnTyMBnRBQD6NXA5ejX1qV2u+rjuIpRHHBWLidJOjB
 EOF
         destination = "local/known_hosts"
       }

services/nomad/build/root-pkgs-httpd.nomad

@@ -15,14 +15,6 @@ job "build-mirror" {
     service {
       name = "root-pkgs-internal"
       port = "http"
-
-      check {
-        type = "http"
-        address_mode = "host"
-        path = "/"
-        timeout = "30s"
-        interval = "15s"
-      }
     }
 
     volume "root-pkgs" {

services/nomad/monitoring/repo_exporter.nomad

@@ -15,13 +15,21 @@ job "repo-exporter" {
     service {
       port = "metrics"
       tags = ["traefik.enable=true", "traefik.http.routers.repo-exporter-exporter.tls=true"]
+      check {
+        type = "http"
+        port = "metrics"
+        path = "/"
+        address_mode = "host"
+        interval = "30s"
+        timeout = "2s"
+      }
     }
 
     task "exporter" {
       driver = "docker"
 
       config {
-        image = "ghcr.io/void-linux/repo-exporter:v0.0.4"
+        image = "ghcr.io/void-linux/repo-exporter:v0.0.5"
       }
     }
   }