aboutsummaryrefslogtreecommitdiffstats
path: root/deployment
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2018-11-20 10:29:22 -0800
committerGary Wu <gary.i.wu@huawei.com>2018-11-20 10:36:04 -0800
commit6842fa3a7e7fca4bfc4f6492d26035320f3c7f61 (patch)
tree57b15b1c3c18fb6f0534bf7bdf1f0ec189944320 /deployment
parent6089a84a8dbf21f2a1fd6f10ed166c8d22b590d7 (diff)
Make gerrit_refspec parameters optional
Change-Id: If3dbd009d59f75d9b9f9556c5ece32a40890a383 Issue-ID: INT-584 Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
Diffstat (limited to 'deployment')
-rw-r--r--deployment/heat/onap-oom/env/tlab/onap-oom.env2
-rw-r--r--deployment/heat/onap-oom/env/windriver/onap-oom.env2
-rw-r--r--deployment/heat/onap-oom/onap-oom.yaml4
-rw-r--r--deployment/heat/onap-oom/parts/onap-oom-1.yaml4
-rw-r--r--deployment/heat/onap-oom/rancher_vm_entrypoint.sh12
5 files changed, 16 insertions, 8 deletions
diff --git a/deployment/heat/onap-oom/env/tlab/onap-oom.env b/deployment/heat/onap-oom/env/tlab/onap-oom.env
index 04fa44d76..d50f3f6ff 100644
--- a/deployment/heat/onap-oom/env/tlab/onap-oom.env
+++ b/deployment/heat/onap-oom/env/tlab/onap-oom.env
@@ -14,6 +14,8 @@ parameters:
oam_network_cidr: 10.0.0.0/16
+ integration_gerrit_branch: master
+
helm_deploy_delay: 4m
integration_override_yaml: >
diff --git a/deployment/heat/onap-oom/env/windriver/onap-oom.env b/deployment/heat/onap-oom/env/windriver/onap-oom.env
index 15819ffe1..5cfe61c41 100644
--- a/deployment/heat/onap-oom/env/windriver/onap-oom.env
+++ b/deployment/heat/onap-oom/env/windriver/onap-oom.env
@@ -14,6 +14,8 @@ parameters:
oam_network_cidr: 10.0.0.0/16
+ integration_gerrit_branch: master
+
helm_deploy_delay: 2.5m
integration_override_yaml: >
diff --git a/deployment/heat/onap-oom/onap-oom.yaml b/deployment/heat/onap-oom/onap-oom.yaml
index e6845cc52..44b23e4e7 100644
--- a/deployment/heat/onap-oom/onap-oom.yaml
+++ b/deployment/heat/onap-oom/onap-oom.yaml
@@ -49,7 +49,7 @@ parameters:
integration_gerrit_refspec:
type: string
- default: "refs/heads/master"
+ default: ""
oom_gerrit_branch:
type: string
@@ -57,7 +57,7 @@ parameters:
oom_gerrit_refspec:
type: string
- default: "refs/heads/master"
+ default: ""
docker_manifest:
type: string
diff --git a/deployment/heat/onap-oom/parts/onap-oom-1.yaml b/deployment/heat/onap-oom/parts/onap-oom-1.yaml
index 5f117acb8..1a9e33d60 100644
--- a/deployment/heat/onap-oom/parts/onap-oom-1.yaml
+++ b/deployment/heat/onap-oom/parts/onap-oom-1.yaml
@@ -46,7 +46,7 @@ parameters:
integration_gerrit_refspec:
type: string
- default: "refs/heads/master"
+ default: ""
oom_gerrit_branch:
type: string
@@ -54,7 +54,7 @@ parameters:
oom_gerrit_refspec:
type: string
- default: "refs/heads/master"
+ default: ""
docker_manifest:
type: string
diff --git a/deployment/heat/onap-oom/rancher_vm_entrypoint.sh b/deployment/heat/onap-oom/rancher_vm_entrypoint.sh
index bd39963de..1ee29b011 100644
--- a/deployment/heat/onap-oom/rancher_vm_entrypoint.sh
+++ b/deployment/heat/onap-oom/rancher_vm_entrypoint.sh
@@ -270,8 +270,10 @@ git config --global log.decorate auto
cd ~
git clone -b __oom_gerrit_branch__ https://gerrit.onap.org/r/oom
cd oom
-git fetch https://gerrit.onap.org/r/oom __oom_gerrit_refspec__
-git checkout FETCH_HEAD
+if [ ! -z "__oom_gerrit_refspec__" ]; then
+ git fetch https://gerrit.onap.org/r/oom __oom_gerrit_refspec__
+ git checkout FETCH_HEAD
+fi
git checkout -b workarounds
git log -1
@@ -279,8 +281,10 @@ git log -1
cd ~
git clone -b __integration_gerrit_branch__ https://gerrit.onap.org/r/integration
cd integration
-git fetch https://gerrit.onap.org/r/integration __integration_gerrit_refspec__
-git checkout FETCH_HEAD
+if [ ! -z "__integration_gerrit_refspec__" ]; then
+ git fetch https://gerrit.onap.org/r/integration __integration_gerrit_refspec__
+ git checkout FETCH_HEAD
+fi
if [ ! -z "__docker_manifest__" ]; then