diff options
| -rw-r--r-- | jjb/qtip/qtip-ci-jobs.yml | 36 | ||||
| -rw-r--r-- | jjb/qtip/qtip-project-jobs.yml | 20 |
2 files changed, 16 insertions, 40 deletions
diff --git a/jjb/qtip/qtip-ci-jobs.yml b/jjb/qtip/qtip-ci-jobs.yml index 1c62df634..ac9854365 100644 --- a/jjb/qtip/qtip-ci-jobs.yml +++ b/jjb/qtip/qtip-ci-jobs.yml @@ -2,7 +2,7 @@ # job configuration for qtip #################################### - project: - name: qtip-ci-jobs + name: qtip project: 'qtip' @@ -20,22 +20,6 @@ # master #-------------------------------- pod: - - dell-pod1: - installer: compass - auto-trigger-name: 'daily-trigger-disabled' - <<: *master - - orange-pod2: - installer: joid - auto-trigger-name: 'daily-trigger-disabled' - <<: *master - - juniper-pod1: - installer: joid - <<: *master - auto-trigger-name: 'daily-trigger-disabled' - - zte-pod1: - installer: fuel - auto-trigger-name: 'daily-trigger-disabled' - <<: *master - zte-pod2: installer: fuel auto-trigger-name: 'qtip-daily-zte-pod2-trigger' @@ -80,6 +64,8 @@ - '{auto-trigger-name}' builders: + - description-setter: + description: "POD: $NODE_NAME" - 'qtip-cleanup' - 'qtip-daily-ci' @@ -105,22 +91,6 @@ ################# #trigger macros ################# - -#- trigger: -# name: 'qtip-daily-dell-pod1-trigger' -# triggers: -# - timed: '0 3 * * *' - -#- trigger: -# name: 'qtip-daily-juniper-pod1-trigger' -# triggers: -# - timed : '0 0 * * *' - -#- trigger: -# name: 'qtip-dailty-orange-pod2-trigger' -# triggers: -# - timed : ' 0 0 * * *' - - trigger: name: 'qtip-daily-zte-pod2-trigger' triggers: diff --git a/jjb/qtip/qtip-project-jobs.yml b/jjb/qtip/qtip-project-jobs.yml index 8b406fea5..8798fd115 100644 --- a/jjb/qtip/qtip-project-jobs.yml +++ b/jjb/qtip/qtip-project-jobs.yml @@ -1,22 +1,20 @@ - project: - name: qtip + name: qtip-project-jobs - project: '{name}' + project: 'qtip' jobs: - 'qtip-verify-{stream}' -# only master branch is enabled at the moment to keep no of jobs sane stream: - master: branch: '{stream}' gs-pathname: '' disabled: false - - colorado: - branch: 'stable/{stream}' - gs-pathname: '/{stream}' - disabled: false +################################ +## job templates +################################# - job-template: name: 'qtip-verify-{stream}' @@ -59,6 +57,14 @@ pattern: 'docs/**|.gitignore' builders: + - qtip-unit-tests-and-docs-build + +################################ +## job builders +################################# +- builder: + name: qtip-unit-tests-and-docs-build + builders: - shell: | #!/bin/bash set -o errexit |