aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2018-12-11 10:57:08 -0800
committerGary Wu <gary.i.wu@huawei.com>2018-12-11 10:57:08 -0800
commite54a104d0935c77103c1f2111d80c09aa0e7ad57 (patch)
tree69d20452d3ee2259f6a28a11b3b57f28caef9d19
parentaddadad3fd4641c321be6aacd9c7e047cafef5b2 (diff)
Change deployment branch to casablanca for MR
Change deployment branch to casablanca to facilitate deployment tests for Casablanca Maintenance Release. Change-Id: I0d30723d5001eba89f0f36886e494dd8dd31a5fd Issue-ID: INT-775 Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
-rw-r--r--kubernetes/aai/charts/aai-sparky-be/values.yaml2
-rw-r--r--kubernetes/dmaap/charts/message-router/charts/message-router-kafka/values.yaml2
-rw-r--r--kubernetes/dmaap/charts/message-router/charts/message-router-zookeeper/values.yaml2
-rw-r--r--kubernetes/portal/docker/init/mariadb-client/Dockerfile2
-rwxr-xr-xkubernetes/so/charts/so-mariadb/values.yaml2
5 files changed, 5 insertions, 5 deletions
diff --git a/kubernetes/aai/charts/aai-sparky-be/values.yaml b/kubernetes/aai/charts/aai-sparky-be/values.yaml
index e3edcf6e58..1c2b0cc5b7 100644
--- a/kubernetes/aai/charts/aai-sparky-be/values.yaml
+++ b/kubernetes/aai/charts/aai-sparky-be/values.yaml
@@ -37,7 +37,7 @@ ubuntuInitImage: oomk8s/ubuntu-init:2.0.0
# application configuration
config:
elasticsearchHttpPort: 9200
- gerritBranch: 3.0.0-ONAP
+ gerritBranch: casablanca
gerritProject: http://gerrit.onap.org/r/aai/test-config
portalUsername: aaiui
portalPassword: 1t2v1vfv1unz1vgz1t3b
diff --git a/kubernetes/dmaap/charts/message-router/charts/message-router-kafka/values.yaml b/kubernetes/dmaap/charts/message-router/charts/message-router-kafka/values.yaml
index 43c4d3aecd..41cc3a1d03 100644
--- a/kubernetes/dmaap/charts/message-router/charts/message-router-kafka/values.yaml
+++ b/kubernetes/dmaap/charts/message-router/charts/message-router-kafka/values.yaml
@@ -44,7 +44,7 @@ debugEnabled: false
# application configuration
config:
# gerrit branch where the latest code is checked in
- gerritBranch: 3.0.0-ONAP
+ gerritBranch: casablanca
# gerrit project where the latest code is checked in
gerritProject: http://gerrit.onap.org/r/dmaap/messagerouter/messageservice.git
diff --git a/kubernetes/dmaap/charts/message-router/charts/message-router-zookeeper/values.yaml b/kubernetes/dmaap/charts/message-router/charts/message-router-zookeeper/values.yaml
index 05963ab48c..9a9af75ecb 100644
--- a/kubernetes/dmaap/charts/message-router/charts/message-router-zookeeper/values.yaml
+++ b/kubernetes/dmaap/charts/message-router/charts/message-router-zookeeper/values.yaml
@@ -40,7 +40,7 @@ debugEnabled: false
# application configuration
config:
# gerrit branch where the latest code is checked in
- gerritBranch: 3.0.0-ONAP
+ gerritBranch: casablanca
# gerrit project where the latest code is checked in
gerritProject: http://gerrit.onap.org/r/dmaap/messagerouter/messageservice.git
diff --git a/kubernetes/portal/docker/init/mariadb-client/Dockerfile b/kubernetes/portal/docker/init/mariadb-client/Dockerfile
index 72f60d35ad..cc0fb83b43 100644
--- a/kubernetes/portal/docker/init/mariadb-client/Dockerfile
+++ b/kubernetes/portal/docker/init/mariadb-client/Dockerfile
@@ -14,7 +14,7 @@
FROM boxfuse/flyway:5.0.7-alpine
-ARG branch=3.0.0-ONAP
+ARG branch=casablanca
ENV no_proxy "localhost,127.0.0.1,.cluster.local,$KUBERNETES_SERVICE_HOST"
# Setup Corporate proxy
ENV https_proxy ${HTTP_PROXY}
diff --git a/kubernetes/so/charts/so-mariadb/values.yaml b/kubernetes/so/charts/so-mariadb/values.yaml
index b1544aa5f7..a12a7484f8 100755
--- a/kubernetes/so/charts/so-mariadb/values.yaml
+++ b/kubernetes/so/charts/so-mariadb/values.yaml
@@ -40,7 +40,7 @@ ubuntuInitImage: oomk8s/ubuntu-init:2.0.0
config:
mariadbRootPassword: password
# gerrit branch where the latest heat code is checked in
- gerritBranch: 3.0.0-ONAP
+ gerritBranch: casablanca
# gerrit project where the latest heat code is checked in
gerritProject: http://gerrit.onap.org/r/so/docker-config.git
# default number of instances