Skip to content

Commit b12c752

Browse files
psathyanopenshift-merge-bot[bot]
authored andcommitted
[reproducer] Align changes to devscripts refactored code
This commit aligns the reproducer to devscripts modified approach. Signed-off-by: Pragadeeswaran Sathyanarayanan <[email protected]>
1 parent 2e54587 commit b12c752

File tree

3 files changed

+2
-23
lines changed

3 files changed

+2
-23
lines changed
Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,6 @@
11
---
2-
- name: Get EPEL and install needed packages for dev-scripts
3-
tags:
4-
- packages
5-
vars:
6-
cifmw_ci_setup_epel_pkgs:
7-
- python3-bcrypt
8-
- python3-passlib
9-
ansible.builtin.import_role:
10-
name: ci_setup
11-
tasks_from: epel.yml
12-
132
- name: Run devscripts role
14-
tags:
15-
- devscripts_layout
163
vars:
17-
cifmw_devscripts_use_layers: true
4+
cifmw_use_reproducer: true
185
ansible.builtin.import_role:
196
name: devscripts

roles/reproducer/tasks/devscripts_post.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,4 @@
11
---
2-
- name: Run post tasks from devscripts role
3-
tags:
4-
- devscripts_layout
5-
ansible.builtin.import_role:
6-
name: devscripts
7-
tasks_from: 05_post.yml
8-
92
- name: Get needed artifacts generated by dev-scripts
103
block:
114
- name: Slurp devscripts private key

scenarios/reproducers/validated-architecture-1.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,14 +90,13 @@ cifmw_libvirt_manager_configuration:
9090

9191
## devscript support for OCP deploy
9292
cifmw_use_devscripts: true
93-
cifmw_devscripts_ocp_version: '4.13.13'
9493
cifmw_devscripts_config_overrides:
9594
worker_memory: 16384
9695
worker_disk: 100
9796
worker_vcpu: 10
9897
num_extra_workers: 0
9998
# Required for egress traffic from pods to the osp_trunk network
100-
cifmw_devscripts_host_routing: true
99+
cifmw_devscripts_enable_ocp_nodes_host_routing: true
101100

102101
# Note: with that extra_network_names "osp_trunk", we instruct
103102
# devscripts role to create a new network, and associate it to

0 commit comments

Comments
 (0)