diff options
| author |   mei mei <meimei@huawei.com> | 2018-03-06 01:00:03 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-03-06 01:00:03 +0000 |
| commit | b0b7be23fa6c60b12c01ba575f2dcaec974d775d (patch) | |
| tree | 70371c39196d991f8ee205c3c92c74f84caee44a /jjb/container4nfv/arm64 | |
| parent | 7b7a588c885f8abdae5ce35217cdbdebcd6bfcf4 (diff) | |
| parent | 62a8cd4c8d89ca25a0e2f95e9af16b9e0e049399 (diff) | |
Merge "container4nfv: run scenarios on arm baremetal"
Diffstat (limited to 'jjb/container4nfv/arm64')
| -rwxr-xr-x | jjb/container4nfv/arm64/compass-deploy.sh | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/jjb/container4nfv/arm64/compass-deploy.sh b/jjb/container4nfv/arm64/compass-deploy.sh index bbbf3f449..a22af09ba 100755 --- a/jjb/container4nfv/arm64/compass-deploy.sh +++ b/jjb/container4nfv/arm64/compass-deploy.sh @@ -5,9 +5,14 @@ cd compass4nfv export ADAPTER_OS_PATTERN='(?i)CentOS-7.*arm.*' export OS_VERSION="centos7" -export KUBERNETES_VERSION="v1.7.3" -export DHA="deploy/conf/vm_environment/k8-nosdn-nofeature-noha.yml" -export NETWORK="deploy/conf/vm_environment/network.yml" -export VIRT_NUMBER=2 VIRT_CPUS=4 VIRT_MEM=8192 VIRT_DISK=50G +export KUBERNETES_VERSION="v1.7.5" +if [[ "$NODE_NAME" =~ "-virtual" ]]; then + export DHA="deploy/conf/vm_environment/k8-nosdn-nofeature-noha.yml" + export NETWORK="deploy/conf/vm_environment/network.yml" + export VIRT_NUMBER=2 VIRT_CPUS=4 VIRT_MEM=8192 VIRT_DISK=50G +else + export DHA="deploy/conf/hardware_environment/huawei-pod8/k8-nosdn-nofeature-noha.yml" + export NETWORK="deploy/conf/hardware_environment/huawei-pod8/network.yml" +fi ./deploy.sh |