diff options
| -rw-r--r-- | jjb/functest/functest-ci-jobs.yml | 35 | ||||
| -rw-r--r-- | jjb/joid/joid-ci-jobs.yml | 99 | ||||
| -rw-r--r-- | jjb/opnfv/slave-params.yml | 28 | ||||
| -rw-r--r-- | jjb/yardstick/yardstick-ci-jobs.yml | 70 |
4 files changed, 123 insertions, 109 deletions
diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml index 1ccaa1b10..24673612b 100644 --- a/jjb/functest/functest-ci-jobs.yml +++ b/jjb/functest/functest-ci-jobs.yml @@ -28,6 +28,7 @@ # that have been switched using labels for slaves #-------------------------------- pod: +# fuel CI PODs - baremetal: slave-label: fuel-baremetal installer: fuel @@ -50,6 +51,24 @@ slave-label: fuel-baremetal installer: fuel <<: *master + +# joid CI PODs + - baremetal: + slave-label: joid-baremetal + installer: joid + <<: *master + - virtual: + slave-label: joid-virtual + installer: joid + <<: *master + - baremetal: + slave-label: joid-baremetal + installer: joid + <<: *brahmaputra + - virtual: + slave-label: joid-virtual + installer: joid + <<: *brahmaputra #-------------------------------- # Installers not using labels # CI PODs @@ -72,14 +91,6 @@ slave-label: '{pod}' installer: compass <<: *brahmaputra - - intel-pod6: - slave-label: '{pod}' - installer: joid - <<: *master - - intel-pod5: - slave-label: '{pod}' - installer: joid - <<: *brahmaputra #-------------------------------- # None-CI PODs #-------------------------------- @@ -99,10 +110,6 @@ slave-label: '{pod}' installer: compass <<: *master - - virtual: - slave-label: '{pod}' - installer: joid - <<: *master - huawei-pod2: slave-label: '{pod}' installer: compass @@ -131,10 +138,6 @@ slave-label: '{pod}' installer: compass <<: *brahmaputra - - virtual: - slave-label: '{pod}' - installer: joid - <<: *brahmaputra #-------------------------------- testsuite: diff --git a/jjb/joid/joid-ci-jobs.yml b/jjb/joid/joid-ci-jobs.yml index 685e6fb6c..ddc6c1694 100644 --- a/jjb/joid/joid-ci-jobs.yml +++ b/jjb/joid/joid-ci-jobs.yml @@ -23,31 +23,38 @@ #-------------------------------- # POD, INSTALLER, AND BRANCH MAPPING #-------------------------------- -# brahmaputra +# CI PODs #-------------------------------- pod: - - intel-pod5: - <<: *brahmaputra - - orange-pod2: + - baremetal: + slave-label: joid-baremetal + <<: *master + - virtual: + slave-label: joid-virtual + <<: *master + - baremetal: + slave-label: joid-baremetal <<: *brahmaputra - virtual: + slave-label: joid-virtual <<: *brahmaputra #-------------------------------- -# master +# None-CI PODs #-------------------------------- - - intel-pod6: - <<: *master - orange-pod2: + slave-label: orange-pod2 + <<: *brahmaputra + - orange-pod2: + slave-label: orange-pod2 <<: *master - juniper-pod1: - <<: *master - - virtual: + slave-label: juniper-pod1 <<: *master #-------------------------------- # new scenario descriptions scenario: - 'os-nosdn-nofeature-noha': - auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + auto-trigger-name: 'daily-trigger-disabled' - 'os-nosdn-nofeature-ha': auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger' - 'os-odl_l2-nofeature-ha': @@ -55,13 +62,13 @@ - 'os-onos-nofeature-ha': auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger' - 'os-odl_l2-nofeature-noha': - auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + auto-trigger-name: 'daily-trigger-disabled' - 'os-onos-nofeature-noha': - auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + auto-trigger-name: 'daily-trigger-disabled' - 'os-ocl-nofeature-ha': - auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + auto-trigger-name: 'daily-trigger-disabled' - 'os-ocl-nofeature-noha': - auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + auto-trigger-name: 'daily-trigger-disabled' jobs: - 'joid-{scenario}-{pod}-daily-{stream}' @@ -78,7 +85,7 @@ properties: - throttle: enabled: true - max-total: 1 + max-total: 4 max-per-node: 1 - build-blocker: use-build-blocker: true @@ -96,7 +103,7 @@ - project-parameter: project: '{project}' - '{installer}-defaults' - - '{pod}-defaults': + - '{slave-label}-defaults': installer: '{installer}' - string: name: DEPLOY_SCENARIO @@ -141,7 +148,7 @@ properties: - throttle: enabled: true - max-total: 1 + max-total: 4 max-per-node: 1 - build-blocker: use-build-blocker: true @@ -159,7 +166,7 @@ - project-parameter: project: '{project}' - '{installer}-defaults' - - '{pod}-defaults': + - '{slave-label}-defaults': installer: '{installer}' - string: name: DEPLOY_SCENARIO @@ -194,13 +201,13 @@ ######################## # os-nosdn-nofeature-ha trigger - branch: master - trigger: - name: 'joid-os-nosdn-nofeature-ha-intel-pod5-master-trigger' + name: 'joid-os-nosdn-nofeature-ha-baremetal-master-trigger' triggers: - timed: '' - trigger: - name: 'joid-os-nosdn-nofeature-ha-intel-pod6-master-trigger' + name: 'joid-os-nosdn-nofeature-ha-virtual-master-trigger' triggers: - - timed: '#0 2 * * *' + - timed: '' - trigger: name: 'joid-os-nosdn-nofeature-ha-orange-pod2-master-trigger' triggers: @@ -209,17 +216,14 @@ 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' + name: 'joid-os-nosdn-nofeature-ha-baremetal-brahmaputra-trigger' triggers: - timed: '0 2 * * *' - trigger: - name: 'joid-os-nosdn-nofeature-ha-intel-pod6-brahmaputra-trigger' + name: 'joid-os-nosdn-nofeature-ha-virtual-brahmaputra-trigger' triggers: - timed: '' - trigger: @@ -230,21 +234,16 @@ 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' + name: 'joid-os-odl_l2-nofeature-ha-baremetal-master-trigger' triggers: - timed: '' - trigger: - name: 'joid-os-odl_l2-nofeature-ha-intel-pod6-master-trigger' + name: 'joid-os-odl_l2-nofeature-ha-virtual-master-trigger' triggers: - - timed: '#0 10 * * *' + - timed: '' - trigger: name: 'joid-os-odl_l2-nofeature-ha-orange-pod2-master-trigger' triggers: @@ -253,18 +252,14 @@ name: 'joid-os-odl_l2-nofeature-ha-juniper-pod1-master-trigger' triggers: - timed: '' -- 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-odl_l2-nofeature-ha-intel-pod5-brahmaputra-trigger' + name: 'joid-os-odl_l2-nofeature-ha-baremetal-brahmaputra-trigger' triggers: - timed: '0 10 * * *' - trigger: - name: 'joid-os-odl_l2-nofeature-ha-intel-pod6-brahmaputra-trigger' + name: 'joid-os-odl_l2-nofeature-ha-virtual-brahmaputra-trigger' triggers: - timed: '' - trigger: @@ -275,20 +270,16 @@ name: 'joid-os-odl_l2-nofeature-ha-juniper-pod1-brahmaputra-trigger' triggers: - timed: '' -- 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' + name: 'joid-os-onos-nofeature-ha-baremetal-master-trigger' triggers: - timed: '' - trigger: - name: 'joid-os-onos-nofeature-ha-intel-pod6-master-trigger' + name: 'joid-os-onos-nofeature-ha-virtual-master-trigger' triggers: - - timed: '#0 18 * * *' + - timed: '' - trigger: name: 'joid-os-onos-nofeature-ha-orange-pod2-master-trigger' triggers: @@ -297,18 +288,14 @@ 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' + name: 'joid-os-onos-nofeature-ha-baremetal-brahmaputra-trigger' triggers: - timed: '0 18 * * *' - trigger: - name: 'joid-os-onos-nofeature-ha-intel-pod6-brahmaputra-trigger' + name: 'joid-os-onos-nofeature-ha-virtual-brahmaputra-trigger' triggers: - timed: '' - trigger: @@ -319,7 +306,3 @@ name: 'joid-os-onos-nofeature-ha-juniper-pod1-brahmaputra-trigger' triggers: - timed: '' -- trigger: - name: 'joid-os-onos-nofeature-ha-virtual-brahmaputra-trigger' - triggers: - - timed: '' diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml index ddeeaab09..d89af419a 100644 --- a/jjb/opnfv/slave-params.yml +++ b/jjb/opnfv/slave-params.yml @@ -19,6 +19,34 @@ default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' - parameter: + name: 'joid-baremetal-defaults' + parameters: + - label: + name: SLAVE_LABEL + default: 'joid-baremetal' + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: 'Git URL to use on this Jenkins Slave' + - string: + name: CEPH_DISKS + default: /srv + description: "Disks to use by ceph (comma separated list)" + - string: + name: EXTERNAL_NETWORK + default: ext-net;flat;10.5.15.5;10.5.15.250;10.5.15.254;10.5.15.0/24 + description: "External network to create for pod5 (name;type;first ip;last ip; gateway;network)" +- parameter: + name: 'joid-virtual-defaults' + parameters: + - label: + name: SLAVE_LABEL + default: 'joid-virtual' + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: 'Git URL to use on this Jenkins Slave' +- parameter: name: 'lf-pod1-defaults' parameters: - node: diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml index c6630d7bc..3d59e61ce 100644 --- a/jjb/yardstick/yardstick-ci-jobs.yml +++ b/jjb/yardstick/yardstick-ci-jobs.yml @@ -28,6 +28,7 @@ # that have been switched using labels for slaves #-------------------------------- pod: +# fuel CI PODs - baremetal: slave-label: fuel-baremetal installer: fuel @@ -55,6 +56,28 @@ installer: fuel auto-trigger-name: 'brahmaputra-trigger-daily-disabled' <<: *master + +# joid CI PODs + - baremetal: + slave-label: joid-baremetal + installer: joid + auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + <<: *master + - virtual: + slave-label: joid-virtual + installer: joid + auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + <<: *master + - baremetal: + slave-label: joid-baremetal + installer: joid + auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + <<: *brahmaputra + - virtual: + slave-label: joid-virtual + installer: joid + auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + <<: *brahmaputra #-------------------------------- # Installers not using labels # CI PODs @@ -81,16 +104,6 @@ installer: compass auto-trigger-name: 'brahmaputra-trigger-daily-disabled' <<: *brahmaputra - - intel-pod6: - slave-label: '{pod}' - installer: joid - auto-trigger-name: 'brahmaputra-trigger-daily-disabled' - <<: *master - - intel-pod5: - slave-label: '{pod}' - installer: joid - auto-trigger-name: 'brahmaputra-trigger-daily-disabled' - <<: *brahmaputra #-------------------------------- # None-CI PODs #-------------------------------- @@ -137,21 +150,11 @@ installer: compass auto-trigger-name: 'yardstick-daily-huawei-pod4-trigger' <<: *master - - virtual: - slave-label: '{pod}' - installer: joid - auto-trigger-name: 'brahmaputra-trigger-daily-disabled' - <<: *master - huawei-virtual: slave-label: '{pod}' installer: compass auto-trigger-name: 'brahmaputra-trigger-daily-disabled' <<: *brahmaputra - - virtual: - slave-label: '{pod}' - installer: joid - auto-trigger-name: 'brahmaputra-trigger-daily-disabled' - <<: *brahmaputra #-------------------------------- testsuite: - 'daily' @@ -251,45 +254,42 @@ # parameter macros ######################## - parameter: - name: 'yardstick-params-intel-pod5' + name: 'yardstick-params-fuel-baremetal' parameters: - string: name: YARDSTICK_DB_BACKEND default: '-i 104.197.68.199:8086' description: 'Arguments to use in order to choose the backend DB' - - parameter: - name: 'yardstick-params-intel-pod6' + name: 'yardstick-params-fuel-virtual' parameters: - string: name: YARDSTICK_DB_BACKEND - default: '-i 104.197.68.199:8086' + default: '' description: 'Arguments to use in order to choose the backend DB' - - parameter: - name: 'yardstick-params-intel-pod8' + name: 'yardstick-params-joid-baremetal' 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: - name: 'yardstick-params-lf-pod1' + name: 'yardstick-params-joid-virtual' parameters: - string: name: YARDSTICK_DB_BACKEND - default: '-i 104.197.68.199:8086' + default: '' description: 'Arguments to use in order to choose the backend DB' - - parameter: - name: 'yardstick-params-lf-pod2' + name: 'yardstick-params-intel-pod8' parameters: - string: name: YARDSTICK_DB_BACKEND - default: '-i 104.197.68.199:8086' + default: '' description: 'Arguments to use in order to choose the backend DB' - parameter: - name: 'yardstick-params-fuel-baremetal' + name: 'yardstick-params-lf-pod1' parameters: - string: name: YARDSTICK_DB_BACKEND @@ -297,11 +297,11 @@ description: 'Arguments to use in order to choose the backend DB' - parameter: - name: 'yardstick-params-fuel-virtual' + name: 'yardstick-params-lf-pod2' 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: |