From 3d4679f0d3a891012ab5ecaf24ed8c261d499001 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Thu, 17 Feb 2022 14:24:25 +0100 Subject: [PATCH] nimbus.prater: add nim_compiler overrides MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For some reason `nim-1.6` branch doesn't actually use Nim 1.6 compiler. Signed-off-by: Jakub SokoĊ‚owski --- ansible/group_vars/nimbus.prater.yml | 5 +++-- ansible/requirements.yml | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ansible/group_vars/nimbus.prater.yml b/ansible/group_vars/nimbus.prater.yml index deab26c..de79ede 100644 --- a/ansible/group_vars/nimbus.prater.yml +++ b/ansible/group_vars/nimbus.prater.yml @@ -6,6 +6,7 @@ beacon_node_repo_branch: >- node.branch_override, ((node.branch == "libp2p") | ternary("nim-libp2p-auto-bump-unstable", node.branch)) ) }} +beacon_node_nim_commit: '{{ node.get("nim_commit", "") }}' # TODO Drop this once all nodes have an number. service_number: '{{ node.get("num", False) | ternary(("-%02d"|format(node.get("num", 0))), "") }}' beacon_node_service_name: 'beacon-node-{{ beacon_node_network }}-{{ node.branch }}{{ service_number }}' @@ -90,13 +91,13 @@ nodes_layout: 'metal-06.he-eu-hel1.nimbus.prater': - { branch: 'stable', build_freq: '*-*-* 11:00:00' } - - { branch: 'testing', build_freq: '*-*-* 15:00:00', branch_override: 'nim-1.6' } + - { branch: 'testing', build_freq: '*-*-* 15:00:00', branch_override: 'nim-1.6', nim_commit: 'version-1-6' } - { branch: 'unstable', build_freq: '*-*-* 13:00:00' } - { branch: 'libp2p', build_freq: '*-*-* 17:00:00' } 'metal-07.he-eu-hel1.nimbus.prater': - { branch: 'stable', build_freq: '*-*-* 11:00:00' } - - { branch: 'testing', build_freq: '*-*-* 15:00:00', branch_override: 'nim-1.6' } + - { branch: 'testing', build_freq: '*-*-* 15:00:00', branch_override: 'nim-1.6', nim_commit: 'version-1-6' } - { branch: 'unstable', build_freq: '*-*-* 13:00:00' } - { branch: 'libp2p', build_freq: '*-*-* 17:00:00' } diff --git a/ansible/requirements.yml b/ansible/requirements.yml index 1de8b6c..275dbaf 100644 --- a/ansible/requirements.yml +++ b/ansible/requirements.yml @@ -46,7 +46,7 @@ - name: infra-role-beacon-node-linux src: git@github.com:status-im/infra-role-beacon-node-linux.git - version: 871b4d5c20597b7c16c6c952699390d8469ea51c + version: feeecc5c471944819d52a5614346e11dd8e1e223 scm: git - name: infra-role-beacon-node-windows