diff options
Diffstat (limited to 'ci/deploy_ci.sh')
-rwxr-xr-x | ci/deploy_ci.sh | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/ci/deploy_ci.sh b/ci/deploy_ci.sh index bd5adcc7..028a8c9d 100755 --- a/ci/deploy_ci.sh +++ b/ci/deploy_ci.sh @@ -18,12 +18,13 @@ case $DEPLOY_SCENARIO in echo "os-onos-sfc-ha scenario supports mitaka only" exit 1 ;; - k8-nosdn-nofeature-ha) - export COMPASS_OS_VERSION=centos7 - export KUBERNETES_VERSION="v1.7.3" - ;; esac +if [[ "$DEPLOY_SCENARIO" =~ "k8-" ]]; then + export KUBERNETES_VERSION="v1.7.3" +fi + + if [[ "$NODE_NAME" =~ "intel-pod17" ]]; then export USER_NAMESERVER=8.8.8.8 fi @@ -31,7 +32,7 @@ fi if [[ $ROOT_BUILD_CAUSE == MANUALTRIGGER ]]; then # For manual ci trigger build, directly use the value pass from CI export COMPASS_OS_VERSION=${COMPASS_OS_VERSION:-xenial} - export COMPASS_OPENSTACK_VERSION=${COMPASS_OPENSTACK_VERSION:-pike} + export COMPASS_OPENSTACK_VERSION=${COMPASS_OPENSTACK_VERSION:-queens} else # For daily build or verify build, adjust COMPASS_OS_VERSION and OPENSTACK_VERSION @@ -39,10 +40,10 @@ else if [[ $COMPASS_OS_VERSION == centos7 ]]; then export COMPASS_OS_VERSION=${COMPASS_OS_VERSION:-centos7} - export COMPASS_OPENSTACK_VERSION=${COMPASS_OPENSTACK_VERSION:-pike} + export COMPASS_OPENSTACK_VERSION=${COMPASS_OPENSTACK_VERSION:-queens} else export COMPASS_OS_VERSION=${COMPASS_OS_VERSION:-xenial} - export COMPASS_OPENSTACK_VERSION=${COMPASS_OPENSTACK_VERSION:-pike} + export COMPASS_OPENSTACK_VERSION=${COMPASS_OPENSTACK_VERSION:-queens} fi fi |