diff options
| author |   Jan Gelety <jgelety@cisco.com> | 2017-02-27 15:05:42 +0100 |
|---|---|---|
| committer |   Peter Mikus <pmikus@cisco.com> | 2017-03-01 12:42:58 +0000 |
| commit | 62f5f53bd82933eb03a037dbcb7820be269dc4e2 (patch) | |
| tree | 8c8ff590022f35d94339fb2c094b1f13f3cf4bd6 /bootstrap-centos.sh | |
| parent | 933f6fd1af59ffede0f1e51ca67b6913fb9a27e8 (diff) | |
Use common files to store distro related data for VIRL
- use separate files to store VIRL topology file and VIRL image file
version information per distro
- read content of appropriate files in all affected bootstrap files
Change-Id: I5297ddd610af6a719efaf5792ced12efab35fc7a
Signed-off-by: Jan Gelety <jgelety@cisco.com>
Diffstat (limited to 'bootstrap-centos.sh')
| -rwxr-xr-x | bootstrap-centos.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bootstrap-centos.sh b/bootstrap-centos.sh index 2f3ac19ddd..85e3dd42a6 100755 --- a/bootstrap-centos.sh +++ b/bootstrap-centos.sh @@ -26,16 +26,16 @@ VIRL_PKEY=priv_key VIRL_SERVER_STATUS_FILE="status" VIRL_SERVER_EXPECTED_STATUS="PRODUCTION" -VIRL_TOPOLOGY=double-ring-nested.centos7 -VIRL_RELEASE=csit-centos-7.3-1611_2017-02-23_1.4 +SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" + +VIRL_TOPOLOGY=$(cat ${SCRIPT_DIR}/VIRL_TOPOLOGY_CENTOS) +VIRL_RELEASE=$(cat ${SCRIPT_DIR}/VIRL_RELEASE_CENTOS) SSH_OPTIONS="-i ${VIRL_PKEY} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o BatchMode=yes -o LogLevel=error" TEST_GROUPS=("l2bd,dhcp,gre,honeycomb,l2xc,lisp,softwire" "cop,telemetry,ipsec,ipv6,rpf,tap,vrf" "fds,iacl,ipv4,policer,vlan,vxlan") SUITE_PATH="tests.func" -SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" - # Create tmp dir mkdir ${SCRIPT_DIR}/tmp |