openstack/tripleo-quickstart-extras
Code Issues Proposed changes

Fix reproducer script path references for all environments

Browse Source 
The reproducer script was initially tested on RDO Cloud.
Upstream jobs produce variables with slightly different path
references. This review fixes those path variables for use
on all environments.

Change-Id: I7ab9b2a9bbb9971ec4814a045023be67fadbcac2
This commit is contained in:
Ronelle Landy 2017-12-20 10:30:27 -05:00
parent fd4cf7837c
commit fcad1cc0e0
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
roles/create-reproducer-script/tasks/main.yml
View File

@ -2,7 +2,7 @@
- name: Set fact for environment variables
set_fact:
zuul_changes: "{{ lookup('env', 'ZUUL_CHANGES') }}"
nodes_config: "{{ lookup('env', 'NODES_FILE') }}"
nodes_config: "{{ lookup('env', 'NODES_FILE') | regex_replace('^.*/tripleo-quickstart','') }}"
toci_jobtype: "{{ lookup('env', 'TOCI_JOBTYPE') }}"
- name: Set fact for stable branch

4
roles/create-reproducer-script/templates/reproducer-quickstart.sh.j2
View File

@ -135,7 +135,7 @@ export ANSIBLE_ROLES_PATH=$ANSIBLE_ROLES_PATH:$WORKSPACE/tripleo-quickstart/role
export NODES_FILE="{{ nodes_config }}"
{% if 'ovb' in toci_jobtype %}
ansible-playbook tripleo-quickstart-extras/playbooks/ovb-create-stack.yml \
ansible-playbook $WORKSPACE/tripleo-quickstart-extras/playbooks/ovb-create-stack.yml \
-e local_working_dir=$WORKSPACE \
-e virthost=localhost \
-e @$WORKSPACE/tripleo-quickstart-extras/config/environments/rdocloud.yml \
@ -161,7 +161,7 @@ else
SUBNODE_COUNT=$(( $( awk '/node_count: / {print $2}' $WORKSPACE/tripleo-quickstart/$NODES_FILE ) +1 ))
fi
ansible-playbook tripleo-quickstart-extras/playbooks/provision_multinodes.yml \
ansible-playbook $WORKSPACE/tripleo-quickstart-extras/playbooks/provision_multinodes.yml \
-e local_working_dir=$WORKSPACE \
-e subnode_count=$SUBNODE_COUNT \
-e prefix=$NODESTACK_PREFIX