From: Eric Ball Date: Thu, 13 Jun 2019 14:45:06 +0000 (+0000) Subject: Merge "Deploy SEBA on compass task" X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ci-management.git;a=commitdiff_plain;h=c591b7d8721361306a351c77d5fb96885efb178a;hp=3737ed9841f8f8b44fec3f7dfc477984e85ff772 Merge "Deploy SEBA on compass task" --- diff --git a/jjb/iec/iec-compass-deploy.sh b/jjb/iec/iec-compass-deploy.sh index f5cc64d..17b74cb 100755 --- a/jjb/iec/iec-compass-deploy.sh +++ b/jjb/iec/iec-compass-deploy.sh @@ -12,13 +12,9 @@ export ADAPTER_OS_PATTERN='(?i)ubuntu-16.04.*arm.*' export OS_VERSION="xenial" export KUBERNETES_VERSION="v1.13.0" -NODE_NAME="${NODE_NAME:-arm-virtual-host}" - -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=3 VIRT_CPUS=2 VIRT_MEM=8192 VIRT_DISK=50G -fi +export DHA="deploy/conf/vm_environment/k8-nosdn-nofeature-noha.yml" +export NETWORK="deploy/conf/vm_environment/network.yml" +export VIRT_NUMBER=3 VIRT_CPUS=2 VIRT_MEM=8192 VIRT_DISK=50G ./deploy.sh