From afff1f88a918215eeb9060c4f43c5a332c8eb32c Mon Sep 17 00:00:00 2001 From: Trevor Bramwell Date: Wed, 16 May 2018 16:23:56 -0700 Subject: Rename files under jjb from 'yml' to 'yaml' global-jjb only supports the .yaml file ending for jjb jobs. Instead of waiting for a release we're going to rename the files. Change-Id: Icf3339eacd2320c583333e02250998cf6b1881f7 Signed-off-by: Trevor Bramwell --- jjb/joid/joid-daily-jobs.yaml | 384 +++++++++++++++++++++++++++++++++++++++++ jjb/joid/joid-daily-jobs.yml | 384 ----------------------------------------- jjb/joid/joid-verify-jobs.yaml | 213 +++++++++++++++++++++++ jjb/joid/joid-verify-jobs.yml | 213 ----------------------- 4 files changed, 597 insertions(+), 597 deletions(-) create mode 100644 jjb/joid/joid-daily-jobs.yaml delete mode 100644 jjb/joid/joid-daily-jobs.yml create mode 100644 jjb/joid/joid-verify-jobs.yaml delete mode 100644 jjb/joid/joid-verify-jobs.yml (limited to 'jjb/joid') diff --git a/jjb/joid/joid-daily-jobs.yaml b/jjb/joid/joid-daily-jobs.yaml new file mode 100644 index 000000000..2719c7292 --- /dev/null +++ b/jjb/joid/joid-daily-jobs.yaml @@ -0,0 +1,384 @@ +--- +######################## +# Job configuration for joid +######################## +- project: + + name: 'joid' + + project: '{name}' + + installer: '{name}' + + # ------------------------------- + # BRANCH ANCHORS + # ------------------------------- + fraser: &fraser + stream: fraser + branch: 'stable/{stream}' + disabled: false + gs-pathname: '/{stream}' + master: &master + stream: master + branch: '{stream}' + disabled: false + gs-pathname: '' + # ------------------------------- + # POD, INSTALLER, AND BRANCH MAPPING + # ------------------------------- + # CI PODs + # ------------------------------- + pod: + - baremetal: + slave-label: joid-baremetal + <<: *fraser + - baremetal: + slave-label: joid-baremetal + <<: *master + # ------------------------------- + # scenarios + # ------------------------------- + scenario: + - 'os-nosdn-nofeature-noha': + auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger' + - 'os-nosdn-nofeature-ha': + auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger' + - 'os-nosdn-lxd-ha': + auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger' + - 'os-nosdn-lxd-noha': + auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger' + - 'os-odl_l2-nofeature-ha': + auto-trigger-name: 'daily-trigger-disabled' + - 'os-odl_l2-nofeature-noha': + auto-trigger-name: 'daily-trigger-disabled' + - 'os-ocl-nofeature-ha': + auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger' + - 'os-ocl-nofeature-noha': + auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger' + - 'k8-nosdn-nofeature-noha': + auto-trigger-name: 'daily-trigger-disabled' + - 'k8-nosdn-lb-noha': + auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger' + - 'k8-ovn-lb-noha': + auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger' + - 'os-nosdn-openbaton-ha': + auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger' + - 'k8-canal-lb-noha': + auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger' + - 'k8-nosdn-lb_ceph-noha': + auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger' + - 'k8-multus-lb-noha': + auto-trigger-name: 'daily-trigger-disabled' + - 'os-ovn-nofeature-ha': + auto-trigger-name: 'daily-trigger-disabled' + + jobs: + - 'joid-{scenario}-{pod}-daily-{stream}' + - 'joid-deploy-{pod}-daily-{stream}' + +######################## +# job templates +######################## +- job-template: + name: 'joid-{scenario}-{pod}-daily-{stream}' + + disabled: '{obj:disabled}' + + concurrent: false + + properties: + - logrotate-default + - throttle: + enabled: true + max-total: 4 + max-per-node: 1 + option: 'project' + - build-blocker: + use-build-blocker: true + blocking-jobs: + - 'joid-(os|k8)-.*?-{pod}-daily-.*' + block-level: 'NODE' + + wrappers: + - build-name: + name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO' + + triggers: + - '{auto-trigger-name}' + + parameters: + - project-parameter: + project: '{project}' + branch: '{branch}' + - '{installer}-defaults' + - '{slave-label}-defaults': + installer: '{installer}' + - string: + name: DEPLOY_SCENARIO + default: '{scenario}' + + builders: + - description-setter: + description: "POD: $NODE_NAME" + - trigger-builds: + - project: 'joid-deploy-{pod}-daily-{stream}' + current-parameters: true + predefined-parameters: + DEPLOY_SCENARIO={scenario} + same-node: true + block: true + - trigger-builds: + - project: 'functest-joid-{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' + - trigger-builds: + - project: 'yardstick-joid-{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.dovetail only euphrates by now, not sync with A/B/C branches +# 2.here the stream means the SUT stream, dovetail stream is defined in +# its own job +# 3.only debug testsuite here(includes basic testcase, +# i.e. one tempest smoke ipv6, two vping from functest) +# 4.not used for release criteria or compliance, +# only to debug the dovetail tool bugs with joid +# - trigger-builds: +# - project: 'dovetail-joid-{pod}-proposed_tests-{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' + +- job-template: + name: 'joid-deploy-{pod}-daily-{stream}' + + disabled: '{obj:disabled}' + + concurrent: true + + properties: + - logrotate-default + - throttle: + enabled: true + max-total: 4 + max-per-node: 1 + option: 'project' + - build-blocker: + use-build-blocker: true + blocking-jobs: + - 'joid-deploy-{pod}-daily-.*' + block-level: 'NODE' + + wrappers: + - build-name: + name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO' + - timeout: + timeout: 180 + fail: true + + parameters: + - project-parameter: + project: '{project}' + branch: '{branch}' + - '{installer}-defaults' + - '{slave-label}-defaults': + installer: '{installer}' + - string: + name: DEPLOY_SCENARIO + default: 'os-odl_l2-nofeature-ha' + + scm: + - git-scm + + builders: + - description-setter: + description: "POD: $NODE_NAME" + - 'builder-macro' +######################## +# builder macros +######################## +- builder: + name: 'builder-macro' + builders: + - shell: | + #!/bin/bash + echo "Running $INSTALLER_TYPE with controller $SDN_CONTROLLER" + echo + echo "------ First Executing clean.sh ------" + cd $WORKSPACE/ci + ./clean.sh + - shell: + !include-raw: ./joid-deploy.sh + +######################## +# trigger macros +######################## +# os-nosdn-nofeature-ha trigger - branch: fraser +- trigger: + name: 'joid-os-nosdn-nofeature-ha-baremetal-fraser-trigger' + triggers: + - timed: '5 2 * * *' +# os-nosdn-nofeature-ha trigger - branch: master +- trigger: + name: 'joid-os-nosdn-nofeature-ha-baremetal-master-trigger' + triggers: + - timed: '5 2 * * *' +# os-odl_l2-nofeature-ha trigger - branch: fraser +- trigger: + name: 'joid-os-odl_l2-nofeature-ha-baremetal-fraser-trigger' + triggers: + - timed: '5 7 * * *' +# os-odl_l2-nofeature-ha trigger - branch: master +- trigger: + name: 'joid-os-odl_l2-nofeature-ha-baremetal-master-trigger' + triggers: + - timed: '5 7 * * *' +# os-nosdn-lxd-noha trigger - branch: fraser +- trigger: + name: 'joid-os-nosdn-lxd-noha-baremetal-fraser-trigger' + triggers: + - timed: '5 22 * * *' +# os-nosdn-lxd-noha trigger - branch: master +- trigger: + name: 'joid-os-nosdn-lxd-noha-baremetal-master-trigger' + triggers: + - timed: '5 22 * * *' +# os-nosdn-lxd-ha trigger - branch: fraser +- trigger: + name: 'joid-os-nosdn-lxd-ha-baremetal-fraser-trigger' + triggers: + - timed: '5 10 * * *' +# os-nosdn-lxd-ha trigger - branch: master +- trigger: + name: 'joid-os-nosdn-lxd-ha-baremetal-master-trigger' + triggers: + - timed: '5 10 * * *' +# os-nosdn-nofeature-noha trigger - branch: fraser +- trigger: + name: 'joid-os-nosdn-nofeature-noha-baremetal-fraser-trigger' + triggers: + - timed: '5 4 * * *' +# os-nosdn-nofeature-noha trigger - branch: master +- trigger: + name: 'joid-os-nosdn-nofeature-noha-baremetal-master-trigger' + triggers: + - timed: '5 4 * * *' +# k8-nosdn-nofeature-noha trigger - branch: fraser +- trigger: + name: 'joid-k8-nosdn-nofeature-noha-baremetal-fraser-trigger' + triggers: + - timed: '5 15 * * *' +# k8-nosdn-nofeature-noha trigger - branch: master +- trigger: + name: 'joid-k8-nosdn-nofeature-noha-baremetal-master-trigger' + triggers: + - timed: '5 15 * * *' +# k8-nosdn-lb-noha trigger - branch: fraser +- trigger: + name: 'joid-k8-nosdn-lb-noha-baremetal-fraser-trigger' + triggers: + - timed: '5 20 * * *' +# k8-nosdn-lb-noha trigger - branch: master +- trigger: + name: 'joid-k8-nosdn-lb-noha-baremetal-master-trigger' + triggers: + - timed: '5 20 * * *' +# k8-ovn-lb-noha trigger - branch: fraser +- trigger: + name: 'joid-k8-ovn-lb-noha-baremetal-fraser-trigger' + triggers: + - timed: '5 17 * * *' +# k8-ovn-lb-noha trigger - branch: master +- trigger: + name: 'joid-k8-ovn-lb-noha-baremetal-master-trigger' + triggers: + - timed: '5 17 * * *' +# os-nosdn-openbaton-ha trigger - branch: fraser +- trigger: + name: 'joid-os-nosdn-openbaton-ha-baremetal-fraser-trigger' + triggers: + - timed: '' # Disabled as there is no branch for orchestra +# os-nosdn-openbaton-ha trigger - branch: master +- trigger: + name: 'joid-os-nosdn-openbaton-ha-baremetal-master-trigger' + triggers: + - timed: '5 23 * * *' +# os-ocl-nofeature-ha trigger - branch: fraser +- trigger: + name: 'joid-os-ocl-nofeature-ha-baremetal-fraser-trigger' + triggers: + - timed: '5 13 * * *' +# os-ocl-nofeature-ha trigger - branch: master +- trigger: + name: 'joid-os-ocl-nofeature-ha-baremetal-master-trigger' + triggers: + - timed: '5 13 * * *' +# os-ocl-nofeature-noha trigger - branch: fraser +- trigger: + name: 'joid-os-ocl-nofeature-noha-baremetal-fraser-trigger' + triggers: + - timed: '5 16 * * *' +# os-ocl-nofeature-noha trigger - branch: master +- trigger: + name: 'joid-os-ocl-nofeature-noha-baremetal-master-trigger' + triggers: + - timed: '5 16 * * *' +# k8-canal-lb-noha trigger - branch: fraser +- trigger: + name: 'joid-k8-canal-lb-noha-baremetal-fraser-trigger' + triggers: + - timed: '5 14 * * *' +# k8-canal-lb-noha trigger - branch: master +- trigger: + name: 'joid-k8-canal-lb-noha-baremetal-master-trigger' + triggers: + - timed: '5 14 * * *' +# k8-multus-lb-noha trigger - branch: fraser +- trigger: + name: 'joid-k8-multus-lb-noha-baremetal-fraser-trigger' + triggers: + - timed: '5 18 * * *' +# k8-multus-lb-noha trigger - branch: master +- trigger: + name: 'joid-k8-multus-lb-noha-baremetal-master-trigger' + triggers: + - timed: '5 18 * * *' +# k8-nosdn-lb_ceph-noha trigger - branch: fraser +- trigger: + name: 'joid-k8-nosdn-lb_ceph-noha-baremetal-fraser-trigger' + triggers: + - timed: '5 18 * * *' +# k8-nosdn-lb_ceph-noha trigger - branch: master +- trigger: + name: 'joid-k8-nosdn-lb_ceph-noha-baremetal-master-trigger' + triggers: + - timed: '5 18 * * *' +# os-ovn-nofeature-ha trigger - branch: fraser +- trigger: + name: 'joid-os-ovn-nofeature-ha-baremetal-fraser-trigger' + triggers: + - timed: '5 19 * * *' +# os-ovn-nofeature-ha trigger - branch: master +- trigger: + name: 'joid-os-ovn-nofeature-ha-baremetal-master-trigger' + triggers: + - timed: '5 19 * * *' diff --git a/jjb/joid/joid-daily-jobs.yml b/jjb/joid/joid-daily-jobs.yml deleted file mode 100644 index 2719c7292..000000000 --- a/jjb/joid/joid-daily-jobs.yml +++ /dev/null @@ -1,384 +0,0 @@ ---- -######################## -# Job configuration for joid -######################## -- project: - - name: 'joid' - - project: '{name}' - - installer: '{name}' - - # ------------------------------- - # BRANCH ANCHORS - # ------------------------------- - fraser: &fraser - stream: fraser - branch: 'stable/{stream}' - disabled: false - gs-pathname: '/{stream}' - master: &master - stream: master - branch: '{stream}' - disabled: false - gs-pathname: '' - # ------------------------------- - # POD, INSTALLER, AND BRANCH MAPPING - # ------------------------------- - # CI PODs - # ------------------------------- - pod: - - baremetal: - slave-label: joid-baremetal - <<: *fraser - - baremetal: - slave-label: joid-baremetal - <<: *master - # ------------------------------- - # scenarios - # ------------------------------- - scenario: - - 'os-nosdn-nofeature-noha': - auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger' - - 'os-nosdn-nofeature-ha': - auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger' - - 'os-nosdn-lxd-ha': - auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger' - - 'os-nosdn-lxd-noha': - auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger' - - 'os-odl_l2-nofeature-ha': - auto-trigger-name: 'daily-trigger-disabled' - - 'os-odl_l2-nofeature-noha': - auto-trigger-name: 'daily-trigger-disabled' - - 'os-ocl-nofeature-ha': - auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger' - - 'os-ocl-nofeature-noha': - auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger' - - 'k8-nosdn-nofeature-noha': - auto-trigger-name: 'daily-trigger-disabled' - - 'k8-nosdn-lb-noha': - auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger' - - 'k8-ovn-lb-noha': - auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger' - - 'os-nosdn-openbaton-ha': - auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger' - - 'k8-canal-lb-noha': - auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger' - - 'k8-nosdn-lb_ceph-noha': - auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger' - - 'k8-multus-lb-noha': - auto-trigger-name: 'daily-trigger-disabled' - - 'os-ovn-nofeature-ha': - auto-trigger-name: 'daily-trigger-disabled' - - jobs: - - 'joid-{scenario}-{pod}-daily-{stream}' - - 'joid-deploy-{pod}-daily-{stream}' - -######################## -# job templates -######################## -- job-template: - name: 'joid-{scenario}-{pod}-daily-{stream}' - - disabled: '{obj:disabled}' - - concurrent: false - - properties: - - logrotate-default - - throttle: - enabled: true - max-total: 4 - max-per-node: 1 - option: 'project' - - build-blocker: - use-build-blocker: true - blocking-jobs: - - 'joid-(os|k8)-.*?-{pod}-daily-.*' - block-level: 'NODE' - - wrappers: - - build-name: - name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO' - - triggers: - - '{auto-trigger-name}' - - parameters: - - project-parameter: - project: '{project}' - branch: '{branch}' - - '{installer}-defaults' - - '{slave-label}-defaults': - installer: '{installer}' - - string: - name: DEPLOY_SCENARIO - default: '{scenario}' - - builders: - - description-setter: - description: "POD: $NODE_NAME" - - trigger-builds: - - project: 'joid-deploy-{pod}-daily-{stream}' - current-parameters: true - predefined-parameters: - DEPLOY_SCENARIO={scenario} - same-node: true - block: true - - trigger-builds: - - project: 'functest-joid-{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' - - trigger-builds: - - project: 'yardstick-joid-{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.dovetail only euphrates by now, not sync with A/B/C branches -# 2.here the stream means the SUT stream, dovetail stream is defined in -# its own job -# 3.only debug testsuite here(includes basic testcase, -# i.e. one tempest smoke ipv6, two vping from functest) -# 4.not used for release criteria or compliance, -# only to debug the dovetail tool bugs with joid -# - trigger-builds: -# - project: 'dovetail-joid-{pod}-proposed_tests-{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' - -- job-template: - name: 'joid-deploy-{pod}-daily-{stream}' - - disabled: '{obj:disabled}' - - concurrent: true - - properties: - - logrotate-default - - throttle: - enabled: true - max-total: 4 - max-per-node: 1 - option: 'project' - - build-blocker: - use-build-blocker: true - blocking-jobs: - - 'joid-deploy-{pod}-daily-.*' - block-level: 'NODE' - - wrappers: - - build-name: - name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO' - - timeout: - timeout: 180 - fail: true - - parameters: - - project-parameter: - project: '{project}' - branch: '{branch}' - - '{installer}-defaults' - - '{slave-label}-defaults': - installer: '{installer}' - - string: - name: DEPLOY_SCENARIO - default: 'os-odl_l2-nofeature-ha' - - scm: - - git-scm - - builders: - - description-setter: - description: "POD: $NODE_NAME" - - 'builder-macro' -######################## -# builder macros -######################## -- builder: - name: 'builder-macro' - builders: - - shell: | - #!/bin/bash - echo "Running $INSTALLER_TYPE with controller $SDN_CONTROLLER" - echo - echo "------ First Executing clean.sh ------" - cd $WORKSPACE/ci - ./clean.sh - - shell: - !include-raw: ./joid-deploy.sh - -######################## -# trigger macros -######################## -# os-nosdn-nofeature-ha trigger - branch: fraser -- trigger: - name: 'joid-os-nosdn-nofeature-ha-baremetal-fraser-trigger' - triggers: - - timed: '5 2 * * *' -# os-nosdn-nofeature-ha trigger - branch: master -- trigger: - name: 'joid-os-nosdn-nofeature-ha-baremetal-master-trigger' - triggers: - - timed: '5 2 * * *' -# os-odl_l2-nofeature-ha trigger - branch: fraser -- trigger: - name: 'joid-os-odl_l2-nofeature-ha-baremetal-fraser-trigger' - triggers: - - timed: '5 7 * * *' -# os-odl_l2-nofeature-ha trigger - branch: master -- trigger: - name: 'joid-os-odl_l2-nofeature-ha-baremetal-master-trigger' - triggers: - - timed: '5 7 * * *' -# os-nosdn-lxd-noha trigger - branch: fraser -- trigger: - name: 'joid-os-nosdn-lxd-noha-baremetal-fraser-trigger' - triggers: - - timed: '5 22 * * *' -# os-nosdn-lxd-noha trigger - branch: master -- trigger: - name: 'joid-os-nosdn-lxd-noha-baremetal-master-trigger' - triggers: - - timed: '5 22 * * *' -# os-nosdn-lxd-ha trigger - branch: fraser -- trigger: - name: 'joid-os-nosdn-lxd-ha-baremetal-fraser-trigger' - triggers: - - timed: '5 10 * * *' -# os-nosdn-lxd-ha trigger - branch: master -- trigger: - name: 'joid-os-nosdn-lxd-ha-baremetal-master-trigger' - triggers: - - timed: '5 10 * * *' -# os-nosdn-nofeature-noha trigger - branch: fraser -- trigger: - name: 'joid-os-nosdn-nofeature-noha-baremetal-fraser-trigger' - triggers: - - timed: '5 4 * * *' -# os-nosdn-nofeature-noha trigger - branch: master -- trigger: - name: 'joid-os-nosdn-nofeature-noha-baremetal-master-trigger' - triggers: - - timed: '5 4 * * *' -# k8-nosdn-nofeature-noha trigger - branch: fraser -- trigger: - name: 'joid-k8-nosdn-nofeature-noha-baremetal-fraser-trigger' - triggers: - - timed: '5 15 * * *' -# k8-nosdn-nofeature-noha trigger - branch: master -- trigger: - name: 'joid-k8-nosdn-nofeature-noha-baremetal-master-trigger' - triggers: - - timed: '5 15 * * *' -# k8-nosdn-lb-noha trigger - branch: fraser -- trigger: - name: 'joid-k8-nosdn-lb-noha-baremetal-fraser-trigger' - triggers: - - timed: '5 20 * * *' -# k8-nosdn-lb-noha trigger - branch: master -- trigger: - name: 'joid-k8-nosdn-lb-noha-baremetal-master-trigger' - triggers: - - timed: '5 20 * * *' -# k8-ovn-lb-noha trigger - branch: fraser -- trigger: - name: 'joid-k8-ovn-lb-noha-baremetal-fraser-trigger' - triggers: - - timed: '5 17 * * *' -# k8-ovn-lb-noha trigger - branch: master -- trigger: - name: 'joid-k8-ovn-lb-noha-baremetal-master-trigger' - triggers: - - timed: '5 17 * * *' -# os-nosdn-openbaton-ha trigger - branch: fraser -- trigger: - name: 'joid-os-nosdn-openbaton-ha-baremetal-fraser-trigger' - triggers: - - timed: '' # Disabled as there is no branch for orchestra -# os-nosdn-openbaton-ha trigger - branch: master -- trigger: - name: 'joid-os-nosdn-openbaton-ha-baremetal-master-trigger' - triggers: - - timed: '5 23 * * *' -# os-ocl-nofeature-ha trigger - branch: fraser -- trigger: - name: 'joid-os-ocl-nofeature-ha-baremetal-fraser-trigger' - triggers: - - timed: '5 13 * * *' -# os-ocl-nofeature-ha trigger - branch: master -- trigger: - name: 'joid-os-ocl-nofeature-ha-baremetal-master-trigger' - triggers: - - timed: '5 13 * * *' -# os-ocl-nofeature-noha trigger - branch: fraser -- trigger: - name: 'joid-os-ocl-nofeature-noha-baremetal-fraser-trigger' - triggers: - - timed: '5 16 * * *' -# os-ocl-nofeature-noha trigger - branch: master -- trigger: - name: 'joid-os-ocl-nofeature-noha-baremetal-master-trigger' - triggers: - - timed: '5 16 * * *' -# k8-canal-lb-noha trigger - branch: fraser -- trigger: - name: 'joid-k8-canal-lb-noha-baremetal-fraser-trigger' - triggers: - - timed: '5 14 * * *' -# k8-canal-lb-noha trigger - branch: master -- trigger: - name: 'joid-k8-canal-lb-noha-baremetal-master-trigger' - triggers: - - timed: '5 14 * * *' -# k8-multus-lb-noha trigger - branch: fraser -- trigger: - name: 'joid-k8-multus-lb-noha-baremetal-fraser-trigger' - triggers: - - timed: '5 18 * * *' -# k8-multus-lb-noha trigger - branch: master -- trigger: - name: 'joid-k8-multus-lb-noha-baremetal-master-trigger' - triggers: - - timed: '5 18 * * *' -# k8-nosdn-lb_ceph-noha trigger - branch: fraser -- trigger: - name: 'joid-k8-nosdn-lb_ceph-noha-baremetal-fraser-trigger' - triggers: - - timed: '5 18 * * *' -# k8-nosdn-lb_ceph-noha trigger - branch: master -- trigger: - name: 'joid-k8-nosdn-lb_ceph-noha-baremetal-master-trigger' - triggers: - - timed: '5 18 * * *' -# os-ovn-nofeature-ha trigger - branch: fraser -- trigger: - name: 'joid-os-ovn-nofeature-ha-baremetal-fraser-trigger' - triggers: - - timed: '5 19 * * *' -# os-ovn-nofeature-ha trigger - branch: master -- trigger: - name: 'joid-os-ovn-nofeature-ha-baremetal-master-trigger' - triggers: - - timed: '5 19 * * *' diff --git a/jjb/joid/joid-verify-jobs.yaml b/jjb/joid/joid-verify-jobs.yaml new file mode 100644 index 000000000..2d1c7c9f3 --- /dev/null +++ b/jjb/joid/joid-verify-jobs.yaml @@ -0,0 +1,213 @@ +--- +- project: + name: 'joid-verify-jobs' + + project: 'joid' + + installer: 'joid' + ##################################### + # branch definitions + ##################################### + stream: + - master: + branch: '{stream}' + gs-pathname: '' + disabled: false + - fraser: &fraser + branch: 'stable/{stream}' + gs-pathname: '/{stream}' + disabled: false + ##################################### + # patch verification phases + ##################################### + phase: + - 'basic': + slave-label: 'opnfv-build-ubuntu' + - 'deploy-virtual': + slave-label: 'joid-virtual' + - 'smoke-test': + slave-label: 'joid-virtual' + ##################################### + # jobs + ##################################### + jobs: + - 'joid-verify-{stream}' + - 'joid-verify-{phase}-{stream}' +##################################### +# job templates +##################################### +- job-template: + name: 'joid-verify-{stream}' + + disabled: '{obj:disabled}' + + project-type: multijob + + concurrent: true + + properties: + - logrotate-default + - throttle: + enabled: true + max-total: 4 + max-per-node: 1 + option: 'project' + - build-blocker: + use-build-blocker: true + blocking-jobs: + - 'joid-verify-master' + - 'joid-verify-danube' + block-level: 'NODE' + + scm: + - git-scm-gerrit + + wrappers: + - ssh-agent-wrapper + - timeout: + timeout: 360 + fail: true + + triggers: + - gerrit: + server-name: 'gerrit.opnfv.org' + trigger-on: + - patchset-created-event: + exclude-drafts: 'false' + exclude-trivial-rebase: 'false' + exclude-no-code-change: 'false' + - draft-published-event + - comment-added-contains-event: + comment-contains-value: 'recheck' + - comment-added-contains-event: + comment-contains-value: 'reverify' + projects: + - project-compare-type: 'ANT' + project-pattern: '{project}' + branches: + - branch-compare-type: 'ANT' + branch-pattern: '**/{branch}' + disable-strict-forbidden-file-verification: 'true' + forbidden-file-paths: + - compare-type: ANT + pattern: 'docs/**|.gitignore' + readable-message: true + + parameters: + - project-parameter: + project: '{project}' + branch: '{branch}' + - 'joid-virtual-defaults' + + builders: + - description-setter: + description: "Built on $NODE_NAME" + - multijob: + name: basic + condition: SUCCESSFUL + projects: + - name: 'joid-verify-basic-{stream}' + current-parameters: false + predefined-parameters: | + BRANCH=$BRANCH + GERRIT_REFSPEC=$GERRIT_REFSPEC + GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER + GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE + kill-phase-on: FAILURE + abort-all-job: true + - multijob: + name: deploy-virtual + condition: SUCCESSFUL + projects: + - name: 'joid-verify-deploy-virtual-{stream}' + current-parameters: false + predefined-parameters: | + BRANCH=$BRANCH + GERRIT_REFSPEC=$GERRIT_REFSPEC + GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER + GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE + node-parameters: true + kill-phase-on: FAILURE + abort-all-job: true + - multijob: + name: smoke-test + condition: SUCCESSFUL + projects: + - name: 'joid-verify-smoke-test-{stream}' + current-parameters: false + predefined-parameters: | + BRANCH=$BRANCH + GERRIT_REFSPEC=$GERRIT_REFSPEC + GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER + GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE + node-parameters: true + kill-phase-on: FAILURE + abort-all-job: true + +- job-template: + name: 'joid-verify-{phase}-{stream}' + + disabled: '{obj:disabled}' + + concurrent: true + + properties: + - logrotate-default + - throttle: + enabled: true + max-total: 4 + max-per-node: 1 + option: 'project' + - build-blocker: + use-build-blocker: true + blocking-jobs: + - 'joid-verify-deploy-.*' + - 'joid-verify-test-.*' + block-level: 'NODE' + + scm: + - git-scm-gerrit + + wrappers: + - ssh-agent-wrapper + - timeout: + timeout: 360 + fail: true + + parameters: + - project-parameter: + project: '{project}' + branch: '{branch}' + - '{installer}-defaults' + - '{slave-label}-defaults' + + builders: + - description-setter: + description: "Built on $NODE_NAME" + - '{project}-verify-{phase}-macro' +##################################### +# builder macros +##################################### +- builder: + name: 'joid-verify-basic-macro' + builders: + - shell: | + #!/bin/bash + + echo "Not activated!" + +- builder: + name: 'joid-verify-deploy-virtual-macro' + builders: + - shell: | + #!/bin/bash + + echo "Not activated!" + +- builder: + name: 'joid-verify-smoke-test-macro' + builders: + - shell: | + #!/bin/bash + + echo "Not activated!" diff --git a/jjb/joid/joid-verify-jobs.yml b/jjb/joid/joid-verify-jobs.yml deleted file mode 100644 index 2d1c7c9f3..000000000 --- a/jjb/joid/joid-verify-jobs.yml +++ /dev/null @@ -1,213 +0,0 @@ ---- -- project: - name: 'joid-verify-jobs' - - project: 'joid' - - installer: 'joid' - ##################################### - # branch definitions - ##################################### - stream: - - master: - branch: '{stream}' - gs-pathname: '' - disabled: false - - fraser: &fraser - branch: 'stable/{stream}' - gs-pathname: '/{stream}' - disabled: false - ##################################### - # patch verification phases - ##################################### - phase: - - 'basic': - slave-label: 'opnfv-build-ubuntu' - - 'deploy-virtual': - slave-label: 'joid-virtual' - - 'smoke-test': - slave-label: 'joid-virtual' - ##################################### - # jobs - ##################################### - jobs: - - 'joid-verify-{stream}' - - 'joid-verify-{phase}-{stream}' -##################################### -# job templates -##################################### -- job-template: - name: 'joid-verify-{stream}' - - disabled: '{obj:disabled}' - - project-type: multijob - - concurrent: true - - properties: - - logrotate-default - - throttle: - enabled: true - max-total: 4 - max-per-node: 1 - option: 'project' - - build-blocker: - use-build-blocker: true - blocking-jobs: - - 'joid-verify-master' - - 'joid-verify-danube' - block-level: 'NODE' - - scm: - - git-scm-gerrit - - wrappers: - - ssh-agent-wrapper - - timeout: - timeout: 360 - fail: true - - triggers: - - gerrit: - server-name: 'gerrit.opnfv.org' - trigger-on: - - patchset-created-event: - exclude-drafts: 'false' - exclude-trivial-rebase: 'false' - exclude-no-code-change: 'false' - - draft-published-event - - comment-added-contains-event: - comment-contains-value: 'recheck' - - comment-added-contains-event: - comment-contains-value: 'reverify' - projects: - - project-compare-type: 'ANT' - project-pattern: '{project}' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' - disable-strict-forbidden-file-verification: 'true' - forbidden-file-paths: - - compare-type: ANT - pattern: 'docs/**|.gitignore' - readable-message: true - - parameters: - - project-parameter: - project: '{project}' - branch: '{branch}' - - 'joid-virtual-defaults' - - builders: - - description-setter: - description: "Built on $NODE_NAME" - - multijob: - name: basic - condition: SUCCESSFUL - projects: - - name: 'joid-verify-basic-{stream}' - current-parameters: false - predefined-parameters: | - BRANCH=$BRANCH - GERRIT_REFSPEC=$GERRIT_REFSPEC - GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER - GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE - kill-phase-on: FAILURE - abort-all-job: true - - multijob: - name: deploy-virtual - condition: SUCCESSFUL - projects: - - name: 'joid-verify-deploy-virtual-{stream}' - current-parameters: false - predefined-parameters: | - BRANCH=$BRANCH - GERRIT_REFSPEC=$GERRIT_REFSPEC - GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER - GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE - node-parameters: true - kill-phase-on: FAILURE - abort-all-job: true - - multijob: - name: smoke-test - condition: SUCCESSFUL - projects: - - name: 'joid-verify-smoke-test-{stream}' - current-parameters: false - predefined-parameters: | - BRANCH=$BRANCH - GERRIT_REFSPEC=$GERRIT_REFSPEC - GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER - GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE - node-parameters: true - kill-phase-on: FAILURE - abort-all-job: true - -- job-template: - name: 'joid-verify-{phase}-{stream}' - - disabled: '{obj:disabled}' - - concurrent: true - - properties: - - logrotate-default - - throttle: - enabled: true - max-total: 4 - max-per-node: 1 - option: 'project' - - build-blocker: - use-build-blocker: true - blocking-jobs: - - 'joid-verify-deploy-.*' - - 'joid-verify-test-.*' - block-level: 'NODE' - - scm: - - git-scm-gerrit - - wrappers: - - ssh-agent-wrapper - - timeout: - timeout: 360 - fail: true - - parameters: - - project-parameter: - project: '{project}' - branch: '{branch}' - - '{installer}-defaults' - - '{slave-label}-defaults' - - builders: - - description-setter: - description: "Built on $NODE_NAME" - - '{project}-verify-{phase}-macro' -##################################### -# builder macros -##################################### -- builder: - name: 'joid-verify-basic-macro' - builders: - - shell: | - #!/bin/bash - - echo "Not activated!" - -- builder: - name: 'joid-verify-deploy-virtual-macro' - builders: - - shell: | - #!/bin/bash - - echo "Not activated!" - -- builder: - name: 'joid-verify-smoke-test-macro' - builders: - - shell: | - #!/bin/bash - - echo "Not activated!" -- cgit