Change-Id: Icf4e5cbbdbd50a13ee11f3722e4442b9ccde5c15
Signed-off-by: Marco Platania <platania@research.att.com>
docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
docker pull $NEXUS_DOCKER_REPO/openecomp/appc-image:$DOCKER_IMAGE_VERSION
docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
docker pull $NEXUS_DOCKER_REPO/openecomp/appc-image:$DOCKER_IMAGE_VERSION
-docker tag $NEXUS_DOCKER_REPO/openecomp/appc-image:$DOCKER_IMAGE_VERSION latest
+docker tag $NEXUS_DOCKER_REPO/openecomp/appc-image:$DOCKER_IMAGE_VERSION openecomp/appc-image:latest
docker pull $NEXUS_DOCKER_REPO/openecomp/dgbuilder-sdnc-image:$DOCKER_IMAGE_VERSION
docker pull $NEXUS_DOCKER_REPO/openecomp/dgbuilder-sdnc-image:$DOCKER_IMAGE_VERSION
-docker tag $NEXUS_DOCKER_REPO/openecomp/dgbuilder-sdnc-image:$DOCKER_IMAGE_VERSION latest
+docker tag $NEXUS_DOCKER_REPO/openecomp/dgbuilder-sdnc-image:$DOCKER_IMAGE_VERSION openecomp/dgbuilder-sdnc-image:latest
#/opt/docker/docker-compose pull
/opt/docker/docker-compose up -d
#/opt/docker/docker-compose pull
/opt/docker/docker-compose up -d
docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
docker pull $NEXUS_DOCKER_REPO/openecomp/policy/policy-db:$DOCKER_IMAGE_VERSION
docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
docker pull $NEXUS_DOCKER_REPO/openecomp/policy/policy-db:$DOCKER_IMAGE_VERSION
-docker tag $NEXUS_DOCKER_REPO/openecomp/policy/policy-db:$DOCKER_IMAGE_VERSION latest
+docker tag $NEXUS_DOCKER_REPO/openecomp/policy/policy-db:$DOCKER_IMAGE_VERSION openecomp/policy/policy-db:latest
docker pull $NEXUS_DOCKER_REPO/openecomp/policy/policy-pe:$DOCKER_IMAGE_VERSION
docker pull $NEXUS_DOCKER_REPO/openecomp/policy/policy-pe:$DOCKER_IMAGE_VERSION
-docker tag $NEXUS_DOCKER_REPO/openecomp/policy/policy-pe:$DOCKER_IMAGE_VERSION latest
+docker tag $NEXUS_DOCKER_REPO/openecomp/policy/policy-pe:$DOCKER_IMAGE_VERSION openecomp/policy/policy-pe:latest
docker pull $NEXUS_DOCKER_REPO/openecomp/policy/policy-drools:$DOCKER_IMAGE_VERSION
docker pull $NEXUS_DOCKER_REPO/openecomp/policy/policy-drools:$DOCKER_IMAGE_VERSION
-docker tag $NEXUS_DOCKER_REPO/openecomp/policy/policy-drools:$DOCKER_IMAGE_VERSION latest
+docker tag $NEXUS_DOCKER_REPO/openecomp/policy/policy-drools:$DOCKER_IMAGE_VERSION openecomp/policy/policy-drools:latest
docker pull $NEXUS_DOCKER_REPO/openecomp/policy/policy-nexus:$DOCKER_IMAGE_VERSION
docker pull $NEXUS_DOCKER_REPO/openecomp/policy/policy-nexus:$DOCKER_IMAGE_VERSION
-docker tag $NEXUS_DOCKER_REPO/openecomp/policy/policy-nexus:$DOCKER_IMAGE_VERSION latest
+docker tag $NEXUS_DOCKER_REPO/openecomp/policy/policy-nexus:$DOCKER_IMAGE_VERSION openecomp/policy/policy-nexus:latest
/opt/docker/docker-compose up -d
/opt/docker/docker-compose up -d
docker create --name data_vol_portal -v /var/lib/mysql mariadb
docker create --name data_vol_portal -v /var/lib/mysql mariadb
-docker tag $NEXUS_DOCKER_REPO/openecomp/portaldb:latest ecompdb:portal
-docker tag $NEXUS_DOCKER_REPO/openecomp/portalapps:latest ep:1610-1
+docker tag $NEXUS_DOCKER_REPO/openecomp/portaldb:$DOCKER_IMAGE_VERSION ecompdb:portal
+docker tag $NEXUS_DOCKER_REPO/openecomp/portalapps:$DOCKER_IMAGE_VERSION ep:1610-1
docker rm -f ecompdb_portal
docker rm -f 1610-1
docker rm -f ecompdb_portal
docker rm -f 1610-1
docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
docker pull $NEXUS_DOCKER_REPO/openecomp/sdnc-image:$DOCKER_IMAGE_VERSION
docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
docker pull $NEXUS_DOCKER_REPO/openecomp/sdnc-image:$DOCKER_IMAGE_VERSION
-docker tag $NEXUS_DOCKER_REPO/openecomp/sdnc-image:$DOCKER_IMAGE_VERSION latest
+docker tag $NEXUS_DOCKER_REPO/openecomp/sdnc-image:$DOCKER_IMAGE_VERSION openecomp/sdnc-image:latest
docker pull $NEXUS_DOCKER_REPO/openecomp/admportal-sdnc-image:$DOCKER_IMAGE_VERSION
docker pull $NEXUS_DOCKER_REPO/openecomp/admportal-sdnc-image:$DOCKER_IMAGE_VERSION
-docker tag $NEXUS_DOCKER_REPO/openecomp/admportal-sdnc-image:$DOCKER_IMAGE_VERSION latest
+docker tag $NEXUS_DOCKER_REPO/openecomp/admportal-sdnc-image:$DOCKER_IMAGE_VERSION openecomp/admportal-sdnc-image:latest
docker pull $NEXUS_DOCKER_REPO/openecomp/dgbuilder-sdnc-image:$DOCKER_IMAGE_VERSION
docker pull $NEXUS_DOCKER_REPO/openecomp/dgbuilder-sdnc-image:$DOCKER_IMAGE_VERSION
-docker tag $NEXUS_DOCKER_REPO/openecomp/dgbuilder-sdnc-image:$DOCKER_IMAGE_VERSION latest
+docker tag $NEXUS_DOCKER_REPO/openecomp/dgbuilder-sdnc-image:$DOCKER_IMAGE_VERSION openecomp/dgbuilder-sdnc-image:latest
/opt/docker/docker-compose up -d
/opt/docker/docker-compose up -d
- # Generic parameters used across all OpenECOMP components
+ # Generic parameters used across all ONAP components
public_net_id: 00000000-0000-0000-0000-000000000000
public_net_id: 00000000-0000-0000-0000-000000000000
+ docker_version: 1.0-STAGING-latest
+
+ gerrit_branch: release-1.0.0
+
# Parameters for DCAE instantiation
# Parameters for DCAE instantiation
heat_template_version: 2013-05-23
heat_template_version: 2013-05-23
-description: Heat template to deploy OpenECOMP components
+description: Heat template to deploy ONAP components
- # Generic parameters used across all OpenECOMP components
+ # Generic parameters used across all ONAP components
public_net_id:
type: string
label: Public network name or ID
public_net_id:
type: string
label: Public network name or ID
artifacts_version:
type: string
label: Artifacts Version
artifacts_version:
type: string
label: Artifacts Version
- description: Artifacts version of OpenECOMP components
+ description: Artifacts version of ONAP components
docker_version:
type: string
label: Docker Version
docker_version:
type: string
label: Docker Version
- description: Docker version of OpenECOMP docker images
+ description: Docker version of ONAP docker images
+ gerrit_branch:
+ type: string
+ label: Gerrit code branch
+ description: Gerrit branch where to download the code from
# Parameters for DCAE instantiation
dcae_zone:
# Parameters for DCAE instantiation
dcae_zone:
- # Public key used to access OpenECOMP components
+ # Public key used to access ONAP components
vm_key:
type: OS::Nova::KeyPair
properties:
vm_key:
type: OS::Nova::KeyPair
properties:
- # OpenECOMP management private network
+ # ONAP management private network
oam_ecomp:
type: OS::Neutron::Net
properties:
oam_ecomp:
type: OS::Neutron::Net
properties:
rand: { get_resource: random-str }
network_id: { get_resource: oam_ecomp }
cidr: 10.0.0.0/8
rand: { get_resource: random-str }
network_id: { get_resource: oam_ecomp }
cidr: 10.0.0.0/8
- value: { get_attr: [oam_ecomp, name] }
+ #value: { get_attr: [oam_ecomp, name] }
# DNS Server instantiation
# DNS Server instantiation
__dmaap_topic__: { get_param: dmaap_topic }
__artifacts_version__: { get_param: artifacts_version }
__docker_version__: { get_param: docker_version }
__dmaap_topic__: { get_param: dmaap_topic }
__artifacts_version__: { get_param: artifacts_version }
__docker_version__: { get_param: docker_version }
+ __gerrit_branch__: { get_param: gerrit_branch }
# Run docker-compose to spin up containers
cd /opt
# Run docker-compose to spin up containers
cd /opt
- git clone https://__gitlab_username__:__gitlab_password__@gerrit.openecomp.org/r/a/mso/docker-config.git test_lab
+ git clone -b __gerrit_branch__ --single-branch https://__gitlab_username__:__gitlab_password__@gerrit.openecomp.org/r/a/mso/docker-config.git test_lab
MSO_ENCRYPTION_KEY=$(cat /opt/test_lab/encryption.key)
echo -n "__openstack_api_key__" | openssl aes-128-ecb -e -K $MSO_ENCRYPTION_KEY -nosalt | xxd -c 256 -p > /opt/config/api_key.txt
./mso_vm_init.sh
MSO_ENCRYPTION_KEY=$(cat /opt/test_lab/encryption.key)
echo -n "__openstack_api_key__" | openssl aes-128-ecb -e -K $MSO_ENCRYPTION_KEY -nosalt | xxd -c 256 -p > /opt/config/api_key.txt
./mso_vm_init.sh
__gitlab_username__: { get_param: gitlab_username }
__gitlab_password__: { get_param: gitlab_password }
__artifacts_version__: { get_param: artifacts_version }
__gitlab_username__: { get_param: gitlab_username }
__gitlab_password__: { get_param: gitlab_password }
__artifacts_version__: { get_param: artifacts_version }
+ __gerrit_branch__: { get_param: gerrit_branch }
# Run docker-compose to spin up containers
cd /opt
# Run docker-compose to spin up containers
cd /opt
- git clone https://__gitlab_username__:__gitlab_password__@gerrit.openecomp.org/r/a/dcae/demo/startup/message-router.git dcae-startup-vm-message-router
+ git clone -b __gerrit_branch__ --single-branch https://__gitlab_username__:__gitlab_password__@gerrit.openecomp.org/r/a/dcae/demo/startup/message-router.git dcae-startup-vm-message-router
__artifacts_version__: { get_param: artifacts_version }
__openstack_region__: { get_param: openstack_region }
__docker_version__: { get_param: docker_version }
__artifacts_version__: { get_param: artifacts_version }
__openstack_region__: { get_param: openstack_region }
__docker_version__: { get_param: docker_version }
+ __gerrit_branch__: { get_param: gerrit_branch }
# Run docker-compose to spin up containers
cd /opt
# Run docker-compose to spin up containers
cd /opt
- git clone https://__gitlab_username__:__gitlab_password__@gerrit.openecomp.org/r/a/testsuite/properties.git testsuite/properties
+ git clone -b __gerrit_branch__ --single-branch https://__gitlab_username__:__gitlab_password__@gerrit.openecomp.org/r/a/testsuite/properties.git testsuite/properties
__gitlab_password__: { get_param: gitlab_password }
__artifacts_version__: { get_param: artifacts_version }
__docker_version__: { get_param: docker_version }
__gitlab_password__: { get_param: gitlab_password }
__artifacts_version__: { get_param: artifacts_version }
__docker_version__: { get_param: docker_version }
+ __gerrit_branch__: { get_param: gerrit_branch }
# Run script to spin up containers
cd /opt
# Run script to spin up containers
cd /opt
- git clone https://__gitlab_username__:__gitlab_password__@gerrit.openecomp.org/r/a/vid.git
+ git clone -b __gerrit_branch__ --single-branch https://__gitlab_username__:__gitlab_password__@gerrit.openecomp.org/r/a/vid.git
__gitlab_password__: { get_param: gitlab_password }
__artifacts_version__: { get_param: artifacts_version }
__docker_version__: { get_param: docker_version }
__gitlab_password__: { get_param: gitlab_password }
__artifacts_version__: { get_param: artifacts_version }
__docker_version__: { get_param: docker_version }
+ __gerrit_branch__: { get_param: gerrit_branch }
# Run docker-compose to spin up containers
cd /opt
# Run docker-compose to spin up containers
cd /opt
- git clone https://__gitlab_username__:__gitlab_password__@gerrit.openecomp.org/r/a/sdnc/oam.git sdnc
+ git clone -b __gerrit_branch__ --single-branch https://__gitlab_username__:__gitlab_password__@gerrit.openecomp.org/r/a/sdnc/oam.git sdnc
__env_name__: { get_param: dmaap_topic }
__artifacts_version__: { get_param: artifacts_version }
__docker_version__: { get_param: docker_version }
__env_name__: { get_param: dmaap_topic }
__artifacts_version__: { get_param: artifacts_version }
__docker_version__: { get_param: docker_version }
+ __gerrit_branch__: { get_param: gerrit_branch }
chmod 777 /data/logs/BE
chmod 777 /data/logs/FE
chmod 777 /data/logs/BE
chmod 777 /data/logs/FE
- git clone https://__gitlab_username__:__gitlab_password__@gerrit.openecomp.org/r/a/sdc.git
+ git clone -b __gerrit_branch__ --single-branch https://__gitlab_username__:__gitlab_password__@gerrit.openecomp.org/r/a/sdc.git
cat > /root/.bash_aliases << EOF
alias dcls='/data/scripts/docker_clean.sh \$1'
cat > /root/.bash_aliases << EOF
alias dcls='/data/scripts/docker_clean.sh \$1'
__gitlab_password__: { get_param: gitlab_password }
__artifacts_version__: { get_param: artifacts_version }
__docker_version__: { get_param: docker_version }
__gitlab_password__: { get_param: gitlab_password }
__artifacts_version__: { get_param: artifacts_version }
__docker_version__: { get_param: docker_version }
+ __gerrit_branch__: { get_param: gerrit_branch }
# Run Portal-specific instructions
mkdir -p /PROJECT/OpenSource/UbuntuEP/logs
cd /opt
# Run Portal-specific instructions
mkdir -p /PROJECT/OpenSource/UbuntuEP/logs
cd /opt
- git clone https://__gitlab_username__:__gitlab_password__@gerrit.openecomp.org/r/a/portal.git
+ git clone -b __gerrit_branch__ --single-branch https://__gitlab_username__:__gitlab_password__@gerrit.openecomp.org/r/a/portal.git
# Run docker-compose to spin up containers
./portal_vm_init.sh
# Run docker-compose to spin up containers
./portal_vm_init.sh
__nexus_repo_root__: { get_param: nexus_repo_root }
__openstack_region__: { get_param: openstack_region }
__docker_version__: { get_param: docker_version }
__nexus_repo_root__: { get_param: nexus_repo_root }
__openstack_region__: { get_param: openstack_region }
__docker_version__: { get_param: docker_version }
+ __gerrit_branch__: { get_param: gerrit_branch }
# DCAE Controller specific deployment
cd /opt
# DCAE Controller specific deployment
cd /opt
- git clone https://__gitlab_username__:__gitlab_password__@gerrit.openecomp.org/r/a/dcae/demo/startup/controller.git dcae-startup-vm-controller
+ git clone -b __gerrit_branch__ --single-branch https://__gitlab_username__:__gitlab_password__@gerrit.openecomp.org/r/a/dcae/demo/startup/controller.git dcae-startup-vm-controller
cd dcae-startup-vm-controller
mkdir -p /opt/app/dcae-controller
cat > /opt/app/dcae-controller/config.yaml << EOF_CONFIG
ZONE: __dcae_zone__
STATE: __dcae_state__
cd dcae-startup-vm-controller
mkdir -p /opt/app/dcae-controller
cat > /opt/app/dcae-controller/config.yaml << EOF_CONFIG
ZONE: __dcae_zone__
STATE: __dcae_state__
+ DCAE-VERSION: __artifacts_version__
HORIZON-URL: https://mycloud.rackspace.com/cloud/__tenant_id__
KEYSTONE-URL: https://identity.api.rackspacecloud.com/v2.0
OPENSTACK-TENANT-ID: __tenant_id__
HORIZON-URL: https://mycloud.rackspace.com/cloud/__tenant_id__
KEYSTONE-URL: https://identity.api.rackspacecloud.com/v2.0
OPENSTACK-TENANT-ID: __tenant_id__
__gitlab_password__: { get_param: gitlab_password }
__artifacts_version__: { get_param: artifacts_version }
__docker_version__: { get_param: docker_version }
__gitlab_password__: { get_param: gitlab_password }
__artifacts_version__: { get_param: artifacts_version }
__docker_version__: { get_param: docker_version }
+ __gerrit_branch__: { get_param: gerrit_branch }
# Run docker-compose to spin up containers
cd /opt
# Run docker-compose to spin up containers
cd /opt
- git clone https://__gitlab_username__:__gitlab_password__@gerrit.openecomp.org/r/a/policy/docker.git policy
+ git clone -b __gerrit_branch__ --single-branch https://__gitlab_username__:__gitlab_password__@gerrit.openecomp.org/r/a/policy/docker.git policy
__dmaap_topic__: { get_param: dmaap_topic }
__artifacts_version__: { get_param: artifacts_version }
__docker_version__: { get_param: docker_version }
__dmaap_topic__: { get_param: dmaap_topic }
__artifacts_version__: { get_param: artifacts_version }
__docker_version__: { get_param: docker_version }
+ __gerrit_branch__: { get_param: gerrit_branch }
# Run docker-compose to spin up containers
cd /opt
# Run docker-compose to spin up containers
cd /opt
- git clone https://__gitlab_username__:__gitlab_password__@gerrit.openecomp.org/r/a/appc/deployment.git appc
+ git clone -b __gerrit_branch__ --single-branch https://__gitlab_username__:__gitlab_password__@gerrit.openecomp.org/r/a/appc/deployment.git appc