diff options
| -rw-r--r-- | deployment/heat/onap-oom/onap-oom.yaml | 20 | ||||
| -rw-r--r-- | deployment/heat/onap-oom/parts/onap-oom-1.yaml | 14 | ||||
| -rw-r--r-- | deployment/heat/onap-oom/rancher_vm_entrypoint.sh | 25 | ||||
| -rwxr-xr-x | deployment/heat/onap-oom/scripts/deploy.sh | 34 | ||||
| -rwxr-xr-x | deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh | 6 | ||||
| -rw-r--r-- | version-manifest/src/main/resources/docker-manifest-staging.csv | 7 |
6 files changed, 64 insertions, 42 deletions
diff --git a/deployment/heat/onap-oom/onap-oom.yaml b/deployment/heat/onap-oom/onap-oom.yaml index 867f242d9..41bd31619 100644 --- a/deployment/heat/onap-oom/onap-oom.yaml +++ b/deployment/heat/onap-oom/onap-oom.yaml @@ -35,17 +35,25 @@ parameters: 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 @@ resources: __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 } diff --git a/deployment/heat/onap-oom/parts/onap-oom-1.yaml b/deployment/heat/onap-oom/parts/onap-oom-1.yaml index 000ef6a64..ac0f6b409 100644 --- a/deployment/heat/onap-oom/parts/onap-oom-1.yaml +++ b/deployment/heat/onap-oom/parts/onap-oom-1.yaml @@ -32,17 +32,25 @@ parameters: 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 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: diff --git a/deployment/heat/onap-oom/scripts/deploy.sh b/deployment/heat/onap-oom/scripts/deploy.sh index 11b2938ee..c9cd005c7 100755 --- a/deployment/heat/onap-oom/scripts/deploy.sh +++ b/deployment/heat/onap-oom/scripts/deploy.sh @@ -16,25 +16,11 @@ if [ -z "$WORKSPACE" ]; then export WORKSPACE=`git rev-parse --show-toplevel` fi -usage() { echo "Usage: $0 [-n <number of VMs {2-15}>] [ -r ] <env-name>" 1>&2; exit 1; } +usage() { echo "Usage: $0 [ -r ] <env-name>" 1>&2; exit 1; } -if [ "$#" -ne 1 ]; then - usage -fi -ENV_FILE=$1 -while getopts ":n:s:" o; do +while getopts ":rq" o; do case "${o}" in - n) - if [[ ${OPTARG} =~ ^[0-9]+$ ]];then - vm_num=${OPTARG} - if [ ${OPTARG} > 15 ] || [ ${OPTARG} < 2 ]; then - usage - fi - else - usage - fi - ;; r) echo "The following command will delete all information relating to onap within your enviroment" read -p "Are you certain this is what you want? (type y to confirm):" answer @@ -42,14 +28,14 @@ while getopts ":n:s:" o; do if [ $answer = "y" ] || [ $answer = "Y" ] || [ $answer = "yes" ] || [ $answer = "Yes"]; then echo "This may delete the work of other colleages within the same enviroment" read -p "Are you certain this is what you want? (type y to confirm):" answer2 - + if [ $answer2 = "y" ] || [ $answer2 = "Y" ] || [ $answer2 = "yes" ] || [ $answer2 = "Yes"]; then full_deletion=true - else + else echo "Ending program" exit 1 fi - else + else echo "Ending program" exit 1 fi @@ -64,6 +50,12 @@ while getopts ":n:s:" o; do done shift $((OPTIND-1)) +if [ "$#" -ne 1 ]; then + usage +fi + +ENV_FILE=$1 + SSH_KEY=~/.ssh/onap_key source $WORKSPACE/test/ete/scripts/install_openstack_cli.sh @@ -72,9 +64,9 @@ SO_ENCRYPTION_KEY=aa3871669d893c7fb8abbcda31b88b4f export OS_PASSWORD_ENCRYPTED=$(echo -n "$OS_PASSWORD" | openssl aes-128-ecb -e -K "$SO_ENCRYPTION_KEY" -nosalt | xxd -c 256 -p) for n in $(seq 1 5); do - if [ $full_deletion = true ] ; then + if [ $full_deletion = true ] ; then $WORKSPACE/test/ete/scripts/teardown-onap.sh -n $install_name -q - else + else $WORKSPACE/test/ete/scripts/teardown-onap.sh -n $install_name fi diff --git a/deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh b/deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh index 33d2c3db8..408f778e9 100755 --- a/deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh +++ b/deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh @@ -51,8 +51,10 @@ cat <<EOF __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 } diff --git a/version-manifest/src/main/resources/docker-manifest-staging.csv b/version-manifest/src/main/resources/docker-manifest-staging.csv index 475b9acd4..10f9303c8 100644 --- a/version-manifest/src/main/resources/docker-manifest-staging.csv +++ b/version-manifest/src/main/resources/docker-manifest-staging.csv @@ -12,8 +12,9 @@ onap/aai-resources,1.2.2 onap/aai-traversal,1.2.2 onap/aai/esr-gui,1.1.0 onap/aai/esr-server,1.1.0 +onap/activity-spec,1.3.0-SNAPSHOT onap/admportal-sdnc-image,1.4-STAGING-latest -onap/appc-cdt-image,1.3.0 +onap/appc-cdt-image,1.4.0-SNAPSHOT-latest onap/appc-image,1.4.0-SNAPSHOT-latest onap/babel,1.2.0 onap/ccsdk-dgbuilder-image,0.3-STAGING-latest @@ -40,6 +41,7 @@ onap/multicloud/vio,1.1.2 onap/multicloud/vio-vesagent,1.0.0 onap/music/cassandra_music,3.0.0 onap/music/music,2.5.3 +onap/music/prom,1.0.5-latest onap/oom/kube2msb,1.1.0 onap/optf-has,1.1.1 onap/optf-osdf,1.1.1 @@ -57,6 +59,7 @@ onap/org.onap.dcaegen2.platform.deployment-handler,2.1.5 onap/org.onap.dcaegen2.platform.inventory-api,3.0.1 onap/org.onap.dcaegen2.platform.policy-handler,2.4.5 onap/org.onap.dcaegen2.platform.servicechange-handler,1.1.4 +onap/policy-apex-pdp,2.0-SNAPSHOT-latest onap/policy-drools,1.3-SNAPSHOT-latest onap/policy-pe,1.3-SNAPSHOT-latest onap/portal-app,2.2.0 @@ -81,7 +84,7 @@ onap/sdnc-ansible-server-image,1.4-STAGING-latest onap/sdnc-dmaap-listener-image,1.4-STAGING-latest onap/sdnc-image,1.4-STAGING-latest onap/sdnc-ueb-listener-image,1.4-STAGING-latest -onap/search-data-service,1.2.1 +onap/search-data-service,1.2.2 onap/sniroemulator,1.0.0 onap/sparky-be,1.2.1 onap/testsuite,1.3.0-STAGING-latest |