diff options
| -rw-r--r-- | jjb/compass4nfv/compass-ci-jobs.yml | 8 | ||||
| -rw-r--r-- | jjb/compass4nfv/compass-deploy-bare.sh | 4 | ||||
| -rw-r--r-- | jjb/compass4nfv/compass-deploy-virtual.sh | 2 | ||||
| -rw-r--r-- | jjb/compass4nfv/compass-project-jobs.yml | 31 |
4 files changed, 23 insertions, 22 deletions
diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml index 535fb3b31..0f760c4cc 100644 --- a/jjb/compass4nfv/compass-ci-jobs.yml +++ b/jjb/compass4nfv/compass-ci-jobs.yml @@ -42,7 +42,7 @@ auto-trigger-name: 'compass-{scenario}-{pod}-trigger' # - 'os-ocl-nofeature-ha': # disabled: true -# auto-trigger-name: 'joid-{scenario}-{pod}-trigger' +# auto-trigger-name: 'compass-{scenario}-{pod}-trigger' jobs: - 'compass-{scenario}-{pod}-daily-{stream}' @@ -82,7 +82,7 @@ gs-pathname: '{gs-pathname}' - string: name: DEPLOY_SCENARIO - default: 'none' + default: '{scenario}' - 'huawei-build-defaults' - '{installer}-defaults' @@ -132,6 +132,10 @@ blocking-jobs: - 'compass-deploy-{pod}-daily-{stream}' + wrappers: + - build-name: + name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO' + parameters: - project-parameter: project: '{project}' diff --git a/jjb/compass4nfv/compass-deploy-bare.sh b/jjb/compass4nfv/compass-deploy-bare.sh index 12b9b337b..dc0aeb29d 100644 --- a/jjb/compass4nfv/compass-deploy-bare.sh +++ b/jjb/compass4nfv/compass-deploy-bare.sh @@ -6,7 +6,7 @@ echo "Starting the deployment on baremetal environment using $INSTALLER_TYPE. Th echo "--------------------------------------------------------" echo -export CONFDIR=$WORKSPACE/deploy/conf/hardware_environment/huawei_us_lab/pod1 +export CONFDIR=$WORKSPACE/deploy/conf/hardware_environment/$NODE_NAME export ISO_URL=file://$BUILD_DIRECTORY/compass.iso export INSTALL_NIC=eth0 @@ -14,7 +14,7 @@ cd $WORKSPACE export OS_VERSION=${{COMPASS_OS_VERSION}} export OPENSTACK_VERSION=${{COMPASS_OPENSTACK_VERSION}} -./deploy.sh --dha $CONFDIR/dha.yml --network $CONFDIR/network.yml +./deploy.sh --dha $CONFDIR/${{DEPLOY_SCENARIO}}.yml --network $CONFDIR/network.yml if [ $? -ne 0 ]; then echo "depolyment failed!" deploy_ret=1 diff --git a/jjb/compass4nfv/compass-deploy-virtual.sh b/jjb/compass4nfv/compass-deploy-virtual.sh index b35658bd7..4991350a0 100644 --- a/jjb/compass4nfv/compass-deploy-virtual.sh +++ b/jjb/compass4nfv/compass-deploy-virtual.sh @@ -10,7 +10,7 @@ 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/$SDN_CONTROLLER.yml --network $CONFDIR/$NODE_NAME/network.yml +./deploy.sh --dha $CONFDIR/$DEPLOY_SCENARIO.yml --network $CONFDIR/$NODE_NAME/network.yml 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 345c4c3fb..565aaa33f 100644 --- a/jjb/compass4nfv/compass-project-jobs.yml +++ b/jjb/compass4nfv/compass-project-jobs.yml @@ -15,17 +15,17 @@ gs-pathname: '/{stream}' - sdn-controller: - - 'nosdn': + scenario: + - 'os-nosdn-nofeature-ha': disabled: false node: huawei-deploy-vm - - 'odl': + - 'os-odl_l2-nofeature-ha': disabled: false node: huawei-deploy-vm - - 'onos': + - 'os-onos-nofeature-ha': disabled: false node: huawei-deploy-vm -# - 'opencontrail': +# - 'os-ocl-nofeature-ha': # disabled: true # node: huawei-deploy-vm @@ -33,7 +33,7 @@ - 'compass-verify-{stream}' - 'compass-build-iso-{stream}' - 'compass-build-ppa-{stream}' - - 'compass-deploy-virtual-{sdn-controller}-{stream}' + - 'compass-deploy-virtual-{scenario}-{stream}' - 'compass-virtual-daily-{stream}' ######################## @@ -65,8 +65,8 @@ - '{node}-defaults' - '{installer}-defaults' - string: - name: SDN_CONTROLLER - default: 'nosdn' + name: DEPLOY_SCENARIO + default: 'os-nosdn-nofeature-ha' scm: - gerrit-trigger-scm: @@ -137,7 +137,7 @@ branch: '{branch}' triggers: - - timed: 'H 16 * * *' + - timed: 'H 14 * * *' builders: - trigger-builds: @@ -145,15 +145,15 @@ git-revision: true block: true - trigger-builds: - - project: 'compass-deploy-virtual-nosdn-{stream}' + - project: 'compass-deploy-virtual-os-nosdn-nofeature-ha-{stream}' git-revision: true block: false - trigger-builds: - - project: 'compass-deploy-virtual-odl-{stream}' + - project: 'compass-deploy-virtual-os-odl_l2-nofeature-ha-{stream}' git-revision: true block: false - trigger-builds: - - project: 'compass-deploy-virtual-onos-{stream}' + - project: 'compass-deploy-virtual-os-onos-nofeature-ha-{stream}' git-revision: true block: false @@ -227,7 +227,7 @@ !include-raw: ./compass-makeppa.sh - job-template: - name: 'compass-deploy-virtual-{sdn-controller}-{stream}' + name: 'compass-deploy-virtual-{scenario}-{stream}' disabled: false @@ -248,11 +248,8 @@ installer: '{installer}' gs-pathname: '{gs-pathname}' - string: - name: SDN_CONTROLLER - default: '{sdn-controller}' - - string: name: DEPLOY_SCENARIO - default: 'none' + default: '{scenario}' - '{node}-defaults' - '{installer}-defaults' |