diff options
| author |   Gary Wu <gary.i.wu@huawei.com> | 2018-06-22 13:48:50 -0700 |
|---|---|---|
| committer | Gary Wu <gary.i.wu@huawei.com> | 2018-06-25 10:46:10 -0700 |
| commit | 81836d273402c46688d5dc90cccebb4562ac564b (patch) | |
| tree | e293ae8e1d85a54768ea03df871bd9a0ca67899b /deployment/heat | |
| parent | 7657b0e2cb4a8b1833b10bc6c91297981d376a5b (diff) | |
Support testing of gerrit changes to manifest
Change-Id: I4a928c562cb56847f500d2b44eb8284caf3df550
Issue-ID: INT-532
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
Diffstat (limited to 'deployment/heat')
| -rw-r--r-- | deployment/heat/onap-oom/onap-oom.yaml | 15 | ||||
| -rw-r--r-- | deployment/heat/onap-oom/rancher_vm_entrypoint.sh | 19 |
2 files changed, 33 insertions, 1 deletions
diff --git a/deployment/heat/onap-oom/onap-oom.yaml b/deployment/heat/onap-oom/onap-oom.yaml index 1a217c221..8cd8169f9 100644 --- a/deployment/heat/onap-oom/onap-oom.yaml +++ b/deployment/heat/onap-oom/onap-oom.yaml @@ -35,6 +35,18 @@ parameters: type: string description: Content for integration_override.yaml + gerrit_branch: + type: string + default: "master" + + gerrit_refspec: + type: string + default: "refs/heads/master" + + docker_manifest: + type: string + default: "docker-manifest.csv" + resources: random-str: type: OS::Heat::RandomString @@ -136,6 +148,9 @@ resources: __apt_proxy__: { get_param: apt_proxy } __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] } __integration_override_yaml__: { get_param: integration_override_yaml } + __gerrit_branch__: { get_param: gerrit_branch } + __gerrit_refspec__: { get_param: gerrit_refspec } + __docker_manifest__: { get_param: docker_manifest } __oam_network_id__: { get_resource: oam_network } __oam_subnet_id__: { get_resource: oam_subnet } __k8s_1_vm_ip__: { get_attr: [k8s_1_floating_ip, floating_ip_address] } diff --git a/deployment/heat/onap-oom/rancher_vm_entrypoint.sh b/deployment/heat/onap-oom/rancher_vm_entrypoint.sh index 0490b6ab4..578cb5129 100644 --- a/deployment/heat/onap-oom/rancher_vm_entrypoint.sh +++ b/deployment/heat/onap-oom/rancher_vm_entrypoint.sh @@ -16,6 +16,9 @@ echo "__rancher_ip_addr__" > /opt/config/rancher_ip_addr.txt echo "__k8s_vm_ips__" > /opt/config/k8s_vm_ips.txt echo "__oam_network_id__" > /opt/config/oam_network_id.txt echo "__oam_subnet_id__" > /opt/config/oam_subnet_id.txt +echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt +echo "__gerrit_refspec__" > /opt/config/gerrit_refspec.txt +echo "__docker_manifest__" > /opt/config/docker_manifest.txt cat <<EOF > /opt/config/integration-override.yaml __integration_override_yaml__ @@ -189,12 +192,26 @@ git config --global log.decorate auto # Clone OOM: cd ~ -git clone -b master http://gerrit.onap.org/r/oom +git clone -b master https://gerrit.onap.org/r/oom cd oom git log -1 git tag -a "deploy0" -m "initial deployment" git checkout -b workarounds +# Clone integration +cd ~ +git clone -b __gerrit_branch__ https://gerrit.onap.org/r/integration +cd integration +git fetch https://gerrit.onap.org/r/integration __gerrit_refspec__ +git checkout FETCH_HEAD + +cd version-manifest/src/main/scripts +./update-oom-image-versions.sh ../resources/__docker_manifest__ ~/oom/ + +cd ~/oom +git diff + + # Run ONAP: cd ~/oom/kubernetes/ helm init --client-only |