diff options
| author |   Gary Wu <gary.i.wu@huawei.com> | 2018-08-09 08:10:24 -0700 |
|---|---|---|
| committer | Gary Wu <gary.i.wu@huawei.com> | 2018-08-09 10:27:10 -0700 |
| commit | 87aa8b53fda1825e1d24b7701dead5859cbdd878 (patch) | |
| tree | 6135bb304f1b91726f58e6b882ab3ed188dd77e0 /deployment/heat/onap-oom/rancher_vm_entrypoint.sh | |
| parent | 5d08958636a11ec9d570a995f09fa09f6e14de49 (diff) | |
Refactor to support OOM verify jobs
Change-Id: Ia898dbfced5ba1b00667593aa7e41c5c21ce4d5e
Issue-ID: INT-532
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
Diffstat (limited to 'deployment/heat/onap-oom/rancher_vm_entrypoint.sh')
| -rw-r--r-- | deployment/heat/onap-oom/rancher_vm_entrypoint.sh | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/deployment/heat/onap-oom/rancher_vm_entrypoint.sh b/deployment/heat/onap-oom/rancher_vm_entrypoint.sh index 098abbd39..62f4e8277 100644 --- a/deployment/heat/onap-oom/rancher_vm_entrypoint.sh +++ b/deployment/heat/onap-oom/rancher_vm_entrypoint.sh @@ -19,8 +19,10 @@ echo "__public_net_id__" > /opt/config/public_net_id.txt echo "__oam_network_cidr__" > /opt/config/oam_network_cidr.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 "__integration_gerrit_branch__" > /opt/config/integration_gerrit_branch.txt +echo "__integration_gerrit_refspec__" > /opt/config/integration_gerrit_refspec.txt +echo "__oom_gerrit_branch__" > /opt/config/oom_gerrit_branch.txt +echo "__oom_gerrit_refspec__" > /opt/config/oom_gerrit_refspec.txt echo "__docker_manifest__" > /opt/config/docker_manifest.txt echo "__docker_proxy__" > /opt/config/docker_proxy.txt @@ -208,24 +210,29 @@ git config --global log.decorate auto # Clone OOM: cd ~ -git clone -b master https://gerrit.onap.org/r/oom +git clone -b __oom_gerrit_branch__ https://gerrit.onap.org/r/oom cd oom -git log -1 -git tag -a "deploy0" -m "initial deployment" +git fetch https://gerrit.onap.org/r/oom __oom_gerrit_refspec__ +git checkout FETCH_HEAD git checkout -b workarounds +git log -1 # Clone integration cd ~ -git clone -b __gerrit_branch__ https://gerrit.onap.org/r/integration +git clone -b __integration_gerrit_branch__ https://gerrit.onap.org/r/integration cd integration -git fetch https://gerrit.onap.org/r/integration __gerrit_refspec__ +git fetch https://gerrit.onap.org/r/integration __integration_gerrit_refspec__ git checkout FETCH_HEAD -cd version-manifest/src/main/scripts -./update-oom-image-versions.sh ../resources/__docker_manifest__ ~/oom/ +if [ ! -z "__docker_manifest__" ]; then + cd version-manifest/src/main/scripts + ./update-oom-image-versions.sh ../resources/__docker_manifest__ ~/oom/ +fi cd ~/oom git diff +git commit -a -m "apply manifest versions" +git tag -a "deploy0" -m "initial deployment" # Run ONAP: |