From e2a119a673b1e9070b0ab78413abac4fc0b2ea7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Tue, 6 Feb 2024 19:56:05 +0100 Subject: [PATCH] nimbus.holesky: reuse prater macos host MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently without any execution clients as we don't have any roles to run Geth or other clients on a MacOS host. Signed-off-by: Jakub SokoĊ‚owski --- ansible/bootstrap.yml | 2 +- ansible/group_vars/nimbus.holesky.yml | 1 + ansible/holesky.yml | 9 +++++++++ ansible/inventory/test | 12 ++++++------ ansible/vars/layout/holesky.yml | 6 ++++++ ansible/vars/layout/prater.yml | 21 ++++++++------------- holesky.tf | 17 ++++++++++++++++- outputs.tf | 2 +- prater.tf | 16 ---------------- 9 files changed, 48 insertions(+), 38 deletions(-) diff --git a/ansible/bootstrap.yml b/ansible/bootstrap.yml index ff97228..ff4e30b 100644 --- a/ansible/bootstrap.yml +++ b/ansible/bootstrap.yml @@ -40,7 +40,7 @@ - name: Bootstrap MacOS hosts become: true hosts: - - nimbus-prater-macos + - nimbus-holesky-macm2 roles: - role: infra-role-bootstrap-macos when: ansible_system == 'Darwin' diff --git a/ansible/group_vars/nimbus.holesky.yml b/ansible/group_vars/nimbus.holesky.yml index cb32720..7b6fb74 100644 --- a/ansible/group_vars/nimbus.holesky.yml +++ b/ansible/group_vars/nimbus.holesky.yml @@ -82,6 +82,7 @@ node_name_to_branch_map: chronos: 'nim-chronos-auto-bump-unstable' # Builds beacon_node_build_frequency: 'daily' +beacon_node_build_start_time: '{{ node.get("build_start", omit) }}' beacon_node_build_nim_flags: '-d:noSignalHandler {{ node.get("nim_flags", "") }}' # Monitoring beacon_node_validator_monitor_auto: true diff --git a/ansible/holesky.yml b/ansible/holesky.yml index 08c6138..9663731 100644 --- a/ansible/holesky.yml +++ b/ansible/holesky.yml @@ -9,6 +9,15 @@ - local_action: command ./versioncheck.py changed_when: false +- name: Deploy Holesky MacOS Beacon Nodes + become: true + serial: '{{ serial|default(1) }}' + hosts: nimbus-holesky-macm2 + vars_files: layout/holesky.yml + tasks: + - include_role: name=infra-role-beacon-node-macos + with_items: '{{ nodes_layout[hostname] }}' + loop_control: { loop_var: node, index_var: idx } - name: Deploy Holesky Beacon Nodes become: true diff --git a/ansible/inventory/test b/ansible/inventory/test index ee34d37..141606c 100644 --- a/ansible/inventory/test +++ b/ansible/inventory/test @@ -38,7 +38,7 @@ linux-05.ih-eu-mda1.nimbus.prater hostname=linux-05.ih-eu-mda1.nimbus.prater ans linux-06.ih-eu-mda1.nimbus.mainnet hostname=linux-06.ih-eu-mda1.nimbus.mainnet ansible_host=194.33.40.101 env=nimbus stage=mainnet data_center=ih-eu-mda1 region=eu-mda1 dns_entry=linux-06.ih-eu-mda1.nimbus.mainnet.statusim.net linux-06.ih-eu-mda1.nimbus.prater hostname=linux-06.ih-eu-mda1.nimbus.prater ansible_host=194.33.40.233 env=nimbus stage=prater data_center=ih-eu-mda1 region=eu-mda1 dns_entry=linux-06.ih-eu-mda1.nimbus.prater.statusim.net linux-07.ih-eu-mda1.nimbus.mainnet hostname=linux-07.ih-eu-mda1.nimbus.mainnet ansible_host=185.181.229.82 env=nimbus stage=mainnet data_center=ih-eu-mda1 region=eu-mda1 dns_entry=linux-07.ih-eu-mda1.nimbus.mainnet.statusim.net -macm1-01.ih-eu-mda1.nimbus.prater hostname=macm1-01.ih-eu-mda1.nimbus.prater ansible_host=185.181.230.76 env=nimbus stage=prater data_center=ih-eu-mda1 region=eu-mda1 dns_entry=macm1-01.ih-eu-mda1.nimbus.prater.statusim.net +macm2-01.ih-eu-mda1.nimbus.holesky hostname=macm2-01.ih-eu-mda1.nimbus.holesky ansible_host=185.181.230.76 env=nimbus stage=holesky data_center=ih-eu-mda1 region=eu-mda1 dns_entry=macm2-01.ih-eu-mda1.nimbus.holesky.statusim.net mainnet-01.aws-eu-central-1a.nimbus.geth hostname=mainnet-01.aws-eu-central-1a.nimbus.geth ansible_host=18.196.208.138 env=nimbus stage=geth data_center=aws-eu-central-1a region=eu-central-1a dns_entry=mainnet-01.aws-eu-central-1a.nimbus.geth.statusim.net metal-01.ih-eu-mda1.nimbus.eth1 hostname=metal-01.ih-eu-mda1.nimbus.eth1 ansible_host=194.33.40.237 env=nimbus stage=eth1 data_center=ih-eu-mda1 region=eu-mda1 dns_entry=metal-01.ih-eu-mda1.nimbus.eth1.statusim.net metal-01.ih-eu-mda1.nimbus.fluffy hostname=metal-01.ih-eu-mda1.nimbus.fluffy ansible_host=194.33.40.238 env=nimbus stage=fluffy data_center=ih-eu-mda1 region=eu-mda1 dns_entry=metal-01.ih-eu-mda1.nimbus.fluffy.statusim.net @@ -119,7 +119,7 @@ linux-05.ih-eu-mda1.nimbus.prater linux-06.ih-eu-mda1.nimbus.mainnet linux-06.ih-eu-mda1.nimbus.prater linux-07.ih-eu-mda1.nimbus.mainnet -macm1-01.ih-eu-mda1.nimbus.prater +macm2-01.ih-eu-mda1.nimbus.holesky metal-01.ih-eu-mda1.nimbus.eth1 metal-01.ih-eu-mda1.nimbus.fluffy metal-02.ih-eu-mda1.nimbus.fluffy @@ -182,6 +182,9 @@ geth-08.ih-eu-mda1.nimbus.holesky geth-09.ih-eu-mda1.nimbus.holesky geth-10.ih-eu-mda1.nimbus.holesky +[nimbus-holesky-macm2] +macm2-01.ih-eu-mda1.nimbus.holesky + [nimbus-holesky-neth] neth-01.ih-eu-mda1.nimbus.holesky neth-02.ih-eu-mda1.nimbus.holesky @@ -207,9 +210,6 @@ linux-07.ih-eu-mda1.nimbus.mainnet stable-small-01.aws-eu-central-1a.nimbus.mainnet stable-small-02.aws-eu-central-1a.nimbus.mainnet -[nimbus-prater-macos] -macm1-01.ih-eu-mda1.nimbus.prater - [nimbus-prater-metal] linux-01.ih-eu-mda1.nimbus.prater linux-02.ih-eu-mda1.nimbus.prater @@ -267,6 +267,7 @@ geth-07.ih-eu-mda1.nimbus.holesky geth-08.ih-eu-mda1.nimbus.holesky geth-09.ih-eu-mda1.nimbus.holesky geth-10.ih-eu-mda1.nimbus.holesky +macm2-01.ih-eu-mda1.nimbus.holesky neth-01.ih-eu-mda1.nimbus.holesky neth-02.ih-eu-mda1.nimbus.holesky neth-03.ih-eu-mda1.nimbus.holesky @@ -296,7 +297,6 @@ linux-03.ih-eu-mda1.nimbus.prater linux-04.ih-eu-mda1.nimbus.prater linux-05.ih-eu-mda1.nimbus.prater linux-06.ih-eu-mda1.nimbus.prater -macm1-01.ih-eu-mda1.nimbus.prater stable-large-01.aws-eu-central-1a.nimbus.prater testing-large-01.aws-eu-central-1a.nimbus.prater unstable-large-01.aws-eu-central-1a.nimbus.prater diff --git a/ansible/vars/layout/holesky.yml b/ansible/vars/layout/holesky.yml index 32b9c95..05a73e8 100644 --- a/ansible/vars/layout/holesky.yml +++ b/ansible/vars/layout/holesky.yml @@ -183,3 +183,9 @@ nodes_layout: - { branch: 'testing', start: 84000, end: 89000, el: 'nethermind', vc: false } - { branch: 'unstable', start: 89000, end: 94000, el: 'nethermind', vc: true } - { branch: 'libp2p', start: 94000, end: 100000, el: 'nethermind', vc: false } + + # MacOS -------------------------------------------------------------------------- + 'macm2-01.ih-eu-mda1.nimbus.holesky': # 0 each (FIXME: No exec client.) + - { branch: 'stable', build_start: '13:00:00' } + - { branch: 'testing', build_start: '15:00:00' } + - { branch: 'unstable', build_start: '17:00:00' } diff --git a/ansible/vars/layout/prater.yml b/ansible/vars/layout/prater.yml index 1d0a312..ccbbbb4 100644 --- a/ansible/vars/layout/prater.yml +++ b/ansible/vars/layout/prater.yml @@ -12,11 +12,6 @@ nodes_layout: 'unstable-large-01.aws-eu-central-1a.nimbus.prater': # 2000 each - { branch: 'unstable', start: 4000, end: 6000, history: 'archive', payload_builder: true } - 'macm1-01.ih-eu-mda1.nimbus.prater': # 3000 each - - { branch: 'stable', start: 6000, end: 9000, build_start: '13:00:00' } - - { branch: 'testing', start: 9000, end: 12000, build_start: '15:00:00' } - - { branch: 'unstable', start: 12000, end: 14000, build_start: '17:00:00' } - 'windows-01.ih-eu-mda1.nimbus.prater': - { branch: 'stable', build_start: '13:00:00' } - { branch: 'testing', build_start: '15:00:00' } @@ -24,16 +19,16 @@ nodes_layout: # Innova Hosting 'linux-01.ih-eu-mda1.nimbus.prater': # 0 each - - { branch: 'stable', start: 14000, end: 16000, build_freq: '*-*-* 13:00:00' } - - { branch: 'testing', start: 16000, end: 18000, build_freq: '*-*-* 15:00:00' } - - { branch: 'unstable', start: 18000, end: 20000, build_freq: '*-*-* 17:00:00', public_api: true } - - { branch: 'libp2p', build_freq: '*-*-* 19:00:00' } + - { branch: 'stable', start: 6000, end: 8000, build_freq: '*-*-* 13:00:00' } + - { branch: 'testing', start: 8000, end: 10000, build_freq: '*-*-* 15:00:00' } + - { branch: 'unstable', start: 10000, end: 12000, build_freq: '*-*-* 17:00:00', public_api: true } + - { branch: 'libp2p', start: 12000, end: 14000, build_freq: '*-*-* 19:00:00' } 'linux-02.ih-eu-mda1.nimbus.prater': # 1 each - - { branch: 'stable', start: 20000, end: 20001, build_freq: '*-*-* 13:00:00' } - - { branch: 'testing', start: 20001, end: 20002, build_freq: '*-*-* 15:00:00', public_api: true } - - { branch: 'unstable', start: 20002, end: 20003, build_freq: '*-*-* 17:00:00', nethermind: true } - - { branch: 'libp2p', start: 20003, end: 20004, build_freq: '*-*-* 19:00:00' } + - { branch: 'stable', start: 14000, end: 16000, build_freq: '*-*-* 13:00:00' } + - { branch: 'testing', start: 16000, end: 18000, build_freq: '*-*-* 15:00:00', public_api: true } + - { branch: 'unstable', start: 18000, end: 20000, build_freq: '*-*-* 17:00:00', nethermind: true } + - { branch: 'libp2p', start: 20000, end: 20004, build_freq: '*-*-* 19:00:00' } 'linux-03.ih-eu-mda1.nimbus.prater': # 10 each - { branch: 'stable', start: 20004, end: 20014, build_freq: '*-*-* 11:00:00' } diff --git a/holesky.tf b/holesky.tf index 2104b0f..1188830 100644 --- a/holesky.tf +++ b/holesky.tf @@ -73,6 +73,22 @@ module "nimbus_nodes_holesky_innova_neth" { ] } +module "nimbus_nodes_holesky_innova_macm2" { + source = "github.com/status-im/infra-tf-dummy-module" + + name = "macm2" + env = "nimbus" + stage = "holesky" + group = "nimbus-holesky-macm2" + region = "eu-mda1" + prefix = "ih" + domain = var.domain + + ips = [ + "185.181.230.76" # macm2-01.ih-eu-mda1.nimbus.holesky + ] +} + /* Community test REST API endpoints. */ resource "cloudflare_record" "unstable_holesky_beacon_api" { zone_id = local.zones["nimbus.team"] @@ -89,4 +105,3 @@ resource "cloudflare_record" "testing_holesky_beacon_api" { type = "A" proxied = false } - diff --git a/outputs.tf b/outputs.tf index ea97682..1b01fd4 100644 --- a/outputs.tf +++ b/outputs.tf @@ -13,10 +13,10 @@ output "hosts" { module.nimbus_nodes_prater_unstable_large.hosts, module.nimbus_nodes_prater_innova.hosts, module.nimbus_nodes_prater_windows_innova.hosts, - module.nimbus_nodes_prater_macm1_innova.hosts, module.nimbus_nodes_sepolia_innova.hosts, module.nimbus_nodes_holesky_innova_geth.hosts, module.nimbus_nodes_holesky_innova_erigon.hosts, module.nimbus_nodes_holesky_innova_neth.hosts, + module.nimbus_nodes_holesky_innova_macm2.hosts, ) } diff --git a/prater.tf b/prater.tf index ba4f6e5..ef3b7fd 100644 --- a/prater.tf +++ b/prater.tf @@ -155,19 +155,3 @@ resource "cloudflare_record" "era_prater" { type = "A" proxied = true } - -module "nimbus_nodes_prater_macm1_innova" { - source = "github.com/status-im/infra-tf-dummy-module" - - name = "macm1" - env = "nimbus" - stage = "prater" - group = "nimbus-prater-macos" - region = "eu-mda1" - prefix = "ih" - domain = var.domain - - ips = [ - "185.181.230.76" # macm1-01.ih-eu-mda1.nimbus.prater - ] -}