X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fcompass4nfv%2Fcompass4nfv.yml;h=74f9a45399cf75f0f36727d58d19503927d619b4;hb=05daeeb4f90eb5a8ab0a928bc7c9d6414b5c1905;hp=07e00426352e823232634381bd342eb5cd0dbf11;hpb=65afd31de93b14639eac53f50154a1df9a338f3f;p=releng.git diff --git a/jjb/compass4nfv/compass4nfv.yml b/jjb/compass4nfv/compass4nfv.yml index 07e004263..74f9a4539 100644 --- a/jjb/compass4nfv/compass4nfv.yml +++ b/jjb/compass4nfv/compass4nfv.yml @@ -7,12 +7,12 @@ jobs: - 'compass-verify' - - 'compass-verify-on-ericsson-node' - 'compass-merge' - 'compass-daily-{stream}' - 'compass-build-iso' - 'compass-build-ppa' - 'compass-deploy-virtual-{flavor}' + - 'compass-deploy-bare-huawei-us' # stream: branch with - in place of / (eg. stable-helium) # branch: branch (eg. stable/helium) @@ -29,82 +29,27 @@ node: 'huawei-deploy-vm' - cluster: conf: 'virtual_cluster' - node: 'huawei-build' - - + node: 'huawei-deploy-vm' project: 'compass4nfv' ######################## # job templates ######################## -- job-template: - name: 'compass-verify-on-ericsson-node' - - project-type: freestyle - - disabled: true - - node: ericsson-build - - logrotate: - daysToKeep: 30 - numToKeep: 10 - artifactDaysToKeep: -1 - artifactNumToKeep: -1 - - parameters: - - project-parameter: - project: '{project}' - - gerrit-parameter: - branch: 'master' - - compass-parameter: - installer: '{installer}' - - scm: - - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' - refspec: '$GERRIT_REFSPEC' - choosing-strategy: 'gerrit' - - wrappers: - - ssh-agent-credentials: - user: '{ssh-credentials}' - - triggers: - - gerrit: - trigger-on: - - patchset-created-event: - exclude-drafts: 'false' - exclude-trivial-rebase: 'false' - exclude-no-code-change: 'false' - - draft-published-event - - comment-added-contains-event: - comment-contains-value: 'recheck' - - comment-added-contains-event: - comment-contains-value: 'reverify' - projects: - - project-compare-type: 'ANT' - project-pattern: '{project}' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/master' - forbidden-file-paths: - - compare-type: ANT - pattern: 'docs/**' - - builders: - - 'builder-compass-build-iso' - - 'builder-compass-workspace-cleanup' - - job-template: name: 'compass-verify' - project-type: freestyle - disabled: false - node: huawei-build + node: 'huawei-deploy-vm' + + concurrent: true + + properties: + - throttle: + enabled: true + max-total: 3 + max-per-node: 1 logrotate: daysToKeep: 30 @@ -129,10 +74,6 @@ refspec: '$GERRIT_REFSPEC' choosing-strategy: 'gerrit' - wrappers: - - ssh-agent-credentials: - user: '{ssh-credentials}' - triggers: - gerrit: trigger-on: @@ -171,15 +112,15 @@ # # This job's purpose is to update all the JJB - project-type: freestyle - node: huawei-build - logrotate: - daysToKeep: 30 - numToKeep: 40 - artifactDaysToKeep: -1 - artifactNumToKeep: 5 + concurrent: true + + properties: + - throttle: + enabled: true + max-total: 3 + max-per-node: 1 parameters: - project-parameter: @@ -195,10 +136,6 @@ refspec: '' choosing-strategy: 'default' - wrappers: - - ssh-agent-credentials: - user: '{ssh-credentials}' - triggers: - gerrit: trigger-on: @@ -218,10 +155,16 @@ - job-template: name: 'compass-daily-{stream}' - project-type: freestyle - node: huawei-build + concurrent: true + + properties: + - throttle: + enabled: true + max-total: 1 + max-per-node: 1 + parameters: - project-parameter: project: '{project}' @@ -252,10 +195,10 @@ - project: 'compass-deploy-virtual-cluster' git-revision: true block: true - - trigger-builds: - - project: 'compass-deploy-virtual-cluster-odl' - git-revision: true - block: true +# - trigger-builds: +# - project: 'compass-deploy-virtual-cluster-odl' +# git-revision: true +# block: true - trigger-builds: - project: 'compass-deploy-virtual-cluster-onos' git-revision: true @@ -264,10 +207,16 @@ - job-template: name: 'compass-build-iso' - project-type: freestyle - node: ericsson-build + concurrent: true + + properties: + - throttle: + enabled: true + max-total: 1 + max-per-node: 1 + logrotate: daysToKeep: 30 numToKeep: 10 @@ -296,10 +245,16 @@ description: "build ppa(using docker) in huawei lab" - project-type: freestyle - node: huawei-build + concurrent: true + + properties: + - throttle: + enabled: true + max-total: 1 + max-per-node: 1 + logrotate: daysToKeep: 30 numToKeep: 10 @@ -327,12 +282,18 @@ - job-template: name: 'compass-deploy-virtual-{flavor}' - project-type: freestyle - disabled: false node: '{node}' + concurrent: true + + properties: + - throttle: + enabled: true + max-total: 1 + max-per-node: 1 + parameters: - project-parameter: project: '{project}' @@ -343,14 +304,12 @@ default: '{conf}' description: "" - logrotate: daysToKeep: 30 numToKeep: 10 artifactDaysToKeep: -1 artifactNumToKeep: -1 - builders: - 'builder-compass-ci-preclean-workspace' - 'builder-compass-download-artifact' @@ -361,6 +320,44 @@ allow-empty: 'true' fingerprint: true +- job-template: + name: 'compass-deploy-bare-huawei-us' + + disabled: false + + node: 'huawei-us-deploy-bare-1' + + concurrent: true + + properties: + - throttle: + enabled: true + max-total: 1 + max-per-node: 1 + + parameters: + - project-parameter: + project: '{project}' + - compass-parameter: + installer: '{installer}' + + logrotate: + daysToKeep: 30 + numToKeep: 10 + artifactDaysToKeep: -1 + artifactNumToKeep: -1 + + builders: + - 'builder-compass-ci-preclean-workspace' + - 'builder-compass-download-artifact' + - 'builder-compass-deploy-bare' + + publishers: + - archive: + artifacts: 'ansible.log' + allow-empty: 'true' + fingerprint: true + ######################## # parameter macros ######################## @@ -393,10 +390,10 @@ description: "URL to Google Storage proxy" - string: name: installer_ip - default: "10.1.0.12" + default: "192.168.200.2" - string: name: PPA_REPO - default: "http://58.251.166.184:9999" + default: "http://205.177.226.235:9999" - string: name: PPA_CACHE default: "$WORKSPACE/work/repo/" @@ -509,6 +506,39 @@ exit $deploy_ret +- builder: + name: 'builder-compass-deploy-bare' + builders: + - shell: | + #!/bin/bash + set -x + + # log info to console + echo "Starting the deployment on baremetal environment using $INSTALLER. This could take some time..." + echo "--------------------------------------------------------" + echo + + export CONFDIR=$WORKSPACE/deploy/conf/hardware_environment/huawei_us_lab/pod1 + export ISO_URL=file://$BUILD_DIRECTORY/compass.iso + export EXTERNAL_NIC=eth0 + export INSTALL_NIC=eth1 + + cd $WORKSPACE + + ./deploy.sh --dha $CONFDIR/dha.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_juno-opnfv2/ansible.log ./ &> /dev/null + + exit $deploy_ret - builder: name: 'builder-compass-upload-artifact' @@ -532,7 +562,6 @@ gsutil cp $BUILD_DIRECTORY/opnfv.properties gs://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.properties > gsutil.properties.log 2>&1 gsutil cp $BUILD_DIRECTORY/opnfv.properties gs://$GS_URL/latest.properties > gsutil.latest.log 2>&1 - echo echo "--------------------------------------------------------" echo "Done!"