diff options
| author |   Prudence Au <prudence.au@amdocs.com> | 2018-11-07 02:00:44 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-11-07 02:00:44 +0000 |
| commit | 7faced1a5038307ba377b86281cb79860b586383 (patch) | |
| tree | 24c8614dacd7b6929b30b64771e7b5f3b40fa603 /deploy/rancher/oom_rancher_setup.sh | |
| parent | 01fcae8c183ecc251b38fa591dfde8cb7a894a37 (diff) | |
| parent | dec32696e584e56017900c3878bea4b9d1edd25b (diff) | |
Merge "align Rancher/k8s with 1.6.22 post RC1"
Diffstat (limited to 'deploy/rancher/oom_rancher_setup.sh')
| -rwxr-xr-x | deploy/rancher/oom_rancher_setup.sh | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/deploy/rancher/oom_rancher_setup.sh b/deploy/rancher/oom_rancher_setup.sh index 776eb62..42b1428 100755 --- a/deploy/rancher/oom_rancher_setup.sh +++ b/deploy/rancher/oom_rancher_setup.sh @@ -1,7 +1,7 @@ #!/bin/bash ############################################################################# # -# Copyright © 2018 Amdocs, Bell. +# Copyright © 2018 Amdocs. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -26,8 +26,10 @@ # Rancher 1.6.10, Kubernetes 1.7.7, Kubectl 1.7.7, Helm 2.3.0, Docker 1.12 # beijing # Rancher 1.6.14, Kubernetes 1.8.10, Kubectl 1.8.10, Helm 2.8.2, Docker 17.03 -# master/casablanca +# master/casablanca (until RC1) # Rancher 1.6.18, Kubernetes 1.10.3, Kubectl 1.10.3, Helm 2.9.2, Docker 17.03 +# master/casablanca (post RC2) - integration change alignment for INT-586 - 29th Oct via LOG-806 +# Rancher 1.6.22, Kubernetes 1.11.2, kubectl 1.11.2, Helm 2.9.2, Docker 17.03 usage() { cat <<EOF @@ -61,12 +63,18 @@ install_onap() { HELM_VERSION=2.8.2 DOCKER_VERSION=17.03 AGENT_VERSION=1.2.9 + elif [ "$BRANCH" == "casablanca" ]; then + RANCHER_VERSION=1.6.22 + KUBECTL_VERSION=1.11.2 + HELM_VERSION=2.9.1 + DOCKER_VERSION=17.03 + AGENT_VERSION=1.2.11 else - RANCHER_VERSION=1.6.18 - KUBECTL_VERSION=1.10.3 + RANCHER_VERSION=1.6.22 + KUBECTL_VERSION=1.11.2 HELM_VERSION=2.9.1 DOCKER_VERSION=17.03 - AGENT_VERSION=1.2.10 + AGENT_VERSION=1.2.11 fi echo "Installing on ${SERVER} for ${BRANCH}: Rancher: ${RANCHER_VERSION} Kubectl: ${KUBECTL_VERSION} Helm: ${HELM_VERSION} Docker: ${DOCKER_VERSION}" |