X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Ffunctest%2Ffunctest-ci-jobs.yml;h=7120790d8c9ee73aefc0c5d5b7a35e726f320cd8;hb=3065cdbb3d3b0c69c484e4d2b4c295d8babe1e2c;hp=5db40a3d7056b5519d11c6dcb265f4e881601144;hpb=345abdddd5d263b53e3104c1cb9f657515521f77;p=releng.git diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml index 5db40a3d7..7120790d8 100644 --- a/jjb/functest/functest-ci-jobs.yml +++ b/jjb/functest/functest-ci-jobs.yml @@ -14,103 +14,165 @@ branch: '{stream}' gs-pathname: '' docker-tag: 'latest' - brahmaputra: &brahmaputra - stream: brahmaputra + colorado: &colorado + stream: colorado branch: 'stable/{stream}' gs-pathname: '/{stream}' docker-tag: 'stable' #-------------------------------- # POD, INSTALLER, AND BRANCH MAPPING #-------------------------------- -# brahmaputra +# Installers using labels +# CI PODs +# This section should only contain the installers +# that have been switched using labels for slaves #-------------------------------- pod: - - lf-pod1: - installer: apex - <<: *brahmaputra - - intel-pod5: - installer: joid - <<: *brahmaputra - - orange-pod2: - installer: joid - <<: *brahmaputra - - huawei-pod1: - installer: compass - <<: *brahmaputra - - ericsson-pod1: +# fuel CI PODs + - baremetal: + slave-label: fuel-baremetal installer: fuel - <<: *brahmaputra - - ericsson-pod2: + <<: *master + - virtual: + slave-label: fuel-virtual installer: fuel - <<: *brahmaputra - - lf-pod2: + <<: *master + - baremetal: + slave-label: fuel-baremetal installer: fuel - <<: *brahmaputra + <<: *colorado - virtual: + slave-label: fuel-virtual installer: fuel - <<: *brahmaputra - - huawei-virtual: - installer: compass - <<: *brahmaputra + <<: *colorado +# joid CI PODs + - baremetal: + slave-label: joid-baremetal + installer: joid + <<: *master - virtual: + slave-label: joid-virtual installer: joid - <<: *brahmaputra - - arm-pod1: - installer: fuel - <<: *brahmaputra -#-------------------------------- -# master -#-------------------------------- - - lf-pod2: - installer: fuel <<: *master - - intel-pod6: + - baremetal: + slave-label: joid-baremetal installer: joid + <<: *colorado + - virtual: + slave-label: joid-virtual + installer: joid + <<: *colorado +# compass CI PODs + - baremetal: + slave-label: compass-baremetal + installer: compass + <<: *master + - virtual: + slave-label: compass-virtual + installer: compass <<: *master - - intel-pod8: + - baremetal: + slave-label: compass-baremetal installer: compass + <<: *colorado + - virtual: + slave-label: compass-virtual + installer: compass + <<: *colorado +# apex CI PODs + - apex-verify-master: + slave-label: '{pod}' + installer: apex <<: *master - - intel-pod7: + - apex-daily-master: + slave-label: '{pod}' installer: apex <<: *master - - ericsson-pod1: + - apex-verify-colorado: + slave-label: '{pod}' + installer: apex + <<: *colorado + - apex-daily-colorado: + slave-label: '{pod}' + installer: apex + <<: *colorado +# armband CI PODs + - armband-baremetal: + slave-label: armband-baremetal installer: fuel <<: *master - - orange-pod5: + - armband-virtual: + slave-label: armband-virtual installer: fuel <<: *master - - orange-pod2: + - armband-baremetal: + slave-label: armband-baremetal + installer: fuel + <<: *colorado + - armband-virtual: + slave-label: armband-virtual + installer: fuel + <<: *colorado +#-------------------------------- +# None-CI PODs +#-------------------------------- + - orange-pod1: + slave-label: '{pod}' installer: joid <<: *master - - virtual: + - orange-pod5: + slave-label: '{pod}' installer: fuel <<: *master - - huawei-virtual: - installer: compass - <<: *master - - virtual: + - orange-pod2: + slave-label: '{pod}' installer: joid <<: *master - huawei-pod2: - installer: compass - <<: *master - - huawei-pod1: + slave-label: '{pod}' installer: compass <<: *master - nokia-pod1: + slave-label: '{pod}' installer: apex <<: *master - - arm-pod1: + - arm-pod2: + slave-label: '{pod}' + installer: fuel + <<: *master + - zte-pod1: + slave-label: '{pod}' installer: fuel <<: *master - zte-pod1: + slave-label: '{pod}' + installer: fuel + <<: *colorado + - zte-pod2: + slave-label: '{pod}' + installer: fuel + <<: *master + - zte-pod3: + slave-label: '{pod}' installer: fuel <<: *master + - zte-pod3: + slave-label: '{pod}' + installer: fuel + <<: *colorado + - arm-pod2: + slave-label: '{pod}' + installer: fuel + <<: *colorado #-------------------------------- testsuite: - - 'daily' - - 'suite' + - 'suite': + job-timeout: 60 + - 'daily': + job-timeout: 180 + - 'weekly': + job-timeout: 400 jobs: - 'functest-{installer}-{pod}-{testsuite}-{stream}' @@ -127,19 +189,20 @@ - throttle: enabled: true max-per-node: 1 + option: 'project' wrappers: - build-name: name: '$BUILD_NUMBER Suite: $FUNCTEST_SUITE_NAME Scenario: $DEPLOY_SCENARIO' - timeout: - timeout: 400 + timeout: '{job-timeout}' abort: true parameters: - project-parameter: project: '{project}' - - '{pod}-defaults' - '{installer}-defaults' + - '{slave-label}-defaults' - 'functest-{testsuite}-parameter' - string: name: DEPLOY_SCENARIO @@ -158,6 +221,8 @@ branch: '{branch}' builders: + - description-setter: + description: "POD: $NODE_NAME" - 'functest-{testsuite}-builder' ######################## @@ -169,23 +234,40 @@ - string: name: FUNCTEST_SUITE_NAME default: 'daily' - description: "Suite name to run" + description: "Daily suite name to run" +- parameter: + name: functest-weekly-parameter + parameters: + - string: + name: FUNCTEST_SUITE_NAME + default: 'weekly' + description: "Weekly suite name to run" - parameter: name: functest-suite-parameter parameters: - choice: name: FUNCTEST_SUITE_NAME choices: - - 'tempest' - - 'rally' + - 'healthcheck' + - 'vping_userdata' + - 'vping_ssh' + - 'tempest_smoke_serial' + - 'rally_sanity' - 'odl' - 'onos' - - 'ovno' - 'promise' - 'doctor' + - 'bgpvpn' + - 'security_scan' + - 'tempest_full_parallel' + - 'rally_full' - 'vims' - - 'vping_userdata' - - 'vping_ssh' + - 'multisite' + - 'parser' + - string: + name: TESTCASE_OPTIONS + default: '' + description: 'Addtional parameters specific to test case(s)' - parameter: name: functest-parameter parameters: @@ -203,7 +285,7 @@ description: "Push the results of all the tests to the resultDB" - string: name: CI_DEBUG - default: 'true' + default: 'false' description: "Show debug output information" ######################## # trigger macros @@ -223,6 +305,16 @@ - 'set-functest-env' - 'functest-daily' - 'functest-store-results' + - 'functest-exit' + +- builder: + name: functest-weekly-builder + builders: + - 'functest-cleanup' + - 'set-functest-env' + - 'functest-weekly' + - 'functest-store-results' + - 'functest-exit' - builder: name: functest-suite-builder @@ -231,18 +323,23 @@ - 'set-functest-env' - 'functest-suite' +- builder: + name: functest-daily + builders: + - shell: + !include-raw: ./functest-loop.sh - builder: - name: functest-suite + name: functest-weekly builders: - shell: - !include-raw: ./functest-suite.sh + !include-raw: ./functest-loop.sh - builder: - name: functest-daily + name: functest-suite builders: - shell: - !include-raw: ./functest-daily.sh + !include-raw: ./functest-suite.sh - builder: name: set-functest-env @@ -261,3 +358,9 @@ builders: - shell: !include-raw: ./functest-cleanup.sh + +- builder: + name: functest-exit + builders: + - shell: + !include-raw: ./functest-exit.sh