diff options
-rw-r--r-- | jjb/apex/apex-verify-jobs.yml | 2 | ||||
-rw-r--r-- | jjb/daisy4nfv/daisy-daily-jobs.yml | 65 | ||||
-rw-r--r-- | jjb/daisy4nfv/daisy-project-jobs.yml | 4 | ||||
-rw-r--r-- | jjb/opnfvdocs/docs-rtd.yaml | 2 | ||||
-rw-r--r-- | jjb/opnfvdocs/opnfvdocs.yml | 7 | ||||
-rw-r--r-- | jjb/yardstick/yardstick-daily-jobs.yml | 5 |
6 files changed, 75 insertions, 10 deletions
diff --git a/jjb/apex/apex-verify-jobs.yml b/jjb/apex/apex-verify-jobs.yml index 6b7271f7e..7dbd6709b 100644 --- a/jjb/apex/apex-verify-jobs.yml +++ b/jjb/apex/apex-verify-jobs.yml @@ -317,7 +317,7 @@ builders: # yamllint disable rule:line-length - shell: | - echo DEPLOY_SCENARIO=$(echo $GERRIT_EVENT_COMMENT_TEXT | grep start-gate-scenario | grep -Eo 'os|k8s-.*$') > detected_scenario + echo DEPLOY_SCENARIO=$(echo $GERRIT_EVENT_COMMENT_TEXT | grep start-gate-scenario | grep -Eo '(os|k8s)-.*$') > detected_scenario # yamllint enable rule:line-length - inject: properties-file: detected_scenario diff --git a/jjb/daisy4nfv/daisy-daily-jobs.yml b/jjb/daisy4nfv/daisy-daily-jobs.yml index 4eaa39ae9..593d21ad0 100644 --- a/jjb/daisy4nfv/daisy-daily-jobs.yml +++ b/jjb/daisy4nfv/daisy-daily-jobs.yml @@ -48,9 +48,12 @@ # ------------------------------- # None-CI PODs # ------------------------------- - # - baremetal: - # slave-label: zte-pod3 - # <<: *master + - zte-pod3: + slave-label: zte-pod3 + <<: *master + - zte-pod3: + slave-label: zte-pod3 + <<: *fraser - zte-pod9: slave-label: zte-pod9 <<: *master @@ -121,7 +124,9 @@ - 'testapi-parameter' - 'daisy-project-parameter': gs-pathname: '{gs-pathname}' - - 'deploy-scenario' + - string: + name: DEPLOY_SCENARIO + default: '{scenario}' builders: - description-setter: @@ -191,8 +196,8 @@ blocking-jobs: - 'daisy-kolla-build-.*' - '{installer}-(build|deploy|test)-daily-(fraser|master)' - - '{installer}-deploy-(baremetal|virtual|zte-pod9)-daily-(fraser|master)' - - '(functest|yardstick)-{installer}-(baremetal|virtual|zte-pod9)-daily-(fraser|master)' + - '{installer}-deploy-(baremetal|virtual|zte-pod3|zte-pod9)-daily-(fraser|master)' + - '(functest|yardstick)-{installer}-(baremetal|virtual|zte-pod3|zte-pod9)-daily-(fraser|master)' block-level: 'NODE' parameters: @@ -329,6 +334,54 @@ - timed: '' # ---------------------------------------------- +# Triggers for job running on zte-pod3 against master branch +# ---------------------------------------------- +# Basic HA Scenarios +- trigger: + name: 'daisy-os-nosdn-nofeature-ha-zte-pod3-daily-master-trigger' + triggers: + - timed: '' +# Basic NOHA Scenarios +- trigger: + name: 'daisy-os-nosdn-nofeature-noha-zte-pod3-daily-master-trigger' + triggers: + - timed: '' +# ODL Scenarios +- trigger: + name: 'daisy-os-odl-nofeature-ha-zte-pod3-daily-master-trigger' + triggers: + - timed: '' +# ovs_dpdk Scenarios +- trigger: + name: 'daisy-os-nosdn-ovs_dpdk-noha-zte-pod3-daily-master-trigger' + triggers: + - timed: '' + +# ---------------------------------------------- +# Triggers for job running on zte-pod3 against fraser branch +# ---------------------------------------------- +# Basic HA Scenarios +- trigger: + name: 'daisy-os-nosdn-nofeature-ha-zte-pod3-daily-fraser-trigger' + triggers: + - timed: '' +# Basic NOHA Scenarios +- trigger: + name: 'daisy-os-nosdn-nofeature-noha-zte-pod3-daily-fraser-trigger' + triggers: + - timed: '' +# ODL Scenarios +- trigger: + name: 'daisy-os-odl-nofeature-ha-zte-pod3-daily-fraser-trigger' + triggers: + - timed: '0 16,22 * * *' +# ovs_dpdk Scenarios +- trigger: + name: 'daisy-os-nosdn-ovs_dpdk-noha-zte-pod3-daily-fraser-trigger' + triggers: + - timed: '' + +# ---------------------------------------------- # ZTE POD9 Triggers running against master branch # ---------------------------------------------- # ovs_dpdk Scenarios diff --git a/jjb/daisy4nfv/daisy-project-jobs.yml b/jjb/daisy4nfv/daisy-project-jobs.yml index 3ea74a9a8..cb0dea196 100644 --- a/jjb/daisy4nfv/daisy-project-jobs.yml +++ b/jjb/daisy4nfv/daisy-project-jobs.yml @@ -219,8 +219,8 @@ use-build-blocker: true blocking-jobs: - '{installer}-daily-(build|deploy|test)-(fraser|master)' - - '{installer}-.*-(baremetal|virtual|zte-pod9)-daily-(fraser|master)' - - '(functest|yardstick)-{installer}-(baremetal|virtual|zte-pod9)-daily-(fraser|master)' + - '{installer}-.*-(baremetal|virtual|zte-pod3|zte-pod9)-daily-(fraser|master)' + - '(functest|yardstick)-{installer}-(baremetal|virtual|zte-pod3|zte-pod9)-daily-(fraser|master)' block-level: 'NODE' scm: diff --git a/jjb/opnfvdocs/docs-rtd.yaml b/jjb/opnfvdocs/docs-rtd.yaml index 28f9354fa..ece856903 100644 --- a/jjb/opnfvdocs/docs-rtd.yaml +++ b/jjb/opnfvdocs/docs-rtd.yaml @@ -8,6 +8,8 @@ stream: - master: branch: 'master' + - fraser: + branch: 'stable/{stream}' - danube: branch: 'stable/{stream}' - euphrates: diff --git a/jjb/opnfvdocs/opnfvdocs.yml b/jjb/opnfvdocs/opnfvdocs.yml index 908ddba9d..5f08f69a4 100644 --- a/jjb/opnfvdocs/opnfvdocs.yml +++ b/jjb/opnfvdocs/opnfvdocs.yml @@ -17,6 +17,10 @@ branch: '{stream}' gs-pathname: '' disabled: false + - fraser: &fraser + branch: 'stable/{stream}' + gs-pathname: '/{stream}' + disabled: false - euphrates: branch: 'stable/{stream}' gs-pathname: '/{stream}' @@ -87,7 +91,8 @@ - string: name: GS_URL default: '$GS_BASE{gs-pathname}' - description: "Directory where the build artifact will be located upon the completion of the build." + description: "Directory where the build artifact will be located upon\ + \ the completion of the build." scm: - git-scm diff --git a/jjb/yardstick/yardstick-daily-jobs.yml b/jjb/yardstick/yardstick-daily-jobs.yml index fefa8e68a..9814d47ef 100644 --- a/jjb/yardstick/yardstick-daily-jobs.yml +++ b/jjb/yardstick/yardstick-daily-jobs.yml @@ -178,6 +178,11 @@ installer: daisy auto-trigger-name: 'daily-trigger-disabled' <<: *master + - zte-pod3: + slave-label: '{pod}' + installer: daisy + auto-trigger-name: 'daily-trigger-disabled' + <<: *fraser - orange-pod2: slave-label: '{pod}' installer: joid |