From 7e6d5809572f1e14e7f19cf61d7f53ab45a0341e Mon Sep 17 00:00:00 2001 From: Pablo Rodriguez Nava Date: Thu, 1 Aug 2024 12:12:10 +0200 Subject: [PATCH] Ensure ocp is reachable from ocpbm before deploying Since we now run the shifstack deployment using the reproducer by toggling `cifmw_deploy_architecture` we must ensure the iptables change we do is done before reaching the deployment step. --- reproducer.yml | 10 ++++++++++ roles/reproducer/tasks/configure_architecture.yml | 9 --------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/reproducer.yml b/reproducer.yml index 2ca9310f32..eeaac4e9db 100644 --- a/reproducer.yml +++ b/reproducer.yml @@ -68,3 +68,13 @@ when: cifmw_allow_vms_to_reach_osp_api | default ('false') | bool ansible.builtin.command: # noqa: command-instead-of-module cmd: iptables -I LIBVIRT_FWI 1 -o ocpbm -j ACCEPT + + - name: Run deployment if instructed to + when: + - cifmw_deploy_architecture | default(false) | bool + no_log: "{{ cifmw_nolog | default(true) | bool }}" + async: "{{ 7200 + cifmw_test_operator_timeout | default(3600) }}" # 2h should be enough to deploy EDPM and rest for tests. + poll: 20 + delegate_to: controller-0 + ansible.builtin.command: + cmd: "/home/zuul/deploy-architecture.sh" diff --git a/roles/reproducer/tasks/configure_architecture.yml b/roles/reproducer/tasks/configure_architecture.yml index af9d7c0f3f..29e1c5d377 100644 --- a/roles/reproducer/tasks/configure_architecture.yml +++ b/roles/reproducer/tasks/configure_architecture.yml @@ -25,12 +25,3 @@ ansible.builtin.include_tasks: rotate_log.yml loop: - ansible-deploy-architecture.log - - - name: Run deployment if instructed to - when: - - cifmw_deploy_architecture | default(false) | bool - no_log: "{{ cifmw_nolog | default(true) | bool }}" - async: "{{ 7200 + cifmw_test_operator_timeout|default(3600) }}" # 2h should be enough to deploy EDPM and rest for tests. - poll: 20 - ansible.builtin.command: - cmd: "/home/zuul/deploy-architecture.sh"