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/container4nfv/container4nfv-arm64.yaml | 95 +++++++++++++++ jjb/container4nfv/container4nfv-arm64.yml | 95 --------------- jjb/container4nfv/container4nfv-project.yaml | 169 +++++++++++++++++++++++++++ jjb/container4nfv/container4nfv-project.yml | 169 --------------------------- jjb/container4nfv/yardstick-arm64.yaml | 130 +++++++++++++++++++++ jjb/container4nfv/yardstick-arm64.yml | 130 --------------------- 6 files changed, 394 insertions(+), 394 deletions(-) create mode 100644 jjb/container4nfv/container4nfv-arm64.yaml delete mode 100644 jjb/container4nfv/container4nfv-arm64.yml create mode 100644 jjb/container4nfv/container4nfv-project.yaml delete mode 100644 jjb/container4nfv/container4nfv-project.yml create mode 100644 jjb/container4nfv/yardstick-arm64.yaml delete mode 100644 jjb/container4nfv/yardstick-arm64.yml (limited to 'jjb/container4nfv') diff --git a/jjb/container4nfv/container4nfv-arm64.yaml b/jjb/container4nfv/container4nfv-arm64.yaml new file mode 100644 index 000000000..5f5bc8627 --- /dev/null +++ b/jjb/container4nfv/container4nfv-arm64.yaml @@ -0,0 +1,95 @@ +--- + +- project: + name: 'container4nfv-arm64' + project: 'container4nfv' + installer: 'compass' + stream: + - master: + branch: master + - fraser: + branch: stable/fraser + scenario: + - 'k8-multus-nofeature-noha': + disabled: false + - 'k8-sriov-nofeature-noha': + disabled: false + pod: + - virtual: + slave-label: arm-packet01 + - baremetal: + slave-label: compass-baremetal-arm + jobs: + - 'container4nfv-{scenario}-{pod}-daily-{stream}' + + +- job-template: + name: 'container4nfv-{scenario}-{pod}-daily-{stream}' + disabled: '{obj:disabled}' + concurrent: false + node: '{slave-label}' + + scm: + - git: + url: https://gerrit.opnfv.org/gerrit/compass4nfv + branches: + - '{branch}' + basedir: compass4nfv + wipe-workspace: true + + triggers: + - 'trigger-{scenario}-{pod}-{stream}' + + wrappers: + - timeout: + timeout: 150 + fail: true + + builders: + - shell: + !include-raw: arm64/compass-build.sh + - shell: + !include-raw: arm64/compass-deploy.sh + - trigger-builds: + - project: yardstick-arm64-compass-arm-virtual03-daily-master + current-parameters: false + same-node: true + block: false + + +- trigger: + name: 'trigger-k8-multus-nofeature-noha-virtual-master' + triggers: + - timed: '0 12 * * *' +- trigger: + name: 'trigger-k8-sriov-nofeature-noha-virtual-master' + triggers: + - timed: '0 15 * * *' + +- trigger: + name: 'trigger-k8-multus-nofeature-noha-virtual-fraser' + triggers: + - timed: '0 18 * * *' +- trigger: + name: 'trigger-k8-sriov-nofeature-noha-virtual-fraser' + triggers: + - timed: '0 21 * * *' + + +- trigger: + name: 'trigger-k8-multus-nofeature-noha-baremetal-master' + triggers: + - timed: '0 12 * * *' +- trigger: + name: 'trigger-k8-sriov-nofeature-noha-baremetal-master' + triggers: + - timed: '0 15 * * *' + +- trigger: + name: 'trigger-k8-multus-nofeature-noha-baremetal-fraser' + triggers: + - timed: '0 18 * * *' +- trigger: + name: 'trigger-k8-sriov-nofeature-noha-baremetal-fraser' + triggers: + - timed: '0 21 * * *' diff --git a/jjb/container4nfv/container4nfv-arm64.yml b/jjb/container4nfv/container4nfv-arm64.yml deleted file mode 100644 index 5f5bc8627..000000000 --- a/jjb/container4nfv/container4nfv-arm64.yml +++ /dev/null @@ -1,95 +0,0 @@ ---- - -- project: - name: 'container4nfv-arm64' - project: 'container4nfv' - installer: 'compass' - stream: - - master: - branch: master - - fraser: - branch: stable/fraser - scenario: - - 'k8-multus-nofeature-noha': - disabled: false - - 'k8-sriov-nofeature-noha': - disabled: false - pod: - - virtual: - slave-label: arm-packet01 - - baremetal: - slave-label: compass-baremetal-arm - jobs: - - 'container4nfv-{scenario}-{pod}-daily-{stream}' - - -- job-template: - name: 'container4nfv-{scenario}-{pod}-daily-{stream}' - disabled: '{obj:disabled}' - concurrent: false - node: '{slave-label}' - - scm: - - git: - url: https://gerrit.opnfv.org/gerrit/compass4nfv - branches: - - '{branch}' - basedir: compass4nfv - wipe-workspace: true - - triggers: - - 'trigger-{scenario}-{pod}-{stream}' - - wrappers: - - timeout: - timeout: 150 - fail: true - - builders: - - shell: - !include-raw: arm64/compass-build.sh - - shell: - !include-raw: arm64/compass-deploy.sh - - trigger-builds: - - project: yardstick-arm64-compass-arm-virtual03-daily-master - current-parameters: false - same-node: true - block: false - - -- trigger: - name: 'trigger-k8-multus-nofeature-noha-virtual-master' - triggers: - - timed: '0 12 * * *' -- trigger: - name: 'trigger-k8-sriov-nofeature-noha-virtual-master' - triggers: - - timed: '0 15 * * *' - -- trigger: - name: 'trigger-k8-multus-nofeature-noha-virtual-fraser' - triggers: - - timed: '0 18 * * *' -- trigger: - name: 'trigger-k8-sriov-nofeature-noha-virtual-fraser' - triggers: - - timed: '0 21 * * *' - - -- trigger: - name: 'trigger-k8-multus-nofeature-noha-baremetal-master' - triggers: - - timed: '0 12 * * *' -- trigger: - name: 'trigger-k8-sriov-nofeature-noha-baremetal-master' - triggers: - - timed: '0 15 * * *' - -- trigger: - name: 'trigger-k8-multus-nofeature-noha-baremetal-fraser' - triggers: - - timed: '0 18 * * *' -- trigger: - name: 'trigger-k8-sriov-nofeature-noha-baremetal-fraser' - triggers: - - timed: '0 21 * * *' diff --git a/jjb/container4nfv/container4nfv-project.yaml b/jjb/container4nfv/container4nfv-project.yaml new file mode 100644 index 000000000..194a1a989 --- /dev/null +++ b/jjb/container4nfv/container4nfv-project.yaml @@ -0,0 +1,169 @@ +--- +################################################### +# All the jobs except verify have been removed! +# They will only be enabled on request by projects! +################################################### +- project: + name: container4nfv + + project: '{name}' + + jobs: + - 'container4nfv-verify-{stream}' + - 'container4nfv-daily-upload-{stream}' + - 'container4nfv-daily-deploy-{stream}' + + stream: + - master: + branch: '{stream}' + gs-pathname: '' + disabled: false + - fraser: &fraser + branch: 'stable/{stream}' + gs-pathname: '/{stream}' + disabled: false + +- job-template: + name: 'container4nfv-verify-{stream}' + + disabled: '{obj:disabled}' + + parameters: + - project-parameter: + project: '{project}' + branch: '{branch}' + # yamllint disable rule:line-length + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: "Used for overriding the GIT URL coming from Global Jenkins\ + \ configuration in case if the stuff is done on none-LF HW." + # yamllint enable rule:line-length + - 'opnfv-build-ubuntu-defaults' + + scm: + - git-scm-gerrit + + 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' + + builders: + - shell: | + cd $WORKSPACE/ci + ./build.sh + +- job-template: + name: 'container4nfv-daily-upload-{stream}' + + disabled: '{obj:disabled}' + + concurrent: false + + scm: + - git-scm + + wrappers: + - fix-workspace-permissions + + parameters: + - project-parameter: + project: '{project}' + branch: '{branch}' + - 'opnfv-build-ubuntu-defaults' + - 'container4nfv-defaults': + gs-pathname: '{gs-pathname}' + + builders: + - shell: | + cd $WORKSPACE/ci + ./upload.sh + +- job-template: + name: 'container4nfv-daily-deploy-{stream}' + + project-type: freestyle + + disabled: '{obj:disabled}' + + concurrent: false + + properties: + - logrotate-default + - throttle: + enabled: true + max-per-node: 1 + option: 'project' + - build-blocker: + use-build-blocker: true + blocking-jobs: + - 'clover-daily-deploy-.*?' + - 'container4nfv-daily-deploy-.*?' + block-level: 'NODE' + + wrappers: + - timeout: + timeout: 240 + abort: true + - fix-workspace-permissions + + parameters: + - project-parameter: + project: '{project}' + branch: '{branch}' + # yamllint disable rule:line-length + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: "Used for overriding the GIT URL coming from Global Jenkins\ + \ configuration in case if the stuff is done on none-LF HW." + # yamllint enable rule:line-length + - node: + name: SLAVE_NAME + description: 'Slave name on Jenkins' + allowed-slaves: + - huawei-virtual6 + default-slaves: + - huawei-virtual6 + + scm: + - git-scm + + triggers: + - timed: '@midnight' + + builders: + - shell: | + cd $WORKSPACE/ci + ./deploy.sh + +################### +# parameter macros +################### +- parameter: + name: 'container4nfv-defaults' + parameters: + - string: + name: GS_URL + default: artifacts.opnfv.org/$PROJECT{gs-pathname} + description: "URL to Google Storage." diff --git a/jjb/container4nfv/container4nfv-project.yml b/jjb/container4nfv/container4nfv-project.yml deleted file mode 100644 index 194a1a989..000000000 --- a/jjb/container4nfv/container4nfv-project.yml +++ /dev/null @@ -1,169 +0,0 @@ ---- -################################################### -# All the jobs except verify have been removed! -# They will only be enabled on request by projects! -################################################### -- project: - name: container4nfv - - project: '{name}' - - jobs: - - 'container4nfv-verify-{stream}' - - 'container4nfv-daily-upload-{stream}' - - 'container4nfv-daily-deploy-{stream}' - - stream: - - master: - branch: '{stream}' - gs-pathname: '' - disabled: false - - fraser: &fraser - branch: 'stable/{stream}' - gs-pathname: '/{stream}' - disabled: false - -- job-template: - name: 'container4nfv-verify-{stream}' - - disabled: '{obj:disabled}' - - parameters: - - project-parameter: - project: '{project}' - branch: '{branch}' - # yamllint disable rule:line-length - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - description: "Used for overriding the GIT URL coming from Global Jenkins\ - \ configuration in case if the stuff is done on none-LF HW." - # yamllint enable rule:line-length - - 'opnfv-build-ubuntu-defaults' - - scm: - - git-scm-gerrit - - 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' - - builders: - - shell: | - cd $WORKSPACE/ci - ./build.sh - -- job-template: - name: 'container4nfv-daily-upload-{stream}' - - disabled: '{obj:disabled}' - - concurrent: false - - scm: - - git-scm - - wrappers: - - fix-workspace-permissions - - parameters: - - project-parameter: - project: '{project}' - branch: '{branch}' - - 'opnfv-build-ubuntu-defaults' - - 'container4nfv-defaults': - gs-pathname: '{gs-pathname}' - - builders: - - shell: | - cd $WORKSPACE/ci - ./upload.sh - -- job-template: - name: 'container4nfv-daily-deploy-{stream}' - - project-type: freestyle - - disabled: '{obj:disabled}' - - concurrent: false - - properties: - - logrotate-default - - throttle: - enabled: true - max-per-node: 1 - option: 'project' - - build-blocker: - use-build-blocker: true - blocking-jobs: - - 'clover-daily-deploy-.*?' - - 'container4nfv-daily-deploy-.*?' - block-level: 'NODE' - - wrappers: - - timeout: - timeout: 240 - abort: true - - fix-workspace-permissions - - parameters: - - project-parameter: - project: '{project}' - branch: '{branch}' - # yamllint disable rule:line-length - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - description: "Used for overriding the GIT URL coming from Global Jenkins\ - \ configuration in case if the stuff is done on none-LF HW." - # yamllint enable rule:line-length - - node: - name: SLAVE_NAME - description: 'Slave name on Jenkins' - allowed-slaves: - - huawei-virtual6 - default-slaves: - - huawei-virtual6 - - scm: - - git-scm - - triggers: - - timed: '@midnight' - - builders: - - shell: | - cd $WORKSPACE/ci - ./deploy.sh - -################### -# parameter macros -################### -- parameter: - name: 'container4nfv-defaults' - parameters: - - string: - name: GS_URL - default: artifacts.opnfv.org/$PROJECT{gs-pathname} - description: "URL to Google Storage." diff --git a/jjb/container4nfv/yardstick-arm64.yaml b/jjb/container4nfv/yardstick-arm64.yaml new file mode 100644 index 000000000..6ed345ecc --- /dev/null +++ b/jjb/container4nfv/yardstick-arm64.yaml @@ -0,0 +1,130 @@ +--- +################################### +# job configuration for yardstick +################################### +- project: + name: yardstick-arm64 + + project: 'yardstick' + + # ------------------------------- + # BRANCH ANCHORS + # ------------------------------- + master: &master + stream: master + branch: '{stream}' + gs-pathname: '' + docker-tag: 'latest' + fraser: &fraser + stream: fraser + branch: '{stream}' + gs-pathname: 'stable/{stream}' + docker-tag: 'stable' + # ------------------------------- + # POD, INSTALLER, AND BRANCH MAPPING + # ------------------------------- + # Installers using labels + # CI PODs + # This section should only contain the installers + # that have been switched using labels for slaves + # ------------------------------- + pod: + # apex CI PODs + - arm-virtual03: + slave-label: arm-packet01 + installer: compass + auto-trigger-name: 'daily-trigger-disabled' + <<: *master + # ------------------------------- + testsuite: + - 'daily' + + jobs: + - 'yardstick-arm64-{installer}-{pod}-{testsuite}-{stream}' + +################################ +# job templates +################################ +- job-template: + name: 'yardstick-arm64-{installer}-{pod}-{testsuite}-{stream}' + disabled: false + + concurrent: true + + properties: + - logrotate-default + - throttle: + enabled: true + max-per-node: 1 + option: 'project' + + wrappers: + - build-name: + name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO' + - timeout: + timeout: 60 + abort: true + + triggers: + - '{auto-trigger-name}' + + parameters: + - project-parameter: + project: '{project}' + branch: '{branch}' + - '{installer}-defaults' + - 'yardstick-params-{slave-label}' + - string: + name: DEPLOY_SCENARIO + default: 'k8-nosdn-lb-noha_daily' + - string: + name: DOCKER_TAG + default: '{docker-tag}' + description: 'Tag to pull docker image' + - string: + name: YARDSTICK_SCENARIO_SUITE_NAME + default: opnfv_${{DEPLOY_SCENARIO}}_{testsuite}.yaml + description: 'Path to test scenario suite' + - string: + name: CI_DEBUG + default: 'false' + description: "Show debut output information" + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: "Used for overriding the GIT URL coming from Global Jenkins configuration." + + scm: + - git-scm + + builders: + - description-setter: + description: "POD: $NODE_NAME" + - 'yardstick-arm64' + + publishers: + - email: + recipients: trevor.tao@arm.com yibo.cai@arm.com + - email-jenkins-admins-on-failure + +######################## +# builder macros +######################## +- builder: + name: yardstick-arm64 + builders: + - shell: + !include-raw: arm64/yardstick-arm64.sh + +######################## +# parameter macros +######################## + + +- parameter: + name: 'yardstick-params-arm-packet01' + parameters: + - string: + name: YARDSTICK_DB_BACKEND + default: '-i 104.197.68.199:8086' + description: 'Arguments to use in order to choose the backend DB' diff --git a/jjb/container4nfv/yardstick-arm64.yml b/jjb/container4nfv/yardstick-arm64.yml deleted file mode 100644 index 6ed345ecc..000000000 --- a/jjb/container4nfv/yardstick-arm64.yml +++ /dev/null @@ -1,130 +0,0 @@ ---- -################################### -# job configuration for yardstick -################################### -- project: - name: yardstick-arm64 - - project: 'yardstick' - - # ------------------------------- - # BRANCH ANCHORS - # ------------------------------- - master: &master - stream: master - branch: '{stream}' - gs-pathname: '' - docker-tag: 'latest' - fraser: &fraser - stream: fraser - branch: '{stream}' - gs-pathname: 'stable/{stream}' - docker-tag: 'stable' - # ------------------------------- - # POD, INSTALLER, AND BRANCH MAPPING - # ------------------------------- - # Installers using labels - # CI PODs - # This section should only contain the installers - # that have been switched using labels for slaves - # ------------------------------- - pod: - # apex CI PODs - - arm-virtual03: - slave-label: arm-packet01 - installer: compass - auto-trigger-name: 'daily-trigger-disabled' - <<: *master - # ------------------------------- - testsuite: - - 'daily' - - jobs: - - 'yardstick-arm64-{installer}-{pod}-{testsuite}-{stream}' - -################################ -# job templates -################################ -- job-template: - name: 'yardstick-arm64-{installer}-{pod}-{testsuite}-{stream}' - disabled: false - - concurrent: true - - properties: - - logrotate-default - - throttle: - enabled: true - max-per-node: 1 - option: 'project' - - wrappers: - - build-name: - name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO' - - timeout: - timeout: 60 - abort: true - - triggers: - - '{auto-trigger-name}' - - parameters: - - project-parameter: - project: '{project}' - branch: '{branch}' - - '{installer}-defaults' - - 'yardstick-params-{slave-label}' - - string: - name: DEPLOY_SCENARIO - default: 'k8-nosdn-lb-noha_daily' - - string: - name: DOCKER_TAG - default: '{docker-tag}' - description: 'Tag to pull docker image' - - string: - name: YARDSTICK_SCENARIO_SUITE_NAME - default: opnfv_${{DEPLOY_SCENARIO}}_{testsuite}.yaml - description: 'Path to test scenario suite' - - string: - name: CI_DEBUG - default: 'false' - description: "Show debut output information" - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - description: "Used for overriding the GIT URL coming from Global Jenkins configuration." - - scm: - - git-scm - - builders: - - description-setter: - description: "POD: $NODE_NAME" - - 'yardstick-arm64' - - publishers: - - email: - recipients: trevor.tao@arm.com yibo.cai@arm.com - - email-jenkins-admins-on-failure - -######################## -# builder macros -######################## -- builder: - name: yardstick-arm64 - builders: - - shell: - !include-raw: arm64/yardstick-arm64.sh - -######################## -# parameter macros -######################## - - -- parameter: - name: 'yardstick-params-arm-packet01' - parameters: - - string: - name: YARDSTICK_DB_BACKEND - default: '-i 104.197.68.199:8086' - description: 'Arguments to use in order to choose the backend DB' -- cgit 1.2.3-korg