Refactor to support OOM verify jobs
Change-Id: Ia898dbfced5ba1b00667593aa7e41c5c21ce4d5e
Issue-ID: INT-532
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
diff --git a/deployment/heat/onap-oom/onap-oom.yaml b/deployment/heat/onap-oom/onap-oom.yaml
index 867f242..41bd316 100644
--- a/deployment/heat/onap-oom/onap-oom.yaml
+++ b/deployment/heat/onap-oom/onap-oom.yaml
@@ -35,17 +35,25 @@
type: string
description: Content for integration_override.yaml
- gerrit_branch:
+ integration_gerrit_branch:
type: string
default: "master"
- gerrit_refspec:
+ integration_gerrit_refspec:
+ type: string
+ default: "refs/heads/master"
+
+ oom_gerrit_branch:
+ type: string
+ default: "master"
+
+ oom_gerrit_refspec:
type: string
default: "refs/heads/master"
docker_manifest:
type: string
- default: "docker-manifest.csv"
+ default: ""
key_name:
type: string
@@ -153,8 +161,10 @@
__rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] }
__rancher_private_ip_addr__: { get_attr: [rancher_floating_ip, fixed_ip_address] }
__integration_override_yaml__: { get_param: integration_override_yaml }
- __gerrit_branch__: { get_param: gerrit_branch }
- __gerrit_refspec__: { get_param: gerrit_refspec }
+ __integration_gerrit_branch__: { get_param: integration_gerrit_branch }
+ __integration_gerrit_refspec__: { get_param: integration_gerrit_refspec }
+ __oom_gerrit_branch__: { get_param: oom_gerrit_branch }
+ __oom_gerrit_refspec__: { get_param: oom_gerrit_refspec }
__docker_manifest__: { get_param: docker_manifest }
__public_net_id__: { get_param: public_net_id }
__oam_network_cidr__: { get_param: oam_network_cidr }