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/opera/opera-daily-jobs.yaml | 99 ++++++++++++++++++++++++ jjb/opera/opera-daily-jobs.yml | 99 ------------------------ jjb/opera/opera-project-jobs.yaml | 56 ++++++++++++++ jjb/opera/opera-project-jobs.yml | 56 -------------- jjb/opera/opera-verify-jobs.yaml | 157 ++++++++++++++++++++++++++++++++++++++ jjb/opera/opera-verify-jobs.yml | 157 -------------------------------------- 6 files changed, 312 insertions(+), 312 deletions(-) create mode 100644 jjb/opera/opera-daily-jobs.yaml delete mode 100644 jjb/opera/opera-daily-jobs.yml create mode 100644 jjb/opera/opera-project-jobs.yaml delete mode 100644 jjb/opera/opera-project-jobs.yml create mode 100644 jjb/opera/opera-verify-jobs.yaml delete mode 100644 jjb/opera/opera-verify-jobs.yml (limited to 'jjb/opera') diff --git a/jjb/opera/opera-daily-jobs.yaml b/jjb/opera/opera-daily-jobs.yaml new file mode 100644 index 000000000..f0841a34b --- /dev/null +++ b/jjb/opera/opera-daily-jobs.yaml @@ -0,0 +1,99 @@ +--- +- project: + name: 'opera-daily-jobs' + + project: 'opera' + + ##################################### + # branch definitions + ##################################### + master: &master + stream: master + branch: '{stream}' + gs-pathname: '' + disabled: true + + ##################################### + # pod definitions + ##################################### + pod: + - virtual: + slave-label: 'huawei-virtual7' + os-version: 'xenial' + <<: *master + + ##################################### + # jobs + ##################################### + jobs: + - 'opera-{pod}-daily-{stream}' + +##################################### +# job templates +##################################### +- job-template: + name: 'opera-{pod}-daily-{stream}' + + project-type: multijob + + disabled: '{obj:disabled}' + + concurrent: false + + properties: + - logrotate-default + - throttle: + enabled: true + max-total: 1 + max-per-node: 1 + option: 'project' + + scm: + - git-scm + + wrappers: + - ssh-agent-wrapper + - timeout: + timeout: 240 + fail: true + + triggers: + - timed: '@midnight' + + parameters: + - project-parameter: + project: '{project}' + branch: '{branch}' + - string: + name: DEPLOY_SCENARIO + default: os-nosdn-openo-ha + - '{slave-label}-defaults' + + builders: + - description-setter: + description: "Built on $NODE_NAME" + - multijob: + name: deploy + condition: SUCCESSFUL + projects: + - name: 'compass-deploy-{pod}-daily-{stream}' + current-parameters: false + predefined-parameters: | + DEPLOY_SCENARIO=os-nosdn-openo-ha + COMPASS_OS_VERSION=xenial + node-parameters: true + kill-phase-on: FAILURE + abort-all-job: true + - multijob: + name: functest + condition: SUCCESSFUL + projects: + - name: 'functest-compass-{pod}-suite-{stream}' + current-parameters: false + predefined-parameters: | + DEPLOY_SCENARIO=os-nosdn-openo-ha + FUNCTEST_MODE=testcase + FUNCTEST_SUITE_NAME=opera_vims + node-parameters: true + kill-phase-on: NEVER + abort-all-job: true diff --git a/jjb/opera/opera-daily-jobs.yml b/jjb/opera/opera-daily-jobs.yml deleted file mode 100644 index f0841a34b..000000000 --- a/jjb/opera/opera-daily-jobs.yml +++ /dev/null @@ -1,99 +0,0 @@ ---- -- project: - name: 'opera-daily-jobs' - - project: 'opera' - - ##################################### - # branch definitions - ##################################### - master: &master - stream: master - branch: '{stream}' - gs-pathname: '' - disabled: true - - ##################################### - # pod definitions - ##################################### - pod: - - virtual: - slave-label: 'huawei-virtual7' - os-version: 'xenial' - <<: *master - - ##################################### - # jobs - ##################################### - jobs: - - 'opera-{pod}-daily-{stream}' - -##################################### -# job templates -##################################### -- job-template: - name: 'opera-{pod}-daily-{stream}' - - project-type: multijob - - disabled: '{obj:disabled}' - - concurrent: false - - properties: - - logrotate-default - - throttle: - enabled: true - max-total: 1 - max-per-node: 1 - option: 'project' - - scm: - - git-scm - - wrappers: - - ssh-agent-wrapper - - timeout: - timeout: 240 - fail: true - - triggers: - - timed: '@midnight' - - parameters: - - project-parameter: - project: '{project}' - branch: '{branch}' - - string: - name: DEPLOY_SCENARIO - default: os-nosdn-openo-ha - - '{slave-label}-defaults' - - builders: - - description-setter: - description: "Built on $NODE_NAME" - - multijob: - name: deploy - condition: SUCCESSFUL - projects: - - name: 'compass-deploy-{pod}-daily-{stream}' - current-parameters: false - predefined-parameters: | - DEPLOY_SCENARIO=os-nosdn-openo-ha - COMPASS_OS_VERSION=xenial - node-parameters: true - kill-phase-on: FAILURE - abort-all-job: true - - multijob: - name: functest - condition: SUCCESSFUL - projects: - - name: 'functest-compass-{pod}-suite-{stream}' - current-parameters: false - predefined-parameters: | - DEPLOY_SCENARIO=os-nosdn-openo-ha - FUNCTEST_MODE=testcase - FUNCTEST_SUITE_NAME=opera_vims - node-parameters: true - kill-phase-on: NEVER - abort-all-job: true diff --git a/jjb/opera/opera-project-jobs.yaml b/jjb/opera/opera-project-jobs.yaml new file mode 100644 index 000000000..f866342a4 --- /dev/null +++ b/jjb/opera/opera-project-jobs.yaml @@ -0,0 +1,56 @@ +--- +- project: + + name: opera-project + + project: 'opera' + + stream: + - master: + branch: '{stream}' + gs-pathname: '' + + jobs: + - 'opera-build-{stream}' + +######################## +# job templates +######################## +- job-template: + name: 'opera-build-{stream}' + + concurrent: true + + properties: + - logrotate-default + - throttle: + enabled: true + max-total: 1 + max-per-node: 1 + option: 'project' + + parameters: + - project-parameter: + project: '{project}' + branch: '{branch}' + - 'opnfv-build-ubuntu-defaults' + + scm: + - git-scm + + triggers: + - timed: 'H 23 * * *' + + builders: + - 'opera-build-macro' + +##################################### +# builder macros +##################################### +- builder: + name: 'opera-build-macro' + builders: + - shell: | + #!/bin/bash + + echo "Hello world!" diff --git a/jjb/opera/opera-project-jobs.yml b/jjb/opera/opera-project-jobs.yml deleted file mode 100644 index f866342a4..000000000 --- a/jjb/opera/opera-project-jobs.yml +++ /dev/null @@ -1,56 +0,0 @@ ---- -- project: - - name: opera-project - - project: 'opera' - - stream: - - master: - branch: '{stream}' - gs-pathname: '' - - jobs: - - 'opera-build-{stream}' - -######################## -# job templates -######################## -- job-template: - name: 'opera-build-{stream}' - - concurrent: true - - properties: - - logrotate-default - - throttle: - enabled: true - max-total: 1 - max-per-node: 1 - option: 'project' - - parameters: - - project-parameter: - project: '{project}' - branch: '{branch}' - - 'opnfv-build-ubuntu-defaults' - - scm: - - git-scm - - triggers: - - timed: 'H 23 * * *' - - builders: - - 'opera-build-macro' - -##################################### -# builder macros -##################################### -- builder: - name: 'opera-build-macro' - builders: - - shell: | - #!/bin/bash - - echo "Hello world!" diff --git a/jjb/opera/opera-verify-jobs.yaml b/jjb/opera/opera-verify-jobs.yaml new file mode 100644 index 000000000..97c9a43ec --- /dev/null +++ b/jjb/opera/opera-verify-jobs.yaml @@ -0,0 +1,157 @@ +--- +- project: + name: 'opera-verify-jobs' + + project: 'opera' + + ##################################### + # branch definitions + ##################################### + stream: + - master: + branch: '{stream}' + gs-pathname: '' + disabled: true + + ##################################### + # patch verification phases + ##################################### + phase: + - 'basic' + - 'deploy' + + ##################################### + # jobs + ##################################### + jobs: + - 'opera-verify-{stream}' + - 'opera-verify-{phase}-{stream}' +##################################### +# job templates +##################################### +- job-template: + name: 'opera-verify-{stream}' + + project-type: multijob + + disabled: '{obj:disabled}' + + concurrent: true + + properties: + - logrotate-default + - throttle: + enabled: true + max-total: 1 + max-per-node: 1 + option: 'project' + + scm: + - git-scm-gerrit + + wrappers: + - ssh-agent-wrapper + - timeout: + timeout: 120 + 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}' + file-paths: + - compare-type: ANT + pattern: '**/*' + disable-strict-forbidden-file-verification: 'true' + forbidden-file-paths: + - compare-type: ANT + pattern: 'docs/**' + readable-message: true + + parameters: + - project-parameter: + project: '{project}' + branch: '{branch}' + - 'huawei-pod7-defaults' + + builders: + - description-setter: + description: "Built on $NODE_NAME" + - multijob: + name: basic + condition: SUCCESSFUL + projects: + - name: 'opera-verify-basic-{stream}' + current-parameters: true + node-parameters: true + kill-phase-on: FAILURE + abort-all-job: true + - multijob: + name: deploy + condition: SUCCESSFUL + projects: + - name: 'opera-verify-deploy-{stream}' + current-parameters: true + node-parameters: true + kill-phase-on: FAILURE + abort-all-job: true + +- job-template: + name: 'opera-verify-{phase}-{stream}' + + disabled: '{obj:disabled}' + + concurrent: true + + properties: + - logrotate-default + - throttle: + enabled: true + max-per-node: 1 + option: 'project' + + scm: + - git-scm-gerrit + + wrappers: + - ssh-agent-wrapper + - timeout: + timeout: 120 + fail: true + + builders: + - description-setter: + description: "Built on $NODE_NAME" + - '{project}-verify-{phase}-macro' + +##################################### +# builder macros +##################################### +- builder: + name: 'opera-verify-basic-macro' + builders: + - shell: | + #!/bin/bash + echo "Hello world!" + +- builder: + name: 'opera-verify-deploy-macro' + builders: + - shell: | + #!/bin/bash + echo "Hello world!" diff --git a/jjb/opera/opera-verify-jobs.yml b/jjb/opera/opera-verify-jobs.yml deleted file mode 100644 index 97c9a43ec..000000000 --- a/jjb/opera/opera-verify-jobs.yml +++ /dev/null @@ -1,157 +0,0 @@ ---- -- project: - name: 'opera-verify-jobs' - - project: 'opera' - - ##################################### - # branch definitions - ##################################### - stream: - - master: - branch: '{stream}' - gs-pathname: '' - disabled: true - - ##################################### - # patch verification phases - ##################################### - phase: - - 'basic' - - 'deploy' - - ##################################### - # jobs - ##################################### - jobs: - - 'opera-verify-{stream}' - - 'opera-verify-{phase}-{stream}' -##################################### -# job templates -##################################### -- job-template: - name: 'opera-verify-{stream}' - - project-type: multijob - - disabled: '{obj:disabled}' - - concurrent: true - - properties: - - logrotate-default - - throttle: - enabled: true - max-total: 1 - max-per-node: 1 - option: 'project' - - scm: - - git-scm-gerrit - - wrappers: - - ssh-agent-wrapper - - timeout: - timeout: 120 - 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}' - file-paths: - - compare-type: ANT - pattern: '**/*' - disable-strict-forbidden-file-verification: 'true' - forbidden-file-paths: - - compare-type: ANT - pattern: 'docs/**' - readable-message: true - - parameters: - - project-parameter: - project: '{project}' - branch: '{branch}' - - 'huawei-pod7-defaults' - - builders: - - description-setter: - description: "Built on $NODE_NAME" - - multijob: - name: basic - condition: SUCCESSFUL - projects: - - name: 'opera-verify-basic-{stream}' - current-parameters: true - node-parameters: true - kill-phase-on: FAILURE - abort-all-job: true - - multijob: - name: deploy - condition: SUCCESSFUL - projects: - - name: 'opera-verify-deploy-{stream}' - current-parameters: true - node-parameters: true - kill-phase-on: FAILURE - abort-all-job: true - -- job-template: - name: 'opera-verify-{phase}-{stream}' - - disabled: '{obj:disabled}' - - concurrent: true - - properties: - - logrotate-default - - throttle: - enabled: true - max-per-node: 1 - option: 'project' - - scm: - - git-scm-gerrit - - wrappers: - - ssh-agent-wrapper - - timeout: - timeout: 120 - fail: true - - builders: - - description-setter: - description: "Built on $NODE_NAME" - - '{project}-verify-{phase}-macro' - -##################################### -# builder macros -##################################### -- builder: - name: 'opera-verify-basic-macro' - builders: - - shell: | - #!/bin/bash - echo "Hello world!" - -- builder: - name: 'opera-verify-deploy-macro' - builders: - - shell: | - #!/bin/bash - echo "Hello world!" -- cgit 1.2.3-korg