diff options
| -rw-r--r-- | jjb/functest/functest-ci-jobs.yml | 45 | ||||
| -rwxr-xr-x | jjb/functest/functest-loop.sh (renamed from jjb/functest/functest-daily.sh) | 0 |
2 files changed, 35 insertions, 10 deletions
diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml index 3a07d6549..f9cf01162 100644 --- a/jjb/functest/functest-ci-jobs.yml +++ b/jjb/functest/functest-ci-jobs.yml @@ -134,6 +134,7 @@ testsuite: - 'daily' + - 'weekly' - 'suite' jobs: @@ -196,7 +197,14 @@ - 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: @@ -204,16 +212,19 @@ name: FUNCTEST_SUITE_NAME choices: - 'healthcheck' - - 'tempest' - - 'rally' + - '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' - parameter: name: functest-parameter parameters: @@ -253,6 +264,14 @@ - 'functest-store-results' - builder: + name: functest-weekly-builder + builders: + - 'functest-cleanup' + - 'set-functest-env' + - 'functest-weekly' + - 'functest-store-results' + +- builder: name: functest-suite-builder builders: - 'functest-cleanup' @@ -260,16 +279,22 @@ - 'functest-suite' - builder: - name: functest-suite + name: functest-daily builders: - shell: - !include-raw: ./functest-suite.sh + !include-raw: ./functest-loop.sh - builder: - name: functest-daily + name: functest-weekly builders: - shell: - !include-raw: ./functest-daily.sh + !include-raw: ./functest-loop.sh + +- builder: + name: functest-suite + builders: + - shell: + !include-raw: ./functest-suite.sh - builder: name: set-functest-env diff --git a/jjb/functest/functest-daily.sh b/jjb/functest/functest-loop.sh index 5abddfd84..5abddfd84 100755 --- a/jjb/functest/functest-daily.sh +++ b/jjb/functest/functest-loop.sh |