diff options
| -rw-r--r-- | jjb/armband/armband-ci-jobs.yml | 9 | ||||
| -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 | ||||
| -rw-r--r-- | jjb/opnfv/slave-params.yml | 28 |
4 files changed, 72 insertions, 10 deletions
diff --git a/jjb/armband/armband-ci-jobs.yml b/jjb/armband/armband-ci-jobs.yml index 3d0db6587..53c652eaf 100644 --- a/jjb/armband/armband-ci-jobs.yml +++ b/jjb/armband/armband-ci-jobs.yml @@ -23,6 +23,8 @@ pod: - arm-pod1: <<: *brahmaputra + - arm-pod2: + <<: *brahmaputra #-------------------------------- # master #-------------------------------- @@ -193,3 +195,10 @@ name: 'armband-os-odl_l2-nofeature-ha-arm-pod1-brahmaputra-trigger' triggers: - timed: '0 18 * * *' +#--------------------------------------------------------------- +# Enea Armband POD 2 Triggers running against brahmaputra branch +#--------------------------------------------------------------- +- trigger: + name: 'armband-os-odl_l2-nofeature-ha-arm-pod2-brahmaputra-trigger' + triggers: + - timed: '' 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 diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml index da0808b76..e5313c801 100644 --- a/jjb/opnfv/slave-params.yml +++ b/jjb/opnfv/slave-params.yml @@ -621,6 +621,34 @@ name: LAB_CONFIG_URL default: ssh://git@git.enea.com/pharos/lab-config description: 'Base URI to the configuration directory' + +- parameter: + name: 'arm-pod2-defaults' + parameters: + - node: + name: SLAVE_NAME + description: 'Slave name on Jenkins' + allowed-slaves: + - arm-pod2 + default-slaves: + - arm-pod2 + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: 'Git URL to use on this Jenkins Slave' + - string: + name: DEFAULT_BRIDGE + default: 'admin_br0,public_br0' + desciption: 'The bridge to use for Fuel PXE booting. It can be a comma sparated list of bridges, in which case the first is the PXE boot bridge, and all subsequent interfaces that will be added to the VM. If left empty, most deploy scripts will default to pxebr.' + - string: + name: DEPLOY_TIMEOUT + default: '360' + description: 'Deployment timeout in minutes' + - string: + name: LAB_CONFIG_URL + default: ssh://git@git.enea.com/pharos/lab-config + description: 'Base URI to the configuration directory' + - parameter: name: 'opnfv-build-centos-defaults' parameters: |