diff options
Diffstat (limited to 'jjb/fuel')
| -rw-r--r-- | jjb/fuel/fuel-daily-jobs.yaml | 204 | ||||
| -rwxr-xr-x | jjb/fuel/fuel-deploy.sh | 6 | ||||
| -rw-r--r-- | jjb/fuel/fuel-docker-jobs.yaml | 8 | ||||
| -rw-r--r-- | jjb/fuel/fuel-project-jobs.yaml | 10 | ||||
| -rw-r--r-- | jjb/fuel/fuel-verify-jobs.yaml | 6 |
5 files changed, 164 insertions, 70 deletions
diff --git a/jjb/fuel/fuel-daily-jobs.yaml b/jjb/fuel/fuel-daily-jobs.yaml index 73d33d63b..936187ccb 100644 --- a/jjb/fuel/fuel-daily-jobs.yaml +++ b/jjb/fuel/fuel-daily-jobs.yaml @@ -21,6 +21,11 @@ branch: 'stable/{stream}' disabled: false gs-pathname: '/{stream}' + gambia: &gambia + stream: gambia + branch: 'stable/{stream}' + disabled: false + gs-pathname: '/{stream}' # ------------------------------- # POD, INSTALLER, AND BRANCH MAPPING # ------------------------------- @@ -35,9 +40,12 @@ <<: *master - baremetal: slave-label: fuel-baremetal - <<: *fraser + <<: *gambia - virtual: slave-label: fuel-virtual + <<: *gambia + - baremetal: + slave-label: fuel-baremetal <<: *fraser # ------------------------------- # None-CI PODs @@ -65,6 +73,8 @@ auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger' - 'os-odl-nofeature-noha': auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger' + - 'os-odl-sfc-noha': + auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger' - 'os-ovn-nofeature-noha': auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger' - 'os-odl-ovs-noha': @@ -75,12 +85,25 @@ auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger' exclude: + # Dovetail (and only it) should run against Fraser HA baremetal scenarios + - scenario: os-nosdn-nofeature-noha + stream: fraser + - scenario: os-odl-nofeature-noha + stream: fraser + - scenario: os-odl-sfc-noha + stream: fraser - scenario: os-odl-ovs-noha stream: fraser - - scenario: os-nosdn-vpp-ha + - scenario: os-ovn-nofeature-noha + stream: fraser + - scenario: os-nosdn-ovs-noha stream: fraser - scenario: os-nosdn-vpp-noha stream: fraser + - scenario: os-ovn-nofeature-ha + stream: fraser + - scenario: os-nosdn-vpp-ha + stream: fraser jobs: - 'fuel-{scenario}-{pod}-daily-{stream}' @@ -109,7 +132,7 @@ blocking-jobs: - 'fuel-os-.*?-{pod}-daily-.*' - 'fuel-verify-.*' - block-level: 'NODE' + blocking-level: 'NODE' wrappers: - build-name: @@ -140,28 +163,42 @@ DEPLOY_SCENARIO={scenario} same-node: true block: true - - trigger-builds: - - project: 'functest-fuel-{pod}-daily-{stream}' - current-parameters: false - predefined-parameters: - DEPLOY_SCENARIO={scenario} - same-node: true - block: true - block-thresholds: - build-step-failure-threshold: 'never' - failure-threshold: 'never' - unstable-threshold: 'FAILURE' - - trigger-builds: - - project: 'yardstick-fuel-{pod}-daily-{stream}' - current-parameters: false - predefined-parameters: - DEPLOY_SCENARIO={scenario} - block: true - same-node: true - block-thresholds: - build-step-failure-threshold: 'never' - failure-threshold: 'never' - unstable-threshold: 'FAILURE' + - conditional-step: + condition-kind: not + condition-operand: + condition-kind: regex-match + regex: 'fraser' + label: '{stream}' + steps: + - trigger-builds: + - project: 'functest-fuel-{pod}-daily-{stream}' + current-parameters: false + predefined-parameters: + DEPLOY_SCENARIO={scenario} + same-node: true + block: true + block-thresholds: + build-step-failure-threshold: 'never' + failure-threshold: 'never' + unstable-threshold: 'FAILURE' + - conditional-step: + condition-kind: not + condition-operand: + condition-kind: regex-match + regex: 'fraser' + label: '{stream}' + steps: + - trigger-builds: + - project: 'yardstick-fuel-{pod}-daily-{stream}' + current-parameters: false + predefined-parameters: + DEPLOY_SCENARIO={scenario} + block: true + same-node: true + block-thresholds: + build-step-failure-threshold: 'never' + failure-threshold: 'never' + unstable-threshold: 'FAILURE' # 1.here the stream means the SUT stream, dovetail stream is defined in its own job # 2.testsuite default here is for the test cases already added into OVP # 3.run default testsuite mandatory test cases against ha scenario @@ -173,6 +210,9 @@ - condition-kind: regex-match regex: '.*-ha' label: '{scenario}' + - condition-kind: regex-match + regex: 'fraser' + label: '{stream}' steps: - trigger-builds: - project: 'dovetail-fuel-{pod}-default-mandatory-{stream}' @@ -191,6 +231,9 @@ - condition-kind: regex-match regex: '.*-ha' label: '{scenario}' + - condition-kind: regex-match + regex: 'fraser' + label: '{stream}' steps: - trigger-builds: - project: 'dovetail-fuel-{pod}-default-optional-{stream}' @@ -237,7 +280,7 @@ use-build-blocker: true blocking-jobs: - 'fuel-deploy-{pod}-daily-.*' - block-level: 'NODE' + blocking-level: 'NODE' parameters: - project-parameter: @@ -347,6 +390,10 @@ triggers: - timed: '' - trigger: + name: 'fuel-os-odl-sfc-noha-baremetal-daily-master-trigger' + triggers: + - timed: '' +- trigger: name: 'fuel-os-ovn-nofeature-noha-baremetal-daily-master-trigger' triggers: - timed: '' @@ -363,40 +410,56 @@ triggers: - timed: '' # ---------------------------------------------- -# Triggers for job running on fuel-baremetal against fraser branch +# Triggers for job running on fuel-baremetal against gambia branch # ---------------------------------------------- # HA Scenarios - trigger: - name: 'fuel-os-nosdn-nofeature-ha-baremetal-daily-fraser-trigger' + name: 'fuel-os-nosdn-nofeature-ha-baremetal-daily-gambia-trigger' triggers: - - timed: '0 20 * * 1,3,7' + - timed: '0 20 * * *' - trigger: - name: 'fuel-os-odl-nofeature-ha-baremetal-daily-fraser-trigger' + name: 'fuel-os-odl-nofeature-ha-baremetal-daily-gambia-trigger' triggers: - - timed: '' # '0 2 * * *' + - timed: '0 2 * * *' - trigger: - name: 'fuel-os-ovn-nofeature-ha-baremetal-daily-fraser-trigger' + name: 'fuel-os-ovn-nofeature-ha-baremetal-daily-gambia-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-nosdn-ovs-ha-baremetal-daily-fraser-trigger' + name: 'fuel-os-nosdn-ovs-ha-baremetal-daily-gambia-trigger' triggers: - - timed: '' # '0 20 * * *' + - timed: '0 5 * * *' +- trigger: + name: 'fuel-os-nosdn-vpp-ha-baremetal-daily-gambia-trigger' + triggers: + - timed: '' # NOHA Scenarios - trigger: - name: 'fuel-os-nosdn-nofeature-noha-baremetal-daily-fraser-trigger' + name: 'fuel-os-nosdn-nofeature-noha-baremetal-daily-gambia-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-odl-nofeature-noha-baremetal-daily-fraser-trigger' + name: 'fuel-os-odl-nofeature-noha-baremetal-daily-gambia-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-ovn-nofeature-noha-baremetal-daily-fraser-trigger' + name: 'fuel-os-odl-sfc-noha-baremetal-daily-gambia-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-nosdn-ovs-noha-baremetal-daily-fraser-trigger' + name: 'fuel-os-ovn-nofeature-noha-baremetal-daily-gambia-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-odl-ovs-noha-baremetal-daily-gambia-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-nosdn-ovs-noha-baremetal-daily-gambia-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-nosdn-vpp-noha-baremetal-daily-gambia-trigger' triggers: - timed: '' # ---------------------------------------------- @@ -432,6 +495,10 @@ triggers: - timed: '5 18 * * *' - trigger: + name: 'fuel-os-odl-sfc-noha-virtual-daily-master-trigger' + triggers: + - timed: '5 4 * * *' +- trigger: name: 'fuel-os-ovn-nofeature-noha-virtual-daily-master-trigger' triggers: - timed: '5 23 * * *' @@ -448,41 +515,72 @@ triggers: - timed: '' # ---------------------------------------------- -# Triggers for job running on fuel-virtual against fraser branch +# Triggers for job running on fuel-baremetal against fraser branch (for Dovetail) # ---------------------------------------------- - trigger: - name: 'fuel-os-nosdn-nofeature-ha-virtual-daily-fraser-trigger' + name: 'fuel-os-nosdn-nofeature-ha-baremetal-daily-fraser-trigger' + triggers: + - timed: '5 13 * * 6,7' +- trigger: + name: 'fuel-os-odl-nofeature-ha-baremetal-daily-fraser-trigger' + triggers: + - timed: '0 13 * * 6' +- trigger: + name: 'fuel-os-nosdn-ovs-ha-baremetal-daily-fraser-trigger' + triggers: + - timed: '0 13 * * 7' +# ---------------------------------------------- +# Triggers for job running on fuel-virtual against gambia branch +# ---------------------------------------------- +- trigger: + name: 'fuel-os-nosdn-nofeature-ha-virtual-daily-gambia-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-odl-nofeature-ha-virtual-daily-gambia-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-odl-nofeature-ha-virtual-daily-fraser-trigger' + name: 'fuel-os-ovn-nofeature-ha-virtual-daily-gambia-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-ovn-nofeature-ha-virtual-daily-fraser-trigger' + name: 'fuel-os-nosdn-ovs-ha-virtual-daily-gambia-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-nosdn-ovs-ha-virtual-daily-fraser-trigger' + name: 'fuel-os-nosdn-vpp-ha-virtual-daily-gambia-trigger' triggers: - timed: '' # NOHA Scenarios - trigger: - name: 'fuel-os-nosdn-nofeature-noha-virtual-daily-fraser-trigger' + name: 'fuel-os-nosdn-nofeature-noha-virtual-daily-gambia-trigger' triggers: - - timed: '' # '0 13 * * *' + - timed: '0 13 * * *' - trigger: - name: 'fuel-os-odl-nofeature-noha-virtual-daily-fraser-trigger' + name: 'fuel-os-odl-nofeature-noha-virtual-daily-gambia-trigger' triggers: - - timed: '' # '0 18 * * *' + - timed: '0 18 * * *' - trigger: - name: 'fuel-os-ovn-nofeature-noha-virtual-daily-fraser-trigger' + name: 'fuel-os-odl-sfc-noha-virtual-daily-gambia-trigger' triggers: - - timed: '5 23 * * *' + - timed: '0 4 * * *' +- trigger: + name: 'fuel-os-ovn-nofeature-noha-virtual-daily-gambia-trigger' + triggers: + - timed: '0 23 * * *' +- trigger: + name: 'fuel-os-odl-ovs-noha-virtual-daily-gambia-trigger' + triggers: + - timed: '0 2 * * *' - trigger: - name: 'fuel-os-nosdn-ovs-noha-virtual-daily-fraser-trigger' + name: 'fuel-os-nosdn-ovs-noha-virtual-daily-gambia-trigger' triggers: - - timed: '' # '0 9 * * *' + - timed: '0 9 * * *' +- trigger: + name: 'fuel-os-nosdn-vpp-noha-virtual-daily-gambia-trigger' + triggers: + - timed: '' # ---------------------------------------------- # ZTE POD1 Triggers running against master branch # ---------------------------------------------- @@ -516,6 +614,10 @@ triggers: - timed: '' - trigger: + name: 'fuel-os-odl-sfc-noha-zte-pod1-daily-master-trigger' + triggers: + - timed: '' +- trigger: name: 'fuel-os-ovn-nofeature-noha-zte-pod1-daily-master-trigger' triggers: - timed: '' diff --git a/jjb/fuel/fuel-deploy.sh b/jjb/fuel/fuel-deploy.sh index aa7b3bbb6..c0cdc3dc2 100755 --- a/jjb/fuel/fuel-deploy.sh +++ b/jjb/fuel/fuel-deploy.sh @@ -27,10 +27,6 @@ fi echo "Using configuration for ${LAB_NAME}" -# Certain labs do not require the deploy script to be ran with sudo -SUDO='sudo -E' -[[ ! "${LAB_NAME}" =~ (arm|enea|unh) ]] || SUDO= - # create TMPDIR if it doesn't exist, change permissions mkdir -p "${TMPDIR}" sudo chmod a+x "${HOME}" "${TMPDIR}" @@ -44,7 +40,7 @@ FUEL_LOG_FILENAME="${JOB_NAME}_${BUILD_NUMBER}.log.tar.gz" [[ ! "${JOB_NAME}" =~ verify-deploy-virtual-arm64 ]] || EXTRA_ARGS='-e' # construct the command -DEPLOY_COMMAND="${SUDO} ${WORKSPACE}/ci/deploy.sh \ +DEPLOY_COMMAND="${WORKSPACE}/ci/deploy.sh \ -l ${LAB_NAME} -p ${POD_NAME} -s ${DEPLOY_SCENARIO} \ -S ${TMPDIR} ${EXTRA_ARGS:-} \ -L ${WORKSPACE}/${FUEL_LOG_FILENAME}" diff --git a/jjb/fuel/fuel-docker-jobs.yaml b/jjb/fuel/fuel-docker-jobs.yaml index 98ed66da7..c06848e56 100644 --- a/jjb/fuel/fuel-docker-jobs.yaml +++ b/jjb/fuel/fuel-docker-jobs.yaml @@ -14,7 +14,7 @@ disabled: false - gambia: branch: 'stable/{stream}' - disabled: true + disabled: false arch_tag: - 'amd64': @@ -119,7 +119,7 @@ *) tag="{stream}" ;; esac - sudo ./ci/build.sh $tag + ./ci/build.sh $tag - job-template: name: 'fuel-docker-manifest-{stream}' @@ -132,6 +132,8 @@ name: SLAVE_LABEL default: 'opnfv-build-ubuntu' description: 'Slave label on Jenkins' + all-nodes: false + node-eligibility: 'ignore-offline' - string: name: PROJECT default: "{project}" @@ -174,6 +176,8 @@ name: SLAVE_LABEL default: '{slave_label}' description: 'Slave label on Jenkins' + all-nodes: false + node-eligibility: 'ignore-offline' - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT diff --git a/jjb/fuel/fuel-project-jobs.yaml b/jjb/fuel/fuel-project-jobs.yaml index 7d7e4593a..f424c2014 100644 --- a/jjb/fuel/fuel-project-jobs.yaml +++ b/jjb/fuel/fuel-project-jobs.yaml @@ -14,15 +14,7 @@ branch: '{stream}' gs-pathname: '' disabled: false - - fraser: + - gambia: branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false - - project-name: '{project}' - project-pattern: '{project}' - rtd-build-url: https://readthedocs.org/api/v2/webhook/opnfv-fuel/47205/ - rtd-token: 38f40bf6c08fd4bccb930871bc29b08404cf98b0 - - jobs: - - '{project-name}-rtd-jobs' diff --git a/jjb/fuel/fuel-verify-jobs.yaml b/jjb/fuel/fuel-verify-jobs.yaml index ea27d9c69..5695ef8a0 100644 --- a/jjb/fuel/fuel-verify-jobs.yaml +++ b/jjb/fuel/fuel-verify-jobs.yaml @@ -13,7 +13,7 @@ branch: '{stream}' gs-pathname: '' disabled: false - - fraser: + - gambia: branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false @@ -68,7 +68,7 @@ blocking-jobs: - 'fuel-os-.*?-daily-.*' - 'fuel-verify-.*' - block-level: 'NODE' + blocking-level: 'NODE' scm: - git-scm-gerrit @@ -170,7 +170,7 @@ blocking-jobs: - 'fuel-verify-docker-build-.*' - 'fuel-verify-deploy-.*' - block-level: 'NODE' + blocking-level: 'NODE' scm: - git-scm-gerrit |