diff options
| -rw-r--r-- | jjb/orchestra/orchestra-daily-jobs.yml | 121 | ||||
| -rw-r--r-- | jjb/orchestra/orchestra-project-jobs.yml | 41 |
2 files changed, 81 insertions, 81 deletions
diff --git a/jjb/orchestra/orchestra-daily-jobs.yml b/jjb/orchestra/orchestra-daily-jobs.yml index 6baaab896..74c997cad 100644 --- a/jjb/orchestra/orchestra-daily-jobs.yml +++ b/jjb/orchestra/orchestra-daily-jobs.yml @@ -1,3 +1,4 @@ +--- ################################### # job configuration for orchestra ################################### @@ -6,26 +7,26 @@ project: 'orchestra' -#-------------------------------- -# BRANCH ANCHORS -#-------------------------------- + # ------------------------------- + # BRANCH ANCHORS + # ------------------------------- master: &master - stream: master - branch: '{stream}' - gs-pathname: '' - disabled: false + stream: master + branch: '{stream}' + gs-pathname: '' + disabled: false -#------------------------------------------------------- -# POD, INSTALLER, AND BRANCH MAPPING -#------------------------------------------------------- + # ------------------------------------------------------ + # POD, INSTALLER, AND BRANCH MAPPING + # ------------------------------------------------------ pod: - - virtual: - slave-label: 'joid-virtual' - os-version: 'xenial' - <<: *master + - virtual: + slave-label: 'joid-virtual' + os-version: 'xenial' + <<: *master jobs: - - 'orchestra-{pod}-daily-{stream}' + - 'orchestra-{pod}-daily-{stream}' ################################ # job template @@ -40,59 +41,59 @@ concurrent: false properties: - - logrotate-default - - throttle: - enabled: true - max-total: 1 - max-per-node: 1 - option: 'project' + - logrotate-default + - throttle: + enabled: true + max-total: 1 + max-per-node: 1 + option: 'project' scm: - - git-scm + - git-scm wrappers: - - ssh-agent-wrapper + - ssh-agent-wrapper - - timeout: - timeout: 240 - fail: true + - timeout: + timeout: 240 + fail: true triggers: - - timed: '@daily' + - timed: '@daily' parameters: - - project-parameter: - project: '{project}' - branch: '{branch}' - - string: - name: DEPLOY_SCENARIO - default: os-nosdn-openbaton-ha - - '{slave-label}-defaults' + - project-parameter: + project: '{project}' + branch: '{branch}' + - string: + name: DEPLOY_SCENARIO + default: os-nosdn-openbaton-ha + - '{slave-label}-defaults' builders: - - description-setter: - description: "Built on $NODE_NAME" - - multijob: - name: deploy - condition: SUCCESSFUL - projects: - - name: 'joid-deploy-{pod}-daily-{stream}' - current-parameters: false - predefined-parameters: | - DEPLOY_SCENARIO=os-nosdn-openbaton-ha - COMPASS_OS_VERSION=xenial - node-parameters: true - kill-phase-on: FAILURE - abort-all-job: true - - multijob: - name: functest - condition: SUCCESSFUL - projects: - - name: 'functest-joid-{pod}-daily-{stream}' - current-parameters: false - predefined-parameters: | - DEPLOY_SCENARIO=os-nosdn-openbaton-ha - FUNCTEST_SUITE_NAME=orchestra_ims - node-parameters: true - kill-phase-on: NEVER - abort-all-job: true + - description-setter: + description: "Built on $NODE_NAME" + - multijob: + name: deploy + condition: SUCCESSFUL + projects: + - name: 'joid-deploy-{pod}-daily-{stream}' + current-parameters: false + predefined-parameters: | + DEPLOY_SCENARIO=os-nosdn-openbaton-ha + COMPASS_OS_VERSION=xenial + node-parameters: true + kill-phase-on: FAILURE + abort-all-job: true + - multijob: + name: functest + condition: SUCCESSFUL + projects: + - name: 'functest-joid-{pod}-daily-{stream}' + current-parameters: false + predefined-parameters: | + DEPLOY_SCENARIO=os-nosdn-openbaton-ha + FUNCTEST_SUITE_NAME=orchestra_ims + node-parameters: true + kill-phase-on: NEVER + abort-all-job: true diff --git a/jjb/orchestra/orchestra-project-jobs.yml b/jjb/orchestra/orchestra-project-jobs.yml index 0f0c0f6c9..60732ce03 100644 --- a/jjb/orchestra/orchestra-project-jobs.yml +++ b/jjb/orchestra/orchestra-project-jobs.yml @@ -1,3 +1,4 @@ +--- - project: name: orchestra-project @@ -5,12 +6,12 @@ project: 'orchestra' stream: - - master: - branch: '{stream}' - gs-pathname: '' + - master: + branch: '{stream}' + gs-pathname: '' jobs: - - 'orchestra-build-{stream}' + - 'orchestra-build-{stream}' - job-template: name: 'orchestra-build-{stream}' @@ -18,33 +19,31 @@ concurrent: true properties: - - logrotate-default - - throttle: - enabled: true - max-total: 1 - max-per-node: 1 - option: 'project' + - logrotate-default + - throttle: + enabled: true + max-total: 1 + max-per-node: 1 + option: 'project' parameters: - - project-parameter: - project: '{project}' - branch: '{branch}' + - project-parameter: + project: '{project}' + branch: '{branch}' scm: - - git-scm + - git-scm triggers: - - timed: 'H 23 * * *' + - timed: 'H 23 * * *' builders: - - 'orchestra-build-macro' + - 'orchestra-build-macro' - builder: name: 'orchestra-build-macro' builders: - - shell: | - #!/bin/bash - - echo "Hello world!" - + - shell: | + #!/bin/bash + echo "Hello world!" |