From 01c6a0611712578f2b7b0c419421c36261ab603b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Thu, 17 Feb 2022 13:46:56 +0100 Subject: [PATCH] nimbus.prater: override some branches to nim-1.6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jakub SokoĊ‚owski --- ansible/group_vars/nimbus.prater.yml | 16 ++++++++++------ ansible/requirements.yml | 2 +- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ansible/group_vars/nimbus.prater.yml b/ansible/group_vars/nimbus.prater.yml index 1f8b90f..deab26c 100644 --- a/ansible/group_vars/nimbus.prater.yml +++ b/ansible/group_vars/nimbus.prater.yml @@ -1,7 +1,11 @@ --- beacon_node_network: 'prater' # TODO This is to avoid too long service names. -beacon_node_repo_branch: '{{ (node.branch == "libp2p") | ternary("nim-libp2p-auto-bump-unstable", node.branch) }}' +beacon_node_repo_branch: >- + {{ node.branch_override is defined | ternary( + node.branch_override, + ((node.branch == "libp2p") | ternary("nim-libp2p-auto-bump-unstable", node.branch)) + ) }} # 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 }}' @@ -68,32 +72,32 @@ nodes_layout: 'metal-03.he-eu-hel1.nimbus.prater': - { branch: 'stable', build_freq: '*-*-* 11:00:00' } - - { branch: 'unstable', build_freq: '*-*-* 13:00:00' } - { branch: 'testing', build_freq: '*-*-* 15:00:00' } + - { branch: 'unstable', build_freq: '*-*-* 13:00:00' } - { branch: 'libp2p', build_freq: '*-*-* 17:00:00' } 'metal-04.he-eu-hel1.nimbus.prater': - { branch: 'stable', build_freq: '*-*-* 11:00:00' } - - { branch: 'unstable', build_freq: '*-*-* 13:00:00' } - { branch: 'testing', build_freq: '*-*-* 15:00:00' } + - { branch: 'unstable', build_freq: '*-*-* 13:00:00' } - { branch: 'libp2p', build_freq: '*-*-* 17:00:00' } 'metal-05.he-eu-hel1.nimbus.prater': - { branch: 'stable', build_freq: '*-*-* 11:00:00' } - - { branch: 'unstable', build_freq: '*-*-* 13:00:00' } - { branch: 'testing', build_freq: '*-*-* 15:00:00' } + - { branch: 'unstable', build_freq: '*-*-* 13:00:00' } - { branch: 'libp2p', build_freq: '*-*-* 17:00:00' } '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: 'unstable', build_freq: '*-*-* 13:00:00' } - - { branch: 'testing', build_freq: '*-*-* 15: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: 'unstable', build_freq: '*-*-* 13:00:00' } - - { branch: 'testing', build_freq: '*-*-* 15:00:00' } - { branch: 'libp2p', build_freq: '*-*-* 17:00:00' } 'windows-01.gc-us-central1-a.nimbus.prater': diff --git a/ansible/requirements.yml b/ansible/requirements.yml index df76520..1de8b6c 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: 5f50a97c07493d65a254b85c90f55dedff1728b7 + version: 871b4d5c20597b7c16c6c952699390d8469ea51c scm: git - name: infra-role-beacon-node-windows