Make gerrit_refspec parameters optional

Change-Id: If3dbd009d59f75d9b9f9556c5ece32a40890a383
Issue-ID: INT-584
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>

diff --git a/deployment/heat/onap-oom/env/tlab/onap-oom.env b/deployment/heat/onap-oom/env/tlab/onap-oom.env
index 04fa44d..d50f3f6 100644 (file)
--- 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 15819ff..5cfe61c 100644 (file)
--- 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 e6845cc..44b23e4 100644 (file)
--- 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 5f117ac..1a9e33d 100644 (file)
--- 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 bd39963..1ee29b0 100644 (file)
--- 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