diff options
| author |   Tim Rozet <trozet@redhat.com> | 2018-07-23 13:23:02 -0400 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2018-07-23 13:23:02 -0400 |
| commit | f5b385435edf6a90fa79c42acc942ea03e51a752 (patch) | |
| tree | 0c4115264e90d7ef405706c5845f7eeb5cbda18e /jjb/cperf | |
| parent | 01b6e24790816cb0dbe62c3af4551d33bab2dda8 (diff) | |
Apex: Fix invoking snapshot node parser
Change-Id: I12da71b17a0a423b501508b51ab3d614c87f8851
Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'jjb/cperf')
| -rwxr-xr-x | jjb/cperf/cperf-robot-netvirt-csit.sh | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/jjb/cperf/cperf-robot-netvirt-csit.sh b/jjb/cperf/cperf-robot-netvirt-csit.sh index a6b7b637f..e8cdb6218 100755 --- a/jjb/cperf/cperf-robot-netvirt-csit.sh +++ b/jjb/cperf/cperf-robot-netvirt-csit.sh @@ -16,18 +16,21 @@ else ODL_STREAM=${ODL_BRANCH} fi +git clone https://gerrit.opnfv.org/gerrit/releng.git +REL_PATH='releng/jjb/cperf' + # NOTE: sourcing overcloudrc unsets any variable with OS_ prefix source ${WORKSPACE}/overcloudrc # note SDN_CONTROLLER_IP is set in overcloudrc, which is the VIP # for admin/public network (since we are running single network deployment) -NUM_CONTROL_NODES=$(python ./parse-node-yaml.py num_nodes --file $NODE_FILE_PATH) -NUM_COMPUTE_NODES=$(python ./parse-node-yaml.py num_nodes --node-type compute --file $NODE_FILE_PATH) +NUM_CONTROL_NODES=$(python ${REL_PATH}/parse-node-yaml.py num_nodes --file $NODE_FILE_PATH) +NUM_COMPUTE_NODES=$(python ${REL_PATH}/parse-node-yaml.py num_nodes --node-type compute --file $NODE_FILE_PATH) idx=1 EXTRA_ROBOT_ARGS="" for idx in `seq 1 $NUM_CONTROL_NODES`; do - CONTROLLER_IP=$(python ./parse-node-yaml.py get_value -k address --node-number ${idx} --file $NODE_FILE_PATH) + CONTROLLER_IP=$(python ${REL_PATH}/parse-node-yaml.py get_value -k address --node-number ${idx} --file $NODE_FILE_PATH) EXTRA_ROBOT_ARGS+=" -v ODL_SYSTEM_${idx}_IP:${CONTROLLER_IP} \ -v OS_CONTROL_NODE_${idx}_IP:${CONTROLLER_IP} \ -v ODL_SYSTEM_${idx}_IP:${CONTROLLER_IP} \ @@ -36,11 +39,11 @@ done idx=1 for idx in `seq 1 $NUM_COMPUTE_NODES`; do - COMPUTE_IP=$(python ./parse-node-yaml.py get_value -k address --node-type compute --node-number ${idx} --file $NODE_FILE_PATH) + COMPUTE_IP=$(python ${REL_PATH}/parse-node-yaml.py get_value -k address --node-type compute --node-number ${idx} --file $NODE_FILE_PATH) EXTRA_ROBOT_ARGS+=" -v OS_COMPUTE_${idx}_IP:${COMPUTE_IP}" done -CONTROLLER_1_IP=$(python ./parse-node-yaml.py get_value -k address --node-number 1 --file $NODE_FILE_PATH) +CONTROLLER_1_IP=$(python ${REL_PATH}/parse-node-yaml.py get_value -k address --node-number 1 --file $NODE_FILE_PATH) if [ "$ODL_CONTAINERIZED" == 'false' ]; then EXTRA_ROBOT_ARGS+=" -v NODE_KARAF_COUNT_COMMAND:'ps axf | grep org.apache.karaf | grep -v grep | wc -l || echo 0' \ |