diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/apex/apex.yml | 64 | ||||
| -rw-r--r-- | jjb/compass4nfv/compass-ci-jobs.yml | 20 | ||||
| -rw-r--r-- | jjb/fuel/fuel-ci-jobs.yml | 142 | ||||
| -rwxr-xr-x | jjb/fuel/fuel-deploy.sh | 49 | ||||
| -rw-r--r-- | jjb/functest/functest-ci-jobs.yml | 11 | ||||
| -rw-r--r-- | jjb/joid/joid-ci-jobs.yml | 125 | ||||
| -rw-r--r-- | jjb/opnfv/opnfv-docs.yml | 2 | ||||
| -rw-r--r-- | jjb/opnfv/slave-params.yml | 33 | ||||
| -rw-r--r-- | jjb/ovsnfv/ovsnfv.yml | 6 | ||||
| -rw-r--r-- | jjb/qtip/qtip-ci-jobs.yml | 55 | ||||
| -rw-r--r-- | jjb/yardstick/yardstick-ci-jobs.yml | 21 |
11 files changed, 419 insertions, 109 deletions
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml index 5f8d067d0..35e8e3da5 100644 --- a/jjb/apex/apex.yml +++ b/jjb/apex/apex.yml @@ -25,7 +25,7 @@ scenario: - 'os-odl_l2-nofeature-ha' - - 'os-odl_l2-sfc-ha' + - 'os-odl_l2-sfc-noha' - 'os-odl_l3-nofeature-ha' - 'os-onos-nofeature-ha' - 'os-opencontrail-nofeature-ha' @@ -63,7 +63,7 @@ - patchset-created-event: exclude-drafts: 'false' exclude-trivial-rebase: 'false' - exclude-no-code-change: 'false' + exclude-no-code-change: 'true' - draft-published-event - comment-added-contains-event: comment-contains-value: 'recheck' @@ -115,6 +115,12 @@ BUILD_DIRECTORY=apex-verify-{stream}/build_output git-revision: false block: true + - trigger-builds: + - project: 'apex-deploy-virtual-os-odl_l2-sfc-noha-{stream}' + predefined-parameters: + BUILD_DIRECTORY=apex-verify-{stream}/build_output + git-revision: false + block: true - 'apex-workspace-cleanup' - job-template: @@ -158,6 +164,8 @@ block: true - trigger-builds: - project: 'yardstick-apex-opnfv-jump-1-daily-{stream}' + predefined-parameters: + DEPLOY_SCENARIO={scenario} block: true block-thresholds: build-step-failure-threshold: 'never' @@ -357,6 +365,8 @@ unstable-threshold: 'FAILURE' - trigger-builds: - project: 'yardstick-apex-opnfv-jump-1-daily-{stream}' + predefined-parameters: + DEPLOY_SCENARIO=os-odl_l2-nofeature-ha block: true block-thresholds: build-step-failure-threshold: 'never' @@ -379,33 +389,37 @@ unstable-threshold: 'FAILURE' - trigger-builds: - project: 'yardstick-apex-opnfv-jump-1-daily-{stream}' + predefined-parameters: + DEPLOY_SCENARIO=os-onos-nofeature-ha + block: true + block-thresholds: + build-step-failure-threshold: 'never' + failure-threshold: 'never' + unstable-threshold: 'FAILURE' + - trigger-builds: + - project: 'apex-deploy-baremetal-os-odl_l3-nofeature-ha-{stream}' + predefined-parameters: + BUILD_DIRECTORY=apex-build-{stream}/build_output + git-revision: true + block: true + - trigger-builds: + - project: 'functest-apex-opnfv-jump-1-daily-{stream}' + predefined-parameters: + DEPLOY_SCENARIO=os-odl_l3-nofeature-ha + block: true + block-thresholds: + build-step-failure-threshold: 'never' + failure-threshold: 'never' + unstable-threshold: 'FAILURE' + - trigger-builds: + - project: 'yardstick-apex-opnfv-jump-1-daily-{stream}' + predefined-parameters: + DEPLOY_SCENARIO=os-odl_l3-nofeature-ha block: true block-thresholds: build-step-failure-threshold: 'never' failure-threshold: 'never' unstable-threshold: 'FAILURE' -# - trigger-builds: -# - project: 'apex-deploy-baremetal-os-odl_l3-nofeature-ha-{stream}' -# predefined-parameters: -# BUILD_DIRECTORY=apex-build-master/build_output -# git-revision: true -# block: true -# - trigger-builds: -# - project: 'functest-apex-opnfv-jump-1-daily-{stream}' -# predefined-parameters: -# DEPLOY_SCENARIO=os-odl_l3-nofeature-ha -# block: true -# block-thresholds: -# build-step-failure-threshold: 'never' -# failure-threshold: 'never' -# unstable-threshold: 'FAILURE' -# - trigger-builds: -# - project: 'yardstick-apex-opnfv-jump-1-daily-{stream}' -# block: true -# block-thresholds: -# build-step-failure-threshold: 'never' -# failure-threshold: 'never' -# unstable-threshold: 'FAILURE' ######################## # parameter macros @@ -598,7 +612,7 @@ fi RPM_LIST=$RPM_INSTALL_PATH - for pkg in common undercloud; do + for pkg in common undercloud opendaylight-sfc; do RPM_LIST+=" ${RPM_INSTALL_PATH/opnfv-apex/opnfv-apex-${pkg}}" done diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml index 5564d6989..297e4f95b 100644 --- a/jjb/compass4nfv/compass-ci-jobs.yml +++ b/jjb/compass4nfv/compass-ci-jobs.yml @@ -209,7 +209,7 @@ - trigger: name: 'compass-os-nosdn-nofeature-ha-huawei-us-deploy-bare-1-trigger' triggers: - - timed: '0 3,9 * * * ' + - timed: '0 3 * * * ' - trigger: name: 'compass-os-odl_l2-nofeature-ha-huawei-us-deploy-bare-1-trigger' triggers: @@ -221,36 +221,36 @@ - trigger: name: 'compass-os-ocl-nofeature-ha-huawei-us-deploy-bare-1-trigger' triggers: - - timed: '' + - timed: '0 9 * * *' - trigger: name: 'compass-os-nosdn-nofeature-ha-intel-pod8-trigger' triggers: - - timed: '' + - timed: '0 3 * * *' - trigger: name: 'compass-os-odl_l2-nofeature-ha-intel-pod8-trigger' triggers: - - timed: '' + - timed: '0 21 * * *' - trigger: name: 'compass-os-onos-nofeature-ha-intel-pod8-trigger' triggers: - - timed: '' + - timed: '0 15 * * *' - trigger: name: 'compass-os-ocl-nofeature-ha-intel-pod8-trigger' triggers: - - timed: '' + - timed: '0 9 * * *' - trigger: name: 'compass-os-nosdn-nofeature-ha-huawei-virtual-trigger' triggers: - - timed: '0 3,9 * * *' + - timed: '0 3 * * *' - trigger: name: 'compass-os-odl_l2-nofeature-ha-huawei-virtual-trigger' triggers: - - timed: '0 15,21 * * *' + - timed: '0 21 * * *' - trigger: name: 'compass-os-onos-nofeature-ha-huawei-virtual-trigger' triggers: - - timed: '0 15,21 * * *' + - timed: '0 15 * * *' - trigger: name: 'compass-os-ocl-nofeature-ha-huawei-virtual-trigger' triggers: - - timed: '' + - timed: '0 9 * * *' diff --git a/jjb/fuel/fuel-ci-jobs.yml b/jjb/fuel/fuel-ci-jobs.yml index 6b69afe26..39a19c9b6 100644 --- a/jjb/fuel/fuel-ci-jobs.yml +++ b/jjb/fuel/fuel-ci-jobs.yml @@ -49,19 +49,21 @@ scenario: # HA scenarios - 'os-odl_l2-nofeature-ha': - auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger' + auto-trigger-name: 'brahmaputra-trigger-daily-disabled' - 'os-odl_l3-nofeature-ha': auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger' - 'os-onos-nofeature-ha': auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger' - 'os-nosdn-kvm-ha': - auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger' + auto-trigger-name: 'brahmaputra-trigger-daily-disabled' - 'os-nosdn-ovs-ha': - auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger' + auto-trigger-name: 'brahmaputra-trigger-daily-disabled' - 'os-nosdn-nofeature-ha': - auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger' + auto-trigger-name: 'brahmaputra-trigger-daily-disabled' - 'os-odl_l2-bgpvpn-ha': auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + - 'os-odl_l2-sfc-ha': + auto-trigger-name: 'brahmaputra-trigger-daily-disabled' - 'os-nosdn-kvm_ovs-ha': auto-trigger-name: 'brahmaputra-trigger-daily-disabled' - 'os-nosdn-vlan-ha': @@ -83,6 +85,8 @@ auto-trigger-name: 'brahmaputra-trigger-daily-disabled' - 'os-odl_l2-bgpvpn-noha': auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + - 'os-odl_l2-sfc-noha': + auto-trigger-name: 'brahmaputra-trigger-daily-disabled' jobs: - 'fuel-{scenario}-{pod}-daily-{stream}' @@ -135,7 +139,7 @@ same-node: true block: true - trigger-builds: - - project: 'functest-fuel-{pod}-daily-{stream}' + - project: 'yardstick-fuel-{pod}-daily-{stream}' current-parameters: false predefined-parameters: DEPLOY_SCENARIO={scenario} @@ -146,7 +150,7 @@ failure-threshold: 'never' unstable-threshold: 'FAILURE' - trigger-builds: - - project: 'yardstick-fuel-{pod}-daily-{stream}' + - project: 'functest-fuel-{pod}-daily-{stream}' current-parameters: false predefined-parameters: DEPLOY_SCENARIO={scenario} @@ -231,7 +235,7 @@ - trigger: name: 'fuel-os-nosdn-nofeature-ha-opnfv-jump-2-master-trigger' triggers: - - timed: '0 14 * * *' + - timed: '0 10 * * *' - trigger: name: 'fuel-os-nosdn-nofeature-ha-ericsson-pod1-master-trigger' triggers: @@ -255,7 +259,7 @@ - trigger: name: 'fuel-os-nosdn-nofeature-ha-ericsson-pod2-brahmaputra-trigger' triggers: - - timed: '0 14 * * *' + - timed: '0 10 * * *' - trigger: name: 'fuel-os-nosdn-nofeature-ha-virtual-brahmaputra-trigger' triggers: @@ -265,7 +269,7 @@ - trigger: name: 'fuel-os-nosdn-kvm-ha-opnfv-jump-2-master-trigger' triggers: - - timed: '0 18 * * *' + - timed: '' - trigger: name: 'fuel-os-nosdn-kvm-ha-ericsson-pod1-master-trigger' triggers: @@ -289,7 +293,7 @@ - trigger: name: 'fuel-os-nosdn-kvm-ha-ericsson-pod2-brahmaputra-trigger' triggers: - - timed: '0 18 * * *' + - timed: '' - trigger: name: 'fuel-os-nosdn-kvm-ha-virtual-brahmaputra-trigger' triggers: @@ -299,7 +303,7 @@ - trigger: name: 'fuel-os-odl_l2-nofeature-ha-opnfv-jump-2-master-trigger' triggers: - - timed: '0 2 * * *' + - timed: '0 2 * * */5' - trigger: name: 'fuel-os-odl_l2-nofeature-ha-ericsson-pod1-master-trigger' triggers: @@ -323,7 +327,7 @@ - trigger: name: 'fuel-os-odl_l2-nofeature-ha-ericsson-pod2-brahmaputra-trigger' triggers: - - timed: '0 2 * * *' + - timed: '0 2 * * */5' - trigger: name: 'fuel-os-odl_l2-nofeature-ha-virtual-brahmaputra-trigger' triggers: @@ -333,7 +337,7 @@ - trigger: name: 'fuel-os-odl_l3-nofeature-ha-opnfv-jump-2-master-trigger' triggers: - - timed: '0 6 * * *' + - timed: '0 11,23 * * *' - trigger: name: 'fuel-os-odl_l3-nofeature-ha-ericsson-pod1-master-trigger' triggers: @@ -357,7 +361,7 @@ - trigger: name: 'fuel-os-odl_l3-nofeature-ha-ericsson-pod2-brahmaputra-trigger' triggers: - - timed: '0 6 * * *' + - timed: '0 11,23 * * *' - trigger: name: 'fuel-os-odl_l3-nofeature-ha-virtual-brahmaputra-trigger' triggers: @@ -367,7 +371,7 @@ - trigger: name: 'fuel-os-onos-nofeature-ha-opnfv-jump-2-master-trigger' triggers: - - timed: '0 10 * * *' + - timed: '0 5,17 * * *' - trigger: name: 'fuel-os-onos-nofeature-ha-ericsson-pod1-master-trigger' triggers: @@ -391,7 +395,7 @@ - trigger: name: 'fuel-os-onos-nofeature-ha-ericsson-pod2-brahmaputra-trigger' triggers: - - timed: '0 10 * * *' + - timed: '0 5,17 * * *' - trigger: name: 'fuel-os-onos-nofeature-ha-virtual-brahmaputra-trigger' triggers: @@ -402,7 +406,7 @@ - trigger: name: 'fuel-os-nosdn-ovs-ha-opnfv-jump-2-master-trigger' triggers: - - timed: '0 22 * * *' + - timed: '0 15 * * *' - trigger: name: 'fuel-os-nosdn-ovs-ha-ericsson-pod1-master-trigger' triggers: @@ -426,8 +430,110 @@ - trigger: name: 'fuel-os-nosdn-ovs-ha-ericsson-pod2-brahmaputra-trigger' triggers: - - timed: '0 22 * * *' + - timed: '0 15 * * *' - trigger: name: 'fuel-os-nosdn-ovs-ha-virtual-brahmaputra-trigger' triggers: - timed: '' + +# os-odl_l2-bgpvpn-ha trigger +- trigger: + name: 'fuel-os-odl_l2-bgpvpn-ha-opnfv-jump-2-master-trigger' + triggers: + - timed: '0 20 * * *' +- trigger: + name: 'fuel-os-odl_l2-bgpvpn-ha-ericsson-pod1-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-odl_l2-bgpvpn-ha-ericsson-pod2-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-odl_l2-bgpvpn-ha-virtual-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-odl_l2-bgpvpn-ha-opnfv-jump-2-brahmaputra-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-odl_l2-bgpvpn-ha-ericsson-pod1-brahmaputra-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-odl_l2-bgpvpn-ha-ericsson-pod2-brahmaputra-trigger' + triggers: + - timed: '0 20 * * *' +- trigger: + name: 'fuel-os-odl_l2-bgpvpn-ha-virtual-brahmaputra-trigger' + triggers: + - timed: '' + +# os-odl_l2-sfc-ha trigger +- trigger: + name: 'fuel-os-odl_l2-sfc-ha-opnfv-jump-2-master-trigger' + triggers: + - timed: '0 1 * * *' +- trigger: + name: 'fuel-os-odl_l2-sfc-ha-ericsson-pod1-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-odl_l2-sfc-ha-ericsson-pod2-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-odl_l2-sfc-ha-virtual-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-odl_l2-sfc-ha-opnfv-jump-2-brahmaputra-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-odl_l2-sfc-ha-ericsson-pod1-brahmaputra-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-odl_l2-sfc-ha-ericsson-pod2-brahmaputra-trigger' + triggers: + - timed: '0 1 * * *' +- trigger: + name: 'fuel-os-odl_l2-sfc-ha-virtual-brahmaputra-trigger' + triggers: + - timed: '' + +# os-nosdn-kvm-ha trigger +- trigger: + name: 'fuel-os-nosdn-kvm-noha-opnfv-jump-2-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-nosdn-kvm-noha-ericsson-pod1-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-nosdn-kvm-noha-ericsson-pod2-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-nosdn-kvm-noha-virtual-master-trigger' + triggers: + - timed: '0 6,18 * * *' +- trigger: + name: 'fuel-os-nosdn-kvm-noha-opnfv-jump-2-brahmaputra-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-nosdn-kvm-noha-ericsson-pod1-brahmaputra-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-nosdn-kvm-noha-ericsson-pod2-brahmaputra-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-nosdn-kvm-noha-virtual-brahmaputra-trigger' + triggers: + - timed: '0 0,12 * * *' diff --git a/jjb/fuel/fuel-deploy.sh b/jjb/fuel/fuel-deploy.sh index 62f2340a8..355678fbc 100755 --- a/jjb/fuel/fuel-deploy.sh +++ b/jjb/fuel/fuel-deploy.sh @@ -88,4 +88,51 @@ $DEPLOY_COMMAND echo echo "--------------------------------------------------------" -echo "Done!" +echo "Deployment is done successfully!" + +# Quick and dirty fix for SFC scenatio - will be fixed properly post-release +if [[ ! "$DEPLOY_SCENARIO" =~ "os-odl_l2-sfc" ]]; then + exit 0 +fi + +echo +echo "SFC Scenario is deployed" +echo + +# The stuff below is here temporarily and will be fixed once the release is out +# The stuff below is here temporarily and will be fixed once the release is out +export FUEL_MASTER_IP=10.20.0.2 +export TACKER_SCRIPT_URL="https://git.opnfv.org/cgit/fuel/plain/prototypes/sfc_tacker/poc.tacker-up.sh?h=${GIT_BRANCH#*/}" +export CONTROLLER_NODE_IP=$(sshpass -pr00tme /usr/bin/ssh -o UserKnownHostsFile=/dev/null \ + -o StrictHostKeyChecking=no root@$FUEL_MASTER_IP 'fuel node list' | \ + grep opendaylight | cut -d'|' -f5) + +# we can't do much if we do not have the controller IP +if [[ ! "$CONTROLLER_NODE_IP" =~ "10.20.0" ]]; then + echo "Unable to retrieve controller IP" + exit 1 +fi + +echo +echo "Copying and executing poc.tacker-up.sh script on controller node $CONTROLLER_NODE_IP" +echo + +expect << END +spawn /usr/bin/ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -l root $::env(FUEL_MASTER_IP) +expect { + -re ".*sword.*" { + exp_send "r00tme\r" + } +} +expect "# " +send "/usr/bin/ssh -l root $::env(CONTROLLER_NODE_IP)\r" +expect "# " +send "/usr/bin/curl -o /root/poc.tacker-up.sh $::env(TACKER_SCRIPT_URL)\r" +expect "# " +send "/bin/bash /root/poc.tacker-up.sh\r" +expect "# " +send "exit\r" +expect "Connection to $::env(CONTROLLER_NODE_IP) closed. " +send "exit\r" +expect "Connection to $::env(FUEL_MASTER_IP) closed. " +END diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml index 1165b2a2c..4e6634de4 100644 --- a/jjb/functest/functest-ci-jobs.yml +++ b/jjb/functest/functest-ci-jobs.yml @@ -26,12 +26,12 @@ - opnfv-jump-1: installer: apex <<: *brahmaputra - - opnfv-jump-2: - installer: fuel - <<: *brahmaputra - intel-pod5: installer: joid <<: *brahmaputra + - orange-pod2: + installer: joid + <<: *brahmaputra - huawei-us-deploy-bare-1: installer: compass <<: *brahmaputra @@ -68,9 +68,6 @@ - ericsson-pod1: installer: fuel <<: *master - - ericsson-pod2: - installer: fuel - <<: *master - orange-test1: installer: fuel <<: *master @@ -112,7 +109,7 @@ - build-name: name: '$BUILD_NUMBER Suite: $FUNCTEST_SUITE_NAME Scenario: $DEPLOY_SCENARIO' - timeout: - timeout: 210 + timeout: 400 abort: true parameters: diff --git a/jjb/joid/joid-ci-jobs.yml b/jjb/joid/joid-ci-jobs.yml index 909a885ab..adf3022b2 100644 --- a/jjb/joid/joid-ci-jobs.yml +++ b/jjb/joid/joid-ci-jobs.yml @@ -28,6 +28,8 @@ pod: - intel-pod5: <<: *brahmaputra + - orange-pod2: + <<: *brahmaputra - virtual: <<: *brahmaputra #-------------------------------- @@ -47,13 +49,13 @@ - 'os-nosdn-nofeature-noha': auto-trigger-name: 'brahmaputra-trigger-daily-disabled' - 'os-nosdn-nofeature-ha': - auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger' - 'os-odl_l2-nofeature-ha': - auto-trigger-name: 'joid-{scenario}-{pod}-trigger' + auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger' + - 'os-onos-nofeature-ha': + auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger' - 'os-odl_l2-nofeature-noha': auto-trigger-name: 'brahmaputra-trigger-daily-disabled' - - 'os-onos-nofeature-ha': - auto-trigger-name: 'joid-{scenario}-{pod}-trigger' - 'os-onos-nofeature-noha': auto-trigger-name: 'brahmaputra-trigger-daily-disabled' - 'os-ocl-nofeature-ha': @@ -190,43 +192,134 @@ ######################## # trigger macros ######################## +# os-nosdn-nofeature-ha trigger - branch: master - trigger: - name: 'joid-os-odl_l2-nofeature-ha-intel-pod5-trigger' + name: 'joid-os-nosdn-nofeature-ha-intel-pod5-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'joid-os-nosdn-nofeature-ha-intel-pod6-master-trigger' triggers: - timed: '0 2 * * *' - trigger: - name: 'joid-os-odl_l2-nofeature-ha-intel-pod6-trigger' + name: 'joid-os-nosdn-nofeature-ha-orange-pod2-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'joid-os-nosdn-nofeature-ha-juniper-pod1-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'joid-os-nosdn-nofeature-ha-virtual-master-trigger' + triggers: + - timed: '' +# os-nosdn-nofeature-ha trigger - branch: stable/brahmaputra +- trigger: + name: 'joid-os-nosdn-nofeature-ha-intel-pod5-brahmaputra-trigger' triggers: - timed: '0 2 * * *' - trigger: - name: 'joid-os-odl_l2-nofeature-ha-orange-pod2-trigger' + name: 'joid-os-nosdn-nofeature-ha-intel-pod6-brahmaputra-trigger' + triggers: + - timed: '' +- trigger: + name: 'joid-os-nosdn-nofeature-ha-orange-pod2-brahmaputra-trigger' + triggers: + - timed: '0 2 * * *' +- trigger: + name: 'joid-os-nosdn-nofeature-ha-juniper-pod1-brahmaputra-trigger' + triggers: + - timed: '' +- trigger: + name: 'joid-os-nosdn-nofeature-ha-virtual-brahmaputra-trigger' + triggers: + - timed: '' + + +# os-odl_l2-nofeature-ha trigger - branch: master +- trigger: + name: 'joid-os-odl_l2-nofeature-ha-intel-pod5-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'joid-os-odl_l2-nofeature-ha-intel-pod6-master-trigger' + triggers: + - timed: '0 10 * * *' +- trigger: + name: 'joid-os-odl_l2-nofeature-ha-orange-pod2-master-trigger' triggers: - timed: '' - trigger: - name: 'joid-os-odl_l2-nofeature-ha-juniper-pod1-trigger' + name: 'joid-os-odl_l2-nofeature-ha-juniper-pod1-master-trigger' triggers: - timed: '' - trigger: - name: 'joid-os-odl_l2-nofeature-ha-virtual-trigger' + name: 'joid-os-odl_l2-nofeature-ha-virtual-master-trigger' triggers: - timed: '' + +# os-odl_l2-nofeature-ha trigger - branch: stable/brahmaputra - trigger: - name: 'joid-os-onos-nofeature-ha-intel-pod5-trigger' + name: 'joid-os-odl_l2-nofeature-ha-intel-pod5-brahmaputra-trigger' triggers: - - timed: '0 14 * * *' + - timed: '0 10 * * *' - trigger: - name: 'joid-os-onos-nofeature-ha-intel-pod6-trigger' + name: 'joid-os-odl_l2-nofeature-ha-intel-pod6-brahmaputra-trigger' triggers: - - timed: '0 14 * * *' + - timed: '' - trigger: - name: 'joid-os-onos-nofeature-ha-orange-pod2-trigger' + name: 'joid-os-odl_l2-nofeature-ha-orange-pod2-brahmaputra-trigger' + triggers: + - timed: '0 10 * * *' +- trigger: + name: 'joid-os-odl_l2-nofeature-ha-juniper-pod1-brahmaputra-trigger' triggers: - timed: '' - trigger: - name: 'joid-os-onos-nofeature-ha-juniper-pod1-trigger' + name: 'joid-os-odl_l2-nofeature-ha-virtual-brahmaputra-trigger' + triggers: + - timed: '' + +# os-onos-nofeature-ha trigger - branch: master +- trigger: + name: 'joid-os-onos-nofeature-ha-intel-pod5-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'joid-os-onos-nofeature-ha-intel-pod6-master-trigger' + triggers: + - timed: '0 18 * * *' +- trigger: + name: 'joid-os-onos-nofeature-ha-orange-pod2-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'joid-os-onos-nofeature-ha-juniper-pod1-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'joid-os-onos-nofeature-ha-virtual-master-trigger' + triggers: + - timed: '' + +# os-onos-nofeature-ha trigger - branch: stable/brahmaputra +- trigger: + name: 'joid-os-onos-nofeature-ha-intel-pod5-brahmaputra-trigger' + triggers: + - timed: '0 18 * * *' +- trigger: + name: 'joid-os-onos-nofeature-ha-intel-pod6-brahmaputra-trigger' + triggers: + - timed: '' +- trigger: + name: 'joid-os-onos-nofeature-ha-orange-pod2-brahmaputra-trigger' + triggers: + - timed: '0 18 * * *' +- trigger: + name: 'joid-os-onos-nofeature-ha-juniper-pod1-brahmaputra-trigger' triggers: - timed: '' - trigger: - name: 'joid-os-onos-nofeature-ha-virtual-trigger' + name: 'joid-os-onos-nofeature-ha-virtual-brahmaputra-trigger' triggers: - timed: '' diff --git a/jjb/opnfv/opnfv-docs.yml b/jjb/opnfv/opnfv-docs.yml index eb6e58b92..d7062226a 100644 --- a/jjb/opnfv/opnfv-docs.yml +++ b/jjb/opnfv/opnfv-docs.yml @@ -53,7 +53,7 @@ projects: - project-compare-type: 'REG_EXP' #Left out arno projects oscar|octopus|functest|genesis - project-pattern: 'vswitchperf|apex|availability|bottlenecks|compass4nfv|conductor|copper|doctor|dovetail|dpacc|escalator|fastpathmetrics|fuel|inspector|ipv6|joid|kvmfornfv|lsoapi|moon|movie|multisite|octopus|onosfw|ovsnfv|parser|prediction|promise|qtip|releng|rs|sdnvpn|sfc|vnf_forwarding_graph|enfv|pinpoint|pharos|cperf|functest' + project-pattern: 'vswitchperf|apex|availability|bottlenecks|compass4nfv|conductor|copper|doctor|dovetail|dpacc|escalator|fastpathmetrics|fuel|inspector|ipv6|joid|kvmfornfv|lsoapi|moon|movie|multisite|octopus|onosfw|ovsnfv|parser|prediction|promise|qtip|releng|rs|sdnvpn|sfc|vnf_forwarding_graph|enfv|pinpoint|pharos|cperf|functest|genesisreq' branches: - branch-compare-type: 'ANT' branch-pattern: '**/{branch}' diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml index 5e0274d84..5c1c58ff2 100644 --- a/jjb/opnfv/slave-params.yml +++ b/jjb/opnfv/slave-params.yml @@ -263,30 +263,45 @@ description: "Directory where the build artifact will be located upon the completion of the build." - parameter: - name: 'intel-us-build-1-defaults' + name: 'intel-build1-defaults' parameters: - node: name: SLAVE_NAME description: 'Slave name on Jenkins' allowed-slaves: - - intel-us-build-1 + - intel-build1 default-slaves: - - intel-us-build-1 + - intel-build1 - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' - parameter: - name: 'intel-us-build-2-defaults' + name: 'intel-build2-defaults' parameters: - node: name: SLAVE_NAME description: 'Slave name on Jenkins' allowed-slaves: - - intel-us-build-2 + - intel-build2 default-slaves: - - intel-us-build-2 + - intel-build2 + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: 'Git URL to use on this Jenkins Slave' + +- parameter: + name: 'intel-build3-defaults' + parameters: + - node: + name: SLAVE_NAME + description: 'Slave name on Jenkins' + allowed-slaves: + - intel-build3 + default-slaves: + - intel-build3 - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT @@ -399,15 +414,15 @@ description: 'Git URL to use on these Jenkins Slaves' - parameter: - name: 'intel-us-deploy-virtual-2-defaults' + name: 'intel-virtual2-defaults' parameters: - node: name: SLAVE_NAME description: 'Slave name on Jenkins' allowed-slaves: - - intel-us-deploy-virtual-2 + - intel-virtual2 default-slaves: - - intel-us-deploy-virtual-2 + - intel-virtual2 - string: name: INSTALLER_VERSION default: latest diff --git a/jjb/ovsnfv/ovsnfv.yml b/jjb/ovsnfv/ovsnfv.yml index d0c180c5b..8a119d9fb 100644 --- a/jjb/ovsnfv/ovsnfv.yml +++ b/jjb/ovsnfv/ovsnfv.yml @@ -24,7 +24,7 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' - - 'intel-us-build-2-defaults' + - 'intel-build2-defaults' - string: name: GS_URL default: '$GS_BASE{gs-pathname}' @@ -73,7 +73,7 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' - - 'intel-us-build-2-defaults' + - 'intel-build2-defaults' - string: name: GS_URL default: '$GS_BASE{gs-pathname}' @@ -114,7 +114,7 @@ parameters: - project-parameter: project: '{project}' - - 'intel-us-build-2-defaults' + - 'intel-build2-defaults' - string: name: GS_URL default: '$GS_BASE{gs-pathname}' diff --git a/jjb/qtip/qtip-ci-jobs.yml b/jjb/qtip/qtip-ci-jobs.yml index d33bdda32..8dd0a4af0 100644 --- a/jjb/qtip/qtip-ci-jobs.yml +++ b/jjb/qtip/qtip-ci-jobs.yml @@ -25,12 +25,15 @@ pod: - dell-us-testing-bm-1: installer: compass + auto-trigger-name: 'qtip-daily-dell-us-testing-bm-1-trigger' <<: *brahmaputra - orange-pod2: installer: joid + auto-trigger-name: 'brahmaputra-trigger-daily-disabled' <<: *brahmaputra - dell-us-deploying-bm3: installer: fuel + auto-trigger-name: 'qtip-daily-dell-us-deploying-bm3-trigger' <<: *brahmaputra #-------------------------------- @@ -39,6 +42,7 @@ - juniper-pod1: installer: joid <<: *master + auto-trigger-name: 'brahmaputra-trigger-daily-disabled' # - zte-build-1: #would be confirmed with the ZTE lab by tomorrow # installer: fuel # <<: *master @@ -56,19 +60,22 @@ disabled: false parameters: - - project-parameter: - project: '{project}' - - '{pod}-defaults' - - '{installer}-defaults' - - string: - name: DEPLOY_SCENARIO - default: 'os-nosdn-nofeature-ha' + - project-parameter: + project: '{project}' + - '{pod}-defaults' + - '{installer}-defaults' + - string: + name: DEPLOY_SCENARIO + default: 'os-nosdn-nofeature-ha' scm: - - git-scm: - credentials-id: '{ssh-credentials}' - refspec: '' - branch: '{branch}' + - git-scm: + credentials-id: '{ssh-credentials}' + refspec: '' + branch: '{branch}' + + triggers: + - '{auto-trigger-name}' builders: - 'qtip-cleanup' @@ -158,3 +165,29 @@ docker rmi opnfv/qtip:$tag done fi + +################# +#trigger macros +################# + +- trigger: + name: 'qtip-daily-dell-us-deploying-bm3-trigger' + triggers: + - timed: '0 0 * * *' + +- trigger: + name: 'qtip-daily-dell-us-testing-bm-1-trigger' + triggers: + - timed: '0 3 * * *' + +#- trigger: +# name: 'qtip-daily-juniper-build1-trigger' +# triggers: +# - timed : '0 0 * * *' + +#- trigger: +# name: 'qtip-dailty-orange-fr-pod2-trigger' +# triggers: +# - timed : ' 0 0 * * *' + + diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml index 92c2cfc98..dc209159c 100644 --- a/jjb/yardstick/yardstick-ci-jobs.yml +++ b/jjb/yardstick/yardstick-ci-jobs.yml @@ -38,6 +38,11 @@ suite: daily auto-trigger-name: 'brahmaputra-trigger-daily-disabled' <<: *brahmaputra + - orange-pod2: + installer: joid + suite: daily + auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + <<: *brahmaputra - huawei-us-deploy-bare-1: installer: compass suite: daily @@ -293,7 +298,7 @@ parameters: - string: name: YARDSTICK_DB_BACKEND - default: '' + default: '-i 104.197.68.199:8086' description: 'Arguments to use in order to choose the backend DB' - parameter: @@ -301,7 +306,7 @@ parameters: - string: name: YARDSTICK_DB_BACKEND - default: '' + default: '-i 104.197.68.199:8086' description: 'Arguments to use in order to choose the backend DB' - parameter: @@ -317,7 +322,7 @@ parameters: - string: name: YARDSTICK_DB_BACKEND - default: '-i 10.118.36.90:8086' + default: '-i 104.197.68.199:8086' description: 'Arguments to use in order to choose the backend DB' - parameter: @@ -325,7 +330,7 @@ parameters: - string: name: YARDSTICK_DB_BACKEND - default: '-i 10.118.36.90:8086' + default: '-i 104.197.68.199:8086' description: 'Arguments to use in order to choose the backend DB' - parameter: @@ -333,7 +338,7 @@ parameters: - string: name: YARDSTICK_DB_BACKEND - default: '-r 213.77.62.197/results' + default: '-i 104.197.68.199:8086' description: 'Arguments to use in order to choose the backend DB' - parameter: @@ -341,7 +346,7 @@ parameters: - string: name: YARDSTICK_DB_BACKEND - default: '-r 213.77.62.197/results' + default: '-i 104.197.68.199:8086' description: 'Arguments to use in order to choose the backend DB' - parameter: @@ -349,7 +354,7 @@ parameters: - string: name: YARDSTICK_DB_BACKEND - default: '' + default: '-i 104.197.68.199:8086' description: 'Arguments to use in order to choose the backend DB' - parameter: @@ -365,7 +370,7 @@ parameters: - string: name: YARDSTICK_DB_BACKEND - default: '' + default: '-i 104.197.68.199:8086' description: 'Arguments to use in order to choose the backend DB' - parameter: |