diff options
Diffstat (limited to 'jjb/compass4nfv')
| -rw-r--r-- | jjb/compass4nfv/compass-ci-jobs.yml | 459 | ||||
| -rw-r--r-- | jjb/compass4nfv/compass-deploy.sh | 7 | ||||
| -rw-r--r-- | jjb/compass4nfv/compass-dovetail-jobs.yml | 2 | ||||
| -rw-r--r-- | jjb/compass4nfv/compass-project-jobs.yml | 12 | ||||
| -rw-r--r-- | jjb/compass4nfv/compass-verify-jobs.yml | 10 | ||||
| -rw-r--r-- | jjb/compass4nfv/compass-workspace-cleanup.sh | 7 |
6 files changed, 435 insertions, 62 deletions
diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml index 477f8f53c..74236e311 100644 --- a/jjb/compass4nfv/compass-ci-jobs.yml +++ b/jjb/compass4nfv/compass-ci-jobs.yml @@ -10,12 +10,21 @@ stream: master branch: '{stream}' gs-pathname: '' + ppa-pathname: '/{stream}' disabled: false openstack-version: ocata + euphrates: &euphrates + stream: euphrates + branch: 'stable/{stream}' + disabled: false + gs-pathname: '/{stream}' + ppa-pathname: '/{stream}' + openstack-version: ocata danube: &danube stream: danube branch: 'stable/{stream}' gs-pathname: '/{stream}' + ppa-pathname: '/{stream}' disabled: false openstack-version: newton #-------------------------------- @@ -35,11 +44,11 @@ - baremetal: slave-label: compass-baremetal-branch os-version: 'xenial' - <<: *danube + <<: *euphrates - virtual: slave-label: compass-virtual-branch os-version: 'xenial' - <<: *danube + <<: *euphrates #-------------------------------- # master #-------------------------------- @@ -47,6 +56,13 @@ slave-label: 'intel-pod8' os-version: 'centos7' <<: *master +#-------------------------------- +# danube for dovetail +#-------------------------------- + - huawei-pod7: + slave-label: 'huawei-pod7' + os-version: 'xenial' + <<: *danube scenario: - 'os-nosdn-nofeature-ha': @@ -76,6 +92,33 @@ - 'os-nosdn-openo-ha': disabled: false auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger' + - 'os-odl-sfc-ha': + disabled: false + auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger' + - 'os-nosdn-ovs_dpdk-ha': + disabled: false + auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger' + - 'k8-nosdn-nofeature-ha': + disabled: false + auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger' + - 'os-nosdn-nofeature-noha': + disabled: false + auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger' + - 'os-odl_l3-nofeature-noha': + disabled: false + auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger' + - 'os-odl_l2-moon-noha': + disabled: false + auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger' + - 'os-nosdn-kvm-noha': + disabled: false + auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger' + - 'os-odl-sfc-noha': + disabled: false + auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger' + - 'os-nosdn-ovs_dpdk-noha': + disabled: false + auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger' jobs: @@ -118,6 +161,7 @@ - compass-ci-parameter: installer: '{installer}' gs-pathname: '{gs-pathname}' + ppa-pathname: '{ppa-pathname}' - string: name: DEPLOY_SCENARIO default: '{scenario}' @@ -165,7 +209,8 @@ # here the stream means the SUT stream, dovetail stream is defined in its own job # only run on os-(nosdn|odl_l2|onos|odl_l3)-nofeature-ha scenario # run against SUT master branch, dovetail docker image with latest tag - # run against SUT danube branch, dovetail docker image with latest tag(odd days)and cvp.X.X.X tag(even days) + # run against SUT danube branch, dovetail docker image with latest tag(Monday and Sunday) + # run against SUT danube branch, dovetail docker image with cvp.X.X.X tag(Tuesday, Thursday, Friday and Saturday) - conditional-step: condition-kind: and condition-operands: @@ -173,14 +218,12 @@ regex: danube label: '{stream}' - condition-kind: regex-match - regex: os-(nosdn|odl_l2|onos|odl_l3)-nofeature-ha + regex: os-(nosdn|odl_l2|odl_l3)-nofeature-ha label: '{scenario}' - condition-kind: day-of-week day-selector: select-days days: MON: true - WED: true - FRI: true SUN: true use-build-time: true steps: @@ -203,13 +246,15 @@ regex: danube label: '{stream}' - condition-kind: regex-match - regex: os-(nosdn|odl_l2|onos|odl_l3)-nofeature-ha + regex: os-(nosdn|odl_l2|odl_l3)-nofeature-ha label: '{scenario}' - condition-kind: day-of-week day-selector: select-days days: TUES: true + WED: true THURS: true + FRI: true SAT: true use-build-time: true steps: @@ -228,7 +273,7 @@ condition-kind: and condition-operands: - condition-kind: regex-match - regex: os-(nosdn|odl_l2|onos|odl_l3)-nofeature-ha + regex: os-(nosdn|odl_l2|odl_l3)-nofeature-ha label: '{scenario}' - condition-kind: regex-match regex: master @@ -245,6 +290,24 @@ build-step-failure-threshold: 'never' failure-threshold: 'never' unstable-threshold: 'FAILURE' + - conditional-step: + condition-kind: and + condition-operands: + - condition-kind: regex-match + regex: os-nosdn-nofeature-ha + label: '{scenario}' + steps: + - trigger-builds: + - project: 'bottlenecks-compass-posca_stress_ping-{pod}-daily-{stream}' + current-parameters: false + predefined-parameters: + DEPLOY_SCENARIO={scenario} + block: true + same-node: true + block-thresholds: + build-step-failure-threshold: 'never' + failure-threshold: 'never' + unstable-threshold: 'FAILURE' - job-template: name: 'compass-deploy-{pod}-daily-{stream}' @@ -281,6 +344,7 @@ - compass-ci-parameter: installer: '{installer}' gs-pathname: '{gs-pathname}' + ppa-pathname: '{ppa-pathname}' - '{slave-label}-defaults' - '{installer}-defaults' @@ -299,12 +363,9 @@ !include-raw-escape: ./compass-build.sh - shell: !include-raw-escape: ./compass-deploy.sh - builders: - - description-setter: - description: "POD: $NODE_NAME" - conditional-step: condition-kind: regex-match - regex: danube + regex: (danube|euphrates) label: '{stream}' steps: - shell: @@ -312,7 +373,6 @@ - shell: !include-raw-escape: ./compass-deploy.sh - ######################## # parameter macros ######################## @@ -327,10 +387,24 @@ name: GS_URL default: '$GS_BASE{gs-pathname}' description: "URL to Google Storage." + - string: + name: CACHE_DIRECTORY + default: "$HOME/opnfv/cache/$PROJECT{gs-pathname}" + description: "Directory where the cache to be used during the build is located." + - string: + name: PPA_REPO + default: "http://artifacts.opnfv.org/compass4nfv/package{ppa-pathname}" + - string: + name: PPA_CACHE + default: "$WORKSPACE/work/repo/" ######################## # trigger macros ######################## + +#--------------------------- +# ha-baremetal-centos-master +#--------------------------- - trigger: name: 'compass-os-nosdn-nofeature-ha-baremetal-centos-master-trigger' triggers: @@ -342,7 +416,7 @@ - trigger: name: 'compass-os-odl_l2-nofeature-ha-baremetal-centos-master-trigger' triggers: - - timed: '0 23 * * *' + - timed: '' - trigger: name: 'compass-os-odl_l3-nofeature-ha-baremetal-centos-master-trigger' triggers: @@ -367,11 +441,133 @@ name: 'compass-os-nosdn-kvm-ha-baremetal-centos-master-trigger' triggers: - timed: '' +- trigger: + name: 'compass-os-nosdn-ovs_dpdk-ha-baremetal-centos-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'compass-os-odl-sfc-ha-baremetal-centos-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'compass-k8-nosdn-nofeature-ha-baremetal-centos-master-trigger' + triggers: + - timed: '' +#----------------------------- +# noha-baremetal-centos-master +#----------------------------- +- trigger: + name: 'compass-os-nosdn-nofeature-noha-baremetal-centos-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'compass-os-odl_l3-nofeature-noha-baremetal-centos-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'compass-os-odl_l2-moon-noha-baremetal-centos-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'compass-os-nosdn-kvm-noha-baremetal-centos-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'compass-os-odl-sfc-noha-baremetal-centos-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'compass-os-nosdn-ovs_dpdk-noha-baremetal-centos-master-trigger' + triggers: + - timed: '' + +#--------------------------- +# ha-huawei-pod7-danube +#--------------------------- +- trigger: + name: 'compass-os-nosdn-nofeature-ha-huawei-pod7-danube-trigger' + triggers: + - timed: '' #'0 19 * * *' +- trigger: + name: 'compass-os-nosdn-openo-ha-huawei-pod7-danube-trigger' + triggers: + - timed: '' +- trigger: + name: 'compass-os-odl_l2-nofeature-ha-huawei-pod7-danube-trigger' + triggers: + - timed: '' #'0 21 * * *' +- trigger: + name: 'compass-os-odl_l3-nofeature-ha-huawei-pod7-danube-trigger' + triggers: + - timed: '' #'0 15 * * *' +- trigger: + name: 'compass-os-onos-nofeature-ha-huawei-pod7-danube-trigger' + triggers: + - timed: '' +- trigger: + name: 'compass-os-ocl-nofeature-ha-huawei-pod7-danube-trigger' + triggers: + - timed: '' +- trigger: + name: 'compass-os-onos-sfc-ha-huawei-pod7-danube-trigger' + triggers: + - timed: '' +- trigger: + name: 'compass-os-odl_l2-moon-ha-huawei-pod7-danube-trigger' + triggers: + - timed: '' +- trigger: + name: 'compass-os-nosdn-kvm-ha-huawei-pod7-danube-trigger' + triggers: + - timed: '' +- trigger: + name: 'compass-os-nosdn-ovs_dpdk-ha-huawei-pod7-danube-trigger' + triggers: + - timed: '' +- trigger: + name: 'compass-os-odl-sfc-ha-huawei-pod7-danube-trigger' + triggers: + - timed: '' +- trigger: + name: 'compass-k8-nosdn-nofeature-ha-huawei-pod7-danube-trigger' + triggers: + - timed: '' + +#----------------------------- +# noha-huawei-pod7-danube +#----------------------------- +- trigger: + name: 'compass-os-nosdn-nofeature-noha-huawei-pod7-danube-trigger' + triggers: + - timed: '' +- trigger: + name: 'compass-os-odl_l3-nofeature-noha-huawei-pod7-danube-trigger' + triggers: + - timed: '' +- trigger: + name: 'compass-os-odl_l2-moon-noha-huawei-pod7-danube-trigger' + triggers: + - timed: '' +- trigger: + name: 'compass-os-nosdn-kvm-noha-huawei-pod7-danube-trigger' + triggers: + - timed: '' +- trigger: + name: 'compass-os-odl-sfc-noha-huawei-pod7-danube-trigger' + triggers: + - timed: '' +- trigger: + name: 'compass-os-nosdn-ovs_dpdk-noha-huawei-pod7-danube-trigger' + triggers: + - timed: '' +#-------------------- +# ha-baremetal-master +#-------------------- - trigger: name: 'compass-os-nosdn-nofeature-ha-baremetal-master-trigger' triggers: - - timed: '0 2 * * *' + - timed: '0 20 * * *' - trigger: name: 'compass-os-nosdn-openo-ha-baremetal-master-trigger' triggers: @@ -379,7 +575,7 @@ - trigger: name: 'compass-os-odl_l2-nofeature-ha-baremetal-master-trigger' triggers: - - timed: '0 22 * * *' + - timed: '' - trigger: name: 'compass-os-odl_l3-nofeature-ha-baremetal-master-trigger' triggers: @@ -399,49 +595,135 @@ - trigger: name: 'compass-os-odl_l2-moon-ha-baremetal-master-trigger' triggers: - - timed: '' + - timed: '0 12 * * *' - trigger: name: 'compass-os-nosdn-kvm-ha-baremetal-master-trigger' triggers: - timed: '0 14 * * *' +- trigger: + name: 'compass-os-nosdn-ovs_dpdk-ha-baremetal-master-trigger' + triggers: + - timed: '0 16 * * *' +- trigger: + name: 'compass-k8-nosdn-nofeature-ha-baremetal-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'compass-os-odl-sfc-ha-baremetal-master-trigger' + triggers: + - timed: '0 10 * * *' +#---------------------- +# noha-baremetal-master +#---------------------- - trigger: - name: 'compass-os-nosdn-nofeature-ha-baremetal-danube-trigger' + name: 'compass-os-nosdn-kvm-noha-baremetal-master-trigger' triggers: - - timed: '0 9 * * *' + - timed: '' - trigger: - name: 'compass-os-nosdn-openo-ha-baremetal-danube-trigger' + name: 'compass-os-nosdn-nofeature-noha-baremetal-master-trigger' triggers: - - timed: '0 13 * * *' + - timed: '' - trigger: - name: 'compass-os-odl_l2-nofeature-ha-baremetal-danube-trigger' + name: 'compass-os-odl_l3-nofeature-noha-baremetal-master-trigger' triggers: - - timed: '0 17 * * *' + - timed: '' - trigger: - name: 'compass-os-odl_l3-nofeature-ha-baremetal-danube-trigger' + name: 'compass-os-odl_l2-moon-noha-baremetal-master-trigger' triggers: - - timed: '0 21 * * *' + - timed: '' - trigger: - name: 'compass-os-onos-nofeature-ha-baremetal-danube-trigger' + name: 'compass-os-odl-sfc-noha-baremetal-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'compass-os-nosdn-ovs_dpdk-noha-baremetal-master-trigger' + triggers: + - timed: '' + +#-------------------- +# ha-baremetal-euphrates +#-------------------- +- trigger: + name: 'compass-os-nosdn-nofeature-ha-baremetal-euphrates-trigger' triggers: - timed: '0 1 * * *' - trigger: - name: 'compass-os-ocl-nofeature-ha-baremetal-danube-trigger' + name: 'compass-os-nosdn-openo-ha-baremetal-euphrates-trigger' + triggers: + - timed: '' +- trigger: + name: 'compass-os-odl_l2-nofeature-ha-baremetal-euphrates-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-onos-sfc-ha-baremetal-danube-trigger' + name: 'compass-os-odl_l3-nofeature-ha-baremetal-euphrates-trigger' + triggers: + - timed: '0 21 * * *' +- trigger: + name: 'compass-os-onos-nofeature-ha-baremetal-euphrates-trigger' + triggers: + - timed: '' +- trigger: + name: 'compass-os-ocl-nofeature-ha-baremetal-euphrates-trigger' + triggers: + - timed: '' +- trigger: + name: 'compass-os-onos-sfc-ha-baremetal-euphrates-trigger' + triggers: + - timed: '' +- trigger: + name: 'compass-os-odl_l2-moon-ha-baremetal-euphrates-trigger' triggers: - timed: '0 5 * * *' - trigger: - name: 'compass-os-odl_l2-moon-ha-baremetal-danube-trigger' + name: 'compass-os-nosdn-kvm-ha-baremetal-euphrates-trigger' + triggers: + - timed: '0 13 * * *' +- trigger: + name: 'compass-os-nosdn-ovs_dpdk-ha-baremetal-euphrates-trigger' + triggers: + - timed: '0 9 * * *' +- trigger: + name: 'compass-k8-nosdn-nofeature-ha-baremetal-euphrates-trigger' + triggers: + - timed: '' +- trigger: + name: 'compass-os-odl-sfc-ha-baremetal-euphrates-trigger' + triggers: + - timed: '0 17 * * *' + +#---------------------- +# noha-baremetal-euphrates +#---------------------- +- trigger: + name: 'compass-os-nosdn-kvm-noha-baremetal-euphrates-trigger' + triggers: + - timed: '' +- trigger: + name: 'compass-os-nosdn-nofeature-noha-baremetal-euphrates-trigger' + triggers: + - timed: '' +- trigger: + name: 'compass-os-odl_l3-nofeature-noha-baremetal-euphrates-trigger' + triggers: + - timed: '' +- trigger: + name: 'compass-os-odl_l2-moon-noha-baremetal-euphrates-trigger' + triggers: + - timed: '' +- trigger: + name: 'compass-os-odl-sfc-noha-baremetal-euphrates-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-nosdn-kvm-ha-baremetal-danube-trigger' + name: 'compass-os-nosdn-ovs_dpdk-noha-baremetal-euphrates-trigger' triggers: - timed: '' +#------------------ +# ha-virtual-master +#------------------ - trigger: name: 'compass-os-nosdn-nofeature-ha-virtual-master-trigger' triggers: @@ -453,7 +735,7 @@ - trigger: name: 'compass-os-odl_l2-nofeature-ha-virtual-master-trigger' triggers: - - timed: '0 20 * * *' + - timed: '' - trigger: name: 'compass-os-odl_l3-nofeature-ha-virtual-master-trigger' triggers: @@ -473,45 +755,128 @@ - trigger: name: 'compass-os-odl_l2-moon-ha-virtual-master-trigger' triggers: - - timed: '' + - timed: '30 12 * * *' - trigger: name: 'compass-os-nosdn-kvm-ha-virtual-master-trigger' triggers: - - timed: '0 23 * * *' + - timed: '0 13 * * *' +- trigger: + name: 'compass-os-nosdn-ovs_dpdk-ha-virtual-master-trigger' + triggers: + - timed: '0 17 * * *' +- trigger: + name: 'compass-k8-nosdn-nofeature-ha-virtual-master-trigger' + triggers: + - timed: '0 12 * * *' +- trigger: + name: 'compass-os-odl-sfc-ha-virtual-master-trigger' + triggers: + - timed: '0 16 * * *' +#-------------------- +# noha-virtual-master +#-------------------- - trigger: - name: 'compass-os-nosdn-nofeature-ha-virtual-danube-trigger' + name: 'compass-os-nosdn-kvm-noha-virtual-master-trigger' triggers: - - timed: '0 21 * * *' + - timed: '30 13 * * *' +- trigger: + name: 'compass-os-nosdn-nofeature-noha-virtual-master-trigger' + triggers: + - timed: '0 14 * * *' - trigger: - name: 'compass-os-nosdn-openo-ha-virtual-danube-trigger' + name: 'compass-os-odl_l3-nofeature-noha-virtual-master-trigger' + triggers: + - timed: '0 15 * * *' +- trigger: + name: 'compass-os-odl_l2-moon-noha-virtual-master-trigger' + triggers: + - timed: '0 18 * * *' +- trigger: + name: 'compass-os-odl-sfc-noha-virtual-master-trigger' + triggers: + - timed: '0 20 * * *' +- trigger: + name: 'compass-os-nosdn-ovs_dpdk-noha-virtual-master-trigger' + triggers: + - timed: '0 11 * * *' + +#------------------ +# ha-virtual-euphrates +#------------------ +- trigger: + name: 'compass-os-nosdn-nofeature-ha-virtual-euphrates-trigger' + triggers: + - timed: '0 23 * * *' +- trigger: + name: 'compass-os-nosdn-openo-ha-virtual-euphrates-trigger' + triggers: + - timed: '' +- trigger: + name: 'compass-os-odl_l2-nofeature-ha-virtual-euphrates-trigger' + triggers: + - timed: '' +- trigger: + name: 'compass-os-odl_l3-nofeature-ha-virtual-euphrates-trigger' triggers: - timed: '0 22 * * *' - trigger: - name: 'compass-os-odl_l2-nofeature-ha-virtual-danube-trigger' + name: 'compass-os-onos-nofeature-ha-virtual-euphrates-trigger' + triggers: + - timed: '' +- trigger: + name: 'compass-os-ocl-nofeature-ha-virtual-euphrates-trigger' + triggers: + - timed: '' +- trigger: + name: 'compass-os-onos-sfc-ha-virtual-euphrates-trigger' + triggers: + - timed: '' +- trigger: + name: 'compass-os-odl_l2-moon-ha-virtual-euphrates-trigger' triggers: - timed: '0 20 * * *' - trigger: - name: 'compass-os-odl_l3-nofeature-ha-virtual-danube-trigger' + name: 'compass-os-nosdn-kvm-ha-virtual-euphrates-trigger' triggers: - - timed: '0 19 * * *' + - timed: '0 16 * * *' - trigger: - name: 'compass-os-onos-nofeature-ha-virtual-danube-trigger' + name: 'compass-os-nosdn-ovs_dpdk-ha-virtual-euphrates-trigger' + triggers: + - timed: '0 14 * * *' +- trigger: + name: 'compass-os-odl-sfc-ha-virtual-euphrates-trigger' triggers: - timed: '0 18 * * *' - trigger: - name: 'compass-os-ocl-nofeature-ha-virtual-danube-trigger' + name: 'compass-k8-nosdn-nofeature-ha-virtual-euphrates-trigger' triggers: - - timed: '' + - timed: '0 13 * * *' + +#-------------------- +# noha-virtual-euphrates +#-------------------- - trigger: - name: 'compass-os-onos-sfc-ha-virtual-danube-trigger' + name: 'compass-os-nosdn-kvm-noha-virtual-euphrates-trigger' triggers: - timed: '0 15 * * *' - trigger: - name: 'compass-os-odl_l2-moon-ha-virtual-danube-trigger' + name: 'compass-os-nosdn-nofeature-noha-virtual-euphrates-trigger' triggers: - - timed: '0 14 * * *' + - timed: '0 17 * * *' - trigger: - name: 'compass-os-nosdn-kvm-ha-virtual-danube-trigger' + name: 'compass-os-odl_l3-nofeature-noha-virtual-euphrates-trigger' triggers: - - timed: '' + - timed: '0 23 * * *' +- trigger: + name: 'compass-os-odl_l2-moon-noha-virtual-euphrates-trigger' + triggers: + - timed: '0 21 * * *' +- trigger: + name: 'compass-os-odl-sfc-noha-virtual-euphrates-trigger' + triggers: + - timed: '0 19 * * *' +- trigger: + name: 'compass-os-nosdn-ovs_dpdk-noha-virtual-euphrates-trigger' + triggers: + - timed: '0 12 * * *' diff --git a/jjb/compass4nfv/compass-deploy.sh b/jjb/compass4nfv/compass-deploy.sh index 88327abcf..ad069a57c 100644 --- a/jjb/compass4nfv/compass-deploy.sh +++ b/jjb/compass4nfv/compass-deploy.sh @@ -39,6 +39,8 @@ elif [[ "${DEPLOY_SCENARIO}" =~ "-onos" ]]; then export NETWORK_CONF_FILE=network_onos.yml elif [[ "${DEPLOY_SCENARIO}" =~ "-openo" ]]; then export NETWORK_CONF_FILE=network_openo.yml +elif [[ "${DEPLOY_SCENARIO}" =~ "-ovs_dpdk" ]]; then + export NETWORK_CONF_FILE=network_dpdk.yml else export NETWORK_CONF_FILE=network.yml fi @@ -50,6 +52,11 @@ fi if [[ "$NODE_NAME" =~ "-virtual" ]]; then export NETWORK_CONF=$CONFDIR/vm_environment/$NODE_NAME/${NETWORK_CONF_FILE} export DHA_CONF=$CONFDIR/vm_environment/${DEPLOY_SCENARIO}.yml + if [[ "${DEPLOY_SCENARIO}" =~ "-moon-noha" ]]; then + export VIRT_NUMBER=3 + elif [[ "${DEPLOY_SCENARIO}" =~ "-noha" ]]; then + export VIRT_NUMBER=2 + fi else export INSTALL_NIC=eth1 export NETWORK_CONF=$CONFDIR/hardware_environment/$NODE_NAME/${NETWORK_CONF_FILE} diff --git a/jjb/compass4nfv/compass-dovetail-jobs.yml b/jjb/compass4nfv/compass-dovetail-jobs.yml index 67d1e4eee..101db8241 100644 --- a/jjb/compass4nfv/compass-dovetail-jobs.yml +++ b/jjb/compass4nfv/compass-dovetail-jobs.yml @@ -19,7 +19,7 @@ #------------------------------------ pod: - baremetal: - slave-label: compass-baremetal + slave-label: compass-baremetal-branch os-version: 'xenial' <<: *danube #----------------------------------- diff --git a/jjb/compass4nfv/compass-project-jobs.yml b/jjb/compass4nfv/compass-project-jobs.yml index 59482459e..fe9170578 100644 --- a/jjb/compass4nfv/compass-project-jobs.yml +++ b/jjb/compass4nfv/compass-project-jobs.yml @@ -19,16 +19,21 @@ gs-pathname: '/{stream}' ppa-pathname: '/{stream}' disabled: false + - euphrates: + branch: 'stable/{stream}' + gs-pathname: '/{stream}' + ppa-pathname: '/{stream}' + disabled: false jobs: - - 'compass-build-iso-{stream}' + - '{installer}-build-daily-{stream}' - 'compass-build-ppa-{stream}' ######################## # job templates ######################## - job-template: - name: 'compass-build-iso-{stream}' + name: '{installer}-build-daily-{stream}' disabled: '{obj:disabled}' @@ -64,8 +69,7 @@ !include-raw-escape: ./compass-build.sh - shell: !include-raw-escape: ./compass-upload-artifact.sh - - shell: - !include-raw-escape: ./compass-workspace-cleanup.sh + - 'clean-workspace' - job-template: name: 'compass-build-ppa-{stream}' diff --git a/jjb/compass4nfv/compass-verify-jobs.yml b/jjb/compass4nfv/compass-verify-jobs.yml index f016b91c7..f4fe8f66c 100644 --- a/jjb/compass4nfv/compass-verify-jobs.yml +++ b/jjb/compass4nfv/compass-verify-jobs.yml @@ -158,15 +158,19 @@ projects: - name: 'functest-compass-virtual-suite-{stream}' current-parameters: false - predefined-parameters: - FUNCTEST_SUITE_NAME=healthcheck + predefined-parameters: | + FUNCTEST_MODE=tier + FUNCTEST_TIER=healthcheck + DEPLOY_SCENARIO=os-nosdn-nofeature-ha node-parameters: true kill-phase-on: NEVER abort-all-job: true - name: 'functest-compass-virtual-suite-{stream}' current-parameters: false - predefined-parameters: + predefined-parameters: | + FUNCTEST_MODE=testcase FUNCTEST_SUITE_NAME=vping_ssh + DEPLOY_SCENARIO=os-nosdn-nofeature-ha node-parameters: true kill-phase-on: NEVER abort-all-job: true diff --git a/jjb/compass4nfv/compass-workspace-cleanup.sh b/jjb/compass4nfv/compass-workspace-cleanup.sh deleted file mode 100644 index 98201af9b..000000000 --- a/jjb/compass4nfv/compass-workspace-cleanup.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -set -o errexit -set -o nounset -set -o pipefail - -# delete everything that is in $WORKSPACE -/bin/rm -rf $WORKSPACE
\ No newline at end of file |