From 1f39b846ade8da42b29379f2b6fd5d0c95c19c15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= <jakub@status.im>
Date: Fri, 20 Nov 2020 15:26:19 +0100
Subject: [PATCH] move builds to existing master pyrmont hosts
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jakub Sokołowski <jakub@status.im>
---
 ...ge-01.aws-eu-central-1a.nimbus.pyrmont.yml | 15 ++++++++++++
 ...ll-01.aws-eu-central-1a.nimbus.pyrmont.yml | 23 ++++++++++++++++++
 ansible/roles/beacon-node-builds/README.md    |  2 +-
 .../beacon-node-builds/defaults/main.yml      | 24 +++++--------------
 4 files changed, 45 insertions(+), 19 deletions(-)
 create mode 100644 ansible/group_vars/master-large-01.aws-eu-central-1a.nimbus.pyrmont.yml
 create mode 100644 ansible/group_vars/master-small-01.aws-eu-central-1a.nimbus.pyrmont.yml

diff --git a/ansible/group_vars/master-large-01.aws-eu-central-1a.nimbus.pyrmont.yml b/ansible/group_vars/master-large-01.aws-eu-central-1a.nimbus.pyrmont.yml
new file mode 100644
index 0000000..60f7238
--- /dev/null
+++ b/ansible/group_vars/master-large-01.aws-eu-central-1a.nimbus.pyrmont.yml
@@ -0,0 +1,15 @@
+---
+# Docker image builds
+beacon_node_builds_docker_hub_user: '{{lookup("passwordstore", "cloud/DockerHub/user")}}'
+beacon_node_builds_docker_hub_token: '{{lookup("passwordstore", "cloud/DockerHub/token")}}'
+
+# The -z1d suffix is because of native compilation.
+beacon_node_builds_branches: []
+  - name: 'devel-z1d'
+    branch: 'devel'
+    targets: ['nimbus_beacon_node', 'nimbus_signing_process']
+    frequency: '*-*-* 10:00:00'
+  - name: 'master-z1d'
+    branch: 'master'
+    targets: ['nimbus_beacon_node', 'nimbus_signing_process']
+    frequency: '*-*-* 02:00:00'
diff --git a/ansible/group_vars/master-small-01.aws-eu-central-1a.nimbus.pyrmont.yml b/ansible/group_vars/master-small-01.aws-eu-central-1a.nimbus.pyrmont.yml
new file mode 100644
index 0000000..6212178
--- /dev/null
+++ b/ansible/group_vars/master-small-01.aws-eu-central-1a.nimbus.pyrmont.yml
@@ -0,0 +1,23 @@
+---
+# Docker image builds
+beacon_node_builds_docker_hub_user: '{{lookup("passwordstore", "cloud/DockerHub/user")}}'
+beacon_node_builds_docker_hub_token: '{{lookup("passwordstore", "cloud/DockerHub/token")}}'
+
+# The -t3a suffix is because of native compilation
+beacon_node_builds_branches: []
+  - name: 'devel-t3a'
+    branch: 'devel'
+    targets: ['nimbus_beacon_node', 'nimbus_signing_process']
+    frequency: '*-*-* 10:00:00'
+  - name: 'master-t3a'
+    branch: 'master'
+    targets: ['nimbus_beacon_node', 'nimbus_signing_process']
+    frequency: '*-*-* 02:00:00'
+  - name: 'libp2p-t3a'
+    branch: 'nim-libp2p-auto-bump'
+    targets: ['nimbus_beacon_node', 'nimbus_signing_process']
+    frequency: '*-*-* 18:00:00'
+  - name: 'toledo-t3a'
+    branch: 'devel'
+    targets: ['nimbus_beacon_node', 'nimbus_signing_process']
+    frequency: '*-*-* 20:00:00'
diff --git a/ansible/roles/beacon-node-builds/README.md b/ansible/roles/beacon-node-builds/README.md
index 78cfa48..6e44c6f 100644
--- a/ansible/roles/beacon-node-builds/README.md
+++ b/ansible/roles/beacon-node-builds/README.md
@@ -10,7 +10,7 @@ The minimal configuration would look something like:
 beacon_node_builds_branches:
   - name: 'xyz'
     branch: 'feature/xyz'
-    targets: ['nimbus_beacon_node_spec_0_12_3', 'nimbus_signing_process']
+    targets: ['nimbus_beacon_node', 'nimbus_signing_process']
     frequency: '*-*-* 02:00:00'
 
 # Required to push Docker images
diff --git a/ansible/roles/beacon-node-builds/defaults/main.yml b/ansible/roles/beacon-node-builds/defaults/main.yml
index a33d674..23d4251 100644
--- a/ansible/roles/beacon-node-builds/defaults/main.yml
+++ b/ansible/roles/beacon-node-builds/defaults/main.yml
@@ -1,6 +1,6 @@
 ---
 beacon_node_builds_user: 'nimbus'
-beacon_node_builds_path: '/opt/beacon-node-builds'
+beacon_node_builds_path: '/data/beacon-node-builds'
 beacon_node_builds_image_name: 'statusteam/nimbus_beacon_node'
 
 # Required for pushing the images
@@ -10,20 +10,8 @@ beacon_node_builds_docker_hub_token: ~
 # Timers
 beacon_node_build_timer_timeout: 3600
 
-beacon_node_builds_branches:
-  - name: 'devel'
-    branch: 'devel'
-    targets: ['nimbus_beacon_node', 'nimbus_signing_process']
-    frequency: '*-*-* 10:00:00'
-  - name: 'master'
-    branch: 'master'
-    targets: ['nimbus_beacon_node', 'nimbus_signing_process']
-    frequency: '*-*-* 02:00:00'
-  - name: 'libp2p'
-    branch: 'nim-libp2p-auto-bump'
-    targets: ['nimbus_beacon_node', 'nimbus_signing_process']
-    frequency: '*-*-* 18:00:00'
-  - name: 'toledo'
-    branch: 'devel'
-    targets: ['nimbus_beacon_node', 'nimbus_signing_process']
-    frequency: '*-*-* 20:00:00'
+beacon_node_builds_branches: []
+#  - name: 'devel'
+#    branch: 'devel'
+#    targets: ['nimbus_beacon_node', 'nimbus_signing_process']
+#    frequency: '*-*-* 10:00:00'