diff options
| author |   Tim Rozet <trozet@redhat.com> | 2018-07-23 12:24:58 -0400 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2018-07-23 12:24:58 -0400 |
| commit | b23787845e719f39d4a48f0581be2019764f73ed (patch) | |
| tree | 2f8dd0c57cef329eea3a3487ddc0b7bcc95a20d8 /jjb/cperf/cperf-robot-netvirt-csit.sh | |
| parent | 66baed3706f01f673f6a6cb9ce0a2d3dba8ab492 (diff) | |
Apex: fix overcloudrc unsetting OS_VERSION
Sourcing overcloudrc is unsetting OS_VERSION causing failures in csit
job:
https://build.opnfv.org/ci/job/cperf-apex-csit-master/1/console
Change-Id: Ife3b4795832ecdad75bcb41f0721ef8391aafcac
Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'jjb/cperf/cperf-robot-netvirt-csit.sh')
| -rwxr-xr-x | jjb/cperf/cperf-robot-netvirt-csit.sh | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/jjb/cperf/cperf-robot-netvirt-csit.sh b/jjb/cperf/cperf-robot-netvirt-csit.sh index 3ef747109..a6b7b637f 100755 --- a/jjb/cperf/cperf-robot-netvirt-csit.sh +++ b/jjb/cperf/cperf-robot-netvirt-csit.sh @@ -4,10 +4,6 @@ set -o errexit set -o nounset set -o pipefail -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) - if [ "$OS_VERSION" == 'master' ]; then FULL_OS_VER='master' else @@ -20,6 +16,11 @@ else ODL_STREAM=${ODL_BRANCH} fi +# 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) |