diff options
| author |   Jun Li <matthew.lijun@huawei.com> | 2016-01-26 01:57:48 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-01-26 01:57:49 +0000 |
| commit | 9ea31fe97314f1228d115c450e724946c8b3c624 (patch) | |
| tree | ff6ad92bdcc48cb4ba30a3ccae7e9b72d5b01e5f | |
| parent | ff49e027e64bd8a6eaafbf7b8306649b68476d27 (diff) | |
| parent | 918fd9b590cff5c50ac28872a61cc542822e9a99 (diff) | |
Merge "[compass] merge the scripts of compass-deploy-bare.sh and compass-deploy-virtual"
| -rw-r--r-- | jjb/compass4nfv/compass-ci-jobs.yml | 2 | ||||
| -rw-r--r-- | jjb/compass4nfv/compass-deploy-bare.sh | 30 | ||||
| -rw-r--r-- | jjb/compass4nfv/compass-deploy-virtual.sh | 26 | ||||
| -rw-r--r-- | jjb/compass4nfv/compass-deploy.sh | 2 | ||||
| -rw-r--r-- | jjb/compass4nfv/compass-project-jobs.yml | 2 |
5 files changed, 3 insertions, 59 deletions
diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml index 855793128..2a8248186 100644 --- a/jjb/compass4nfv/compass-ci-jobs.yml +++ b/jjb/compass4nfv/compass-ci-jobs.yml @@ -172,7 +172,7 @@ - shell: !include-raw: ./compass-download-artifact.sh - shell: - !include-raw: ./compass-deploy-bare.sh + !include-raw: ./compass-deploy.sh publishers: - archive: diff --git a/jjb/compass4nfv/compass-deploy-bare.sh b/jjb/compass4nfv/compass-deploy-bare.sh deleted file mode 100644 index dc0aeb29d..000000000 --- a/jjb/compass4nfv/compass-deploy-bare.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/bash -set -x - -# log info to console -echo "Starting the deployment on baremetal environment using $INSTALLER_TYPE. This could take some time..." -echo "--------------------------------------------------------" -echo - -export CONFDIR=$WORKSPACE/deploy/conf/hardware_environment/$NODE_NAME -export ISO_URL=file://$BUILD_DIRECTORY/compass.iso -export INSTALL_NIC=eth0 - -cd $WORKSPACE - -export OS_VERSION=${{COMPASS_OS_VERSION}} -export OPENSTACK_VERSION=${{COMPASS_OPENSTACK_VERSION}} -./deploy.sh --dha $CONFDIR/${{DEPLOY_SCENARIO}}.yml --network $CONFDIR/network.yml -if [ $? -ne 0 ]; then - echo "depolyment failed!" - deploy_ret=1 -fi - -echo -echo "--------------------------------------------------------" -echo "Done!" - -ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" -sshpass -p root scp 2>/dev/null $ssh_options root@${{INSTALLER_IP}}:/var/ansible/run/openstack_${{COMPASS_OPENSTACK_VERSION}}-opnfv2/ansible.log ./ &> /dev/null - -exit $deploy_ret diff --git a/jjb/compass4nfv/compass-deploy-virtual.sh b/jjb/compass4nfv/compass-deploy-virtual.sh deleted file mode 100644 index 4991350a0..000000000 --- a/jjb/compass4nfv/compass-deploy-virtual.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash -set -x - -# log info to console -echo "Starting the deployment on virtual environment using $INSTALLER_TYPE. This could take some time..." -echo "--------------------------------------------------------" -echo - -export ISO_URL=file://$BUILD_DIRECTORY/compass.iso -export OS_VERSION=${{COMPASS_OS_VERSION}} -export OPENSTACK_VERSION=${{COMPASS_OPENSTACK_VERSION}} -export CONFDIR=$WORKSPACE/deploy/conf/vm_environment -./deploy.sh --dha $CONFDIR/$DEPLOY_SCENARIO.yml --network $CONFDIR/$NODE_NAME/network.yml -if [ $? -ne 0 ]; then - echo "depolyment failed!" - deploy_ret=1 -fi - -echo -echo "--------------------------------------------------------" -echo "Done!" - -ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" -sshpass -p root scp 2>/dev/null $ssh_options root@${{INSTALLER_IP}}:/var/ansible/run/openstack_${{COMPASS_OPENSTACK_VERSION}}-opnfv2/ansible.log ./ &> /dev/null - -exit $deploy_ret diff --git a/jjb/compass4nfv/compass-deploy.sh b/jjb/compass4nfv/compass-deploy.sh index 7f227708b..979462b19 100644 --- a/jjb/compass4nfv/compass-deploy.sh +++ b/jjb/compass4nfv/compass-deploy.sh @@ -21,7 +21,7 @@ cd $WORKSPACE export OS_VERSION=${{COMPASS_OS_VERSION}} export OPENSTACK_VERSION=${{COMPASS_OPENSTACK_VERSION}} -./deploy.sh --dha ${DHA_CONF} --network ${NETWORK_CONF} +./deploy.sh --dha ${{DHA_CONF}} --network ${{NETWORK_CONF}} if [ $? -ne 0 ]; then echo "depolyment failed!" deploy_ret=1 diff --git a/jjb/compass4nfv/compass-project-jobs.yml b/jjb/compass4nfv/compass-project-jobs.yml index da054220b..09fad2608 100644 --- a/jjb/compass4nfv/compass-project-jobs.yml +++ b/jjb/compass4nfv/compass-project-jobs.yml @@ -104,7 +104,7 @@ - shell: !include-raw: ./compass-build.sh - shell: - !include-raw: ./compass-deploy-virtual.sh + !include-raw: ./compass-deploy.sh publishers: - archive: |