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/dovetail/dovetail-artifacts-upload.yaml | 115 ++++++++++++ jjb/dovetail/dovetail-artifacts-upload.yml | 115 ------------ jjb/dovetail/dovetail-ci-jobs.yaml | 271 ++++++++++++++++++++++++++++ jjb/dovetail/dovetail-ci-jobs.yml | 271 ---------------------------- jjb/dovetail/dovetail-project-jobs.yaml | 116 ++++++++++++ jjb/dovetail/dovetail-project-jobs.yml | 116 ------------ jjb/dovetail/dovetail-weekly-jobs.yaml | 139 ++++++++++++++ jjb/dovetail/dovetail-weekly-jobs.yml | 139 -------------- 8 files changed, 641 insertions(+), 641 deletions(-) create mode 100644 jjb/dovetail/dovetail-artifacts-upload.yaml delete mode 100644 jjb/dovetail/dovetail-artifacts-upload.yml create mode 100644 jjb/dovetail/dovetail-ci-jobs.yaml delete mode 100644 jjb/dovetail/dovetail-ci-jobs.yml create mode 100644 jjb/dovetail/dovetail-project-jobs.yaml delete mode 100644 jjb/dovetail/dovetail-project-jobs.yml create mode 100644 jjb/dovetail/dovetail-weekly-jobs.yaml delete mode 100644 jjb/dovetail/dovetail-weekly-jobs.yml (limited to 'jjb/dovetail') diff --git a/jjb/dovetail/dovetail-artifacts-upload.yaml b/jjb/dovetail/dovetail-artifacts-upload.yaml new file mode 100644 index 000000000..9a11c6e26 --- /dev/null +++ b/jjb/dovetail/dovetail-artifacts-upload.yaml @@ -0,0 +1,115 @@ +--- +############################################ +# dovetail upload artifacts job +############################################ +- project: + name: dovetail-artifacts-upload + + project: 'dovetail' + + jobs: + - 'dovetail-{image}-artifacts-upload-{stream}' + + stream: + - master: + branch: '{stream}' + gs-pathname: '' + disabled: false + + image: + - 'dovetail' + - 'functest' + - 'yardstick' + - 'testapi' + - 'mongo' + +############################################# +# job template +############################################# + +- job-template: + name: 'dovetail-{image}-artifacts-upload-{stream}' + + + disabled: '{obj:disabled}' + + 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' + - dovetail-parameter: + gs-pathname: '{gs-pathname}' + image: '{image}' + branch: '{branch}' + + scm: + - git-scm + + builders: + - 'dovetail-builder-artifacts-upload' + - 'dovetail-upload-artifacts-cache-cleanup' + - 'dovetail-images-cleanup' + +#################### +# parameter macros +#################### +- parameter: + name: dovetail-parameter + parameters: + - string: + name: CACHE_DIR + default: $WORKSPACE/cache{gs-pathname} + description: "the cache to store packages downloaded" + - string: + name: STORE_URL + default: gs://artifacts.opnfv.org/dovetail{gs-pathname} + description: "LF artifacts url for storage of dovetail packages" + - string: + name: DOCKER_REPO_NAME + default: opnfv/{image} + description: "docker repo name" + - string: + name: DOCKER_TAG + default: latest + description: "docker image tag of which will be uploaded to artifacts" + - string: + name: STORE_FILE_NAME + default: image_{image}_{branch}_$BUILD_ID.docker + description: "stored file name" + +#################################### +# builders for dovetail project +#################################### +- builder: + name: dovetail-builder-artifacts-upload + builders: + - shell: + !include-raw: ./dovetail-artifacts-upload.sh + +- builder: + name: dovetail-upload-artifacts-cache-cleanup + builders: + - shell: | + #!/bin/bash + set -o errexit + + echo "Dovetail: cleanup cache used for storage downloaded packages" + + /bin/rm -rf $CACHE_DIR + +- builder: + name: dovetail-images-cleanup + builders: + - shell: + !include-raw: ./dovetail-cleanup.sh diff --git a/jjb/dovetail/dovetail-artifacts-upload.yml b/jjb/dovetail/dovetail-artifacts-upload.yml deleted file mode 100644 index 9a11c6e26..000000000 --- a/jjb/dovetail/dovetail-artifacts-upload.yml +++ /dev/null @@ -1,115 +0,0 @@ ---- -############################################ -# dovetail upload artifacts job -############################################ -- project: - name: dovetail-artifacts-upload - - project: 'dovetail' - - jobs: - - 'dovetail-{image}-artifacts-upload-{stream}' - - stream: - - master: - branch: '{stream}' - gs-pathname: '' - disabled: false - - image: - - 'dovetail' - - 'functest' - - 'yardstick' - - 'testapi' - - 'mongo' - -############################################# -# job template -############################################# - -- job-template: - name: 'dovetail-{image}-artifacts-upload-{stream}' - - - disabled: '{obj:disabled}' - - 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' - - dovetail-parameter: - gs-pathname: '{gs-pathname}' - image: '{image}' - branch: '{branch}' - - scm: - - git-scm - - builders: - - 'dovetail-builder-artifacts-upload' - - 'dovetail-upload-artifacts-cache-cleanup' - - 'dovetail-images-cleanup' - -#################### -# parameter macros -#################### -- parameter: - name: dovetail-parameter - parameters: - - string: - name: CACHE_DIR - default: $WORKSPACE/cache{gs-pathname} - description: "the cache to store packages downloaded" - - string: - name: STORE_URL - default: gs://artifacts.opnfv.org/dovetail{gs-pathname} - description: "LF artifacts url for storage of dovetail packages" - - string: - name: DOCKER_REPO_NAME - default: opnfv/{image} - description: "docker repo name" - - string: - name: DOCKER_TAG - default: latest - description: "docker image tag of which will be uploaded to artifacts" - - string: - name: STORE_FILE_NAME - default: image_{image}_{branch}_$BUILD_ID.docker - description: "stored file name" - -#################################### -# builders for dovetail project -#################################### -- builder: - name: dovetail-builder-artifacts-upload - builders: - - shell: - !include-raw: ./dovetail-artifacts-upload.sh - -- builder: - name: dovetail-upload-artifacts-cache-cleanup - builders: - - shell: | - #!/bin/bash - set -o errexit - - echo "Dovetail: cleanup cache used for storage downloaded packages" - - /bin/rm -rf $CACHE_DIR - -- builder: - name: dovetail-images-cleanup - builders: - - shell: - !include-raw: ./dovetail-cleanup.sh diff --git a/jjb/dovetail/dovetail-ci-jobs.yaml b/jjb/dovetail/dovetail-ci-jobs.yaml new file mode 100644 index 000000000..a95617ae4 --- /dev/null +++ b/jjb/dovetail/dovetail-ci-jobs.yaml @@ -0,0 +1,271 @@ +--- +################################### +# job configuration for dovetail +################################### +- project: + name: dovetail + + project: '{name}' + + # -------------------------------------- + # BRANCH ANCHORS + # -------------------------------------- + # 1)the stream/branch here represents the SUT(System Under Test) stream/branch + # 2)docker-tag is the docker tag of dovetail(only master by now, then all latest used) + # the dovetail stream is one-to-one mapping with dovetail docker-tag + # the dovetail is not sync with A/B/C release + master: &master + stream: master + branch: '{stream}' + dovetail-branch: '{stream}' + gs-pathname: '' + docker-tag: 'latest' + fraser: &fraser + stream: fraser + branch: 'stable/{stream}' + dovetail-branch: master + gs-pathname: '/{stream}' + docker-tag: 'latest' + + # ---------------------------------- + # POD, PLATFORM, AND BRANCH MAPPING + # ---------------------------------- + # CI PODs + # This section should only contain the SUTs + # that have been switched using labels for slaves + # ----------------------------------------------- + # the pods, SUTs listed here are just examples to + # let the dovetail tool run, there can be more ways beside CI to + # run the dovetail tool. + # pods, SUTs will be added/adjusted when needed + pod: + # fuel CI PODs + - baremetal: + slave-label: fuel-baremetal + SUT: fuel + auto-trigger-name: 'daily-trigger-disabled' + <<: *master + - virtual: + slave-label: fuel-virtual + SUT: fuel + auto-trigger-name: 'daily-trigger-disabled' + <<: *master + - baremetal: + slave-label: fuel-baremetal + SUT: fuel + auto-trigger-name: 'daily-trigger-disabled' + <<: *fraser + - virtual: + slave-label: fuel-virtual + SUT: fuel + auto-trigger-name: 'daily-trigger-disabled' + <<: *fraser + # compass CI PODs + - baremetal: + slave-label: compass-baremetal + SUT: compass + auto-trigger-name: 'daily-trigger-disabled' + <<: *master + - virtual: + slave-label: compass-virtual + SUT: compass + auto-trigger-name: 'daily-trigger-disabled' + <<: *master + - baremetal: + slave-label: compass-baremetal + SUT: compass + auto-trigger-name: 'daily-trigger-disabled' + <<: *fraser + - virtual: + slave-label: compass-virtual + SUT: compass + auto-trigger-name: 'daily-trigger-disabled' + <<: *fraser + # ------------------------------- + # Installers not using labels + # CI PODs + # This section should only contain the installers + # that have not been switched using labels for slaves + # ------------------------------- + # apex PODs + - virtual: + slave-label: apex-virtual-master + SUT: apex + auto-trigger-name: 'daily-trigger-disabled' + <<: *master + - baremetal: + slave-label: apex-baremetal-master + SUT: apex + auto-trigger-name: 'daily-trigger-disabled' + <<: *master + - virtual: + slave-label: apex-virtual-master + SUT: apex + auto-trigger-name: 'daily-trigger-disabled' + <<: *fraser + - baremetal: + slave-label: apex-baremetal-master + SUT: apex + auto-trigger-name: 'daily-trigger-disabled' + <<: *fraser + # armband CI PODs + - armband-baremetal: + slave-label: armband-baremetal + SUT: fuel + auto-trigger-name: 'daily-trigger-disabled' + <<: *master + - armband-virtual: + slave-label: armband-virtual + SUT: fuel + auto-trigger-name: 'daily-trigger-disabled' + <<: *master + - armband-baremetal: + slave-label: armband-baremetal + SUT: fuel + auto-trigger-name: 'daily-trigger-disabled' + <<: *fraser + - armband-virtual: + slave-label: armband-virtual + SUT: fuel + auto-trigger-name: 'daily-trigger-disabled' + <<: *fraser + # ------------------------------- + # None-CI PODs + # ------------------------------- + - baremetal-centos: + slave-label: 'intel-pod8' + SUT: compass + auto-trigger-name: 'daily-trigger-disabled' + <<: *master + - zte-pod1: + slave-label: zte-pod1 + SUT: fuel + auto-trigger-name: 'daily-trigger-disabled' + <<: *master + - zte-pod2: + slave-label: zte-pod2 + SUT: fuel + auto-trigger-name: 'daily-trigger-disabled' + <<: *master + - zte-pod3: + slave-label: zte-pod3 + SUT: fuel + auto-trigger-name: 'daily-trigger-disabled' + <<: *master + - zte-pod1: + slave-label: zte-pod1 + SUT: fuel + auto-trigger-name: 'daily-trigger-disabled' + <<: *fraser + - zte-pod3: + slave-label: zte-pod3 + SUT: fuel + auto-trigger-name: 'daily-trigger-disabled' + <<: *fraser + - huawei-pod4: + slave-label: huawei-pod4 + SUT: apex + auto-trigger-name: 'daily-trigger-disabled' + <<: *fraser + - huawei-pod7: + slave-label: huawei-pod7 + SUT: compass + auto-trigger-name: 'daily-trigger-disabled' + <<: *fraser + + # ------------------------------- + testsuite: + - 'default' + - 'proposed_tests' + + jobs: + - 'dovetail-{SUT}-{pod}-{testsuite}-{stream}' + +################################ +# job templates +################################ +- job-template: + name: 'dovetail-{SUT}-{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: 300 + abort: true + - fix-workspace-permissions + + triggers: + - '{auto-trigger-name}' + + parameters: + - project-parameter: + project: '{project}' + branch: '{dovetail-branch}' + - '{SUT}-defaults' + - '{slave-label}-defaults' + - string: + name: DEPLOY_SCENARIO + default: 'os-nosdn-nofeature-ha' + - string: + name: DOCKER_TAG + default: '{docker-tag}' + description: 'Tag to pull dovetail docker image' + - string: + name: CI_DEBUG + default: 'true' + description: "Show debug output information" + - string: + name: TESTSUITE + default: '{testsuite}' + description: "dovetail testsuite to run" + - string: + name: DOVETAIL_REPO_DIR + default: "/home/opnfv/dovetail" + description: "Directory where the dovetail repository is cloned" + - string: + name: SUT_BRANCH + default: '{branch}' + description: "SUT branch" + + scm: + - git-scm + + builders: + - description-setter: + description: "POD: $NODE_NAME" + - 'dovetail-cleanup' + - 'dovetail-run' + + publishers: + - archive: + artifacts: 'results/**/*' + allow-empty: true + fingerprint: true + - email-jenkins-admins-on-failure + +# ------------------------- +# builder macros +# ------------------------- +- builder: + name: dovetail-run + builders: + - shell: + !include-raw: ./dovetail-run.sh + +- builder: + name: dovetail-cleanup + builders: + - shell: + !include-raw: ./dovetail-cleanup.sh diff --git a/jjb/dovetail/dovetail-ci-jobs.yml b/jjb/dovetail/dovetail-ci-jobs.yml deleted file mode 100644 index a95617ae4..000000000 --- a/jjb/dovetail/dovetail-ci-jobs.yml +++ /dev/null @@ -1,271 +0,0 @@ ---- -################################### -# job configuration for dovetail -################################### -- project: - name: dovetail - - project: '{name}' - - # -------------------------------------- - # BRANCH ANCHORS - # -------------------------------------- - # 1)the stream/branch here represents the SUT(System Under Test) stream/branch - # 2)docker-tag is the docker tag of dovetail(only master by now, then all latest used) - # the dovetail stream is one-to-one mapping with dovetail docker-tag - # the dovetail is not sync with A/B/C release - master: &master - stream: master - branch: '{stream}' - dovetail-branch: '{stream}' - gs-pathname: '' - docker-tag: 'latest' - fraser: &fraser - stream: fraser - branch: 'stable/{stream}' - dovetail-branch: master - gs-pathname: '/{stream}' - docker-tag: 'latest' - - # ---------------------------------- - # POD, PLATFORM, AND BRANCH MAPPING - # ---------------------------------- - # CI PODs - # This section should only contain the SUTs - # that have been switched using labels for slaves - # ----------------------------------------------- - # the pods, SUTs listed here are just examples to - # let the dovetail tool run, there can be more ways beside CI to - # run the dovetail tool. - # pods, SUTs will be added/adjusted when needed - pod: - # fuel CI PODs - - baremetal: - slave-label: fuel-baremetal - SUT: fuel - auto-trigger-name: 'daily-trigger-disabled' - <<: *master - - virtual: - slave-label: fuel-virtual - SUT: fuel - auto-trigger-name: 'daily-trigger-disabled' - <<: *master - - baremetal: - slave-label: fuel-baremetal - SUT: fuel - auto-trigger-name: 'daily-trigger-disabled' - <<: *fraser - - virtual: - slave-label: fuel-virtual - SUT: fuel - auto-trigger-name: 'daily-trigger-disabled' - <<: *fraser - # compass CI PODs - - baremetal: - slave-label: compass-baremetal - SUT: compass - auto-trigger-name: 'daily-trigger-disabled' - <<: *master - - virtual: - slave-label: compass-virtual - SUT: compass - auto-trigger-name: 'daily-trigger-disabled' - <<: *master - - baremetal: - slave-label: compass-baremetal - SUT: compass - auto-trigger-name: 'daily-trigger-disabled' - <<: *fraser - - virtual: - slave-label: compass-virtual - SUT: compass - auto-trigger-name: 'daily-trigger-disabled' - <<: *fraser - # ------------------------------- - # Installers not using labels - # CI PODs - # This section should only contain the installers - # that have not been switched using labels for slaves - # ------------------------------- - # apex PODs - - virtual: - slave-label: apex-virtual-master - SUT: apex - auto-trigger-name: 'daily-trigger-disabled' - <<: *master - - baremetal: - slave-label: apex-baremetal-master - SUT: apex - auto-trigger-name: 'daily-trigger-disabled' - <<: *master - - virtual: - slave-label: apex-virtual-master - SUT: apex - auto-trigger-name: 'daily-trigger-disabled' - <<: *fraser - - baremetal: - slave-label: apex-baremetal-master - SUT: apex - auto-trigger-name: 'daily-trigger-disabled' - <<: *fraser - # armband CI PODs - - armband-baremetal: - slave-label: armband-baremetal - SUT: fuel - auto-trigger-name: 'daily-trigger-disabled' - <<: *master - - armband-virtual: - slave-label: armband-virtual - SUT: fuel - auto-trigger-name: 'daily-trigger-disabled' - <<: *master - - armband-baremetal: - slave-label: armband-baremetal - SUT: fuel - auto-trigger-name: 'daily-trigger-disabled' - <<: *fraser - - armband-virtual: - slave-label: armband-virtual - SUT: fuel - auto-trigger-name: 'daily-trigger-disabled' - <<: *fraser - # ------------------------------- - # None-CI PODs - # ------------------------------- - - baremetal-centos: - slave-label: 'intel-pod8' - SUT: compass - auto-trigger-name: 'daily-trigger-disabled' - <<: *master - - zte-pod1: - slave-label: zte-pod1 - SUT: fuel - auto-trigger-name: 'daily-trigger-disabled' - <<: *master - - zte-pod2: - slave-label: zte-pod2 - SUT: fuel - auto-trigger-name: 'daily-trigger-disabled' - <<: *master - - zte-pod3: - slave-label: zte-pod3 - SUT: fuel - auto-trigger-name: 'daily-trigger-disabled' - <<: *master - - zte-pod1: - slave-label: zte-pod1 - SUT: fuel - auto-trigger-name: 'daily-trigger-disabled' - <<: *fraser - - zte-pod3: - slave-label: zte-pod3 - SUT: fuel - auto-trigger-name: 'daily-trigger-disabled' - <<: *fraser - - huawei-pod4: - slave-label: huawei-pod4 - SUT: apex - auto-trigger-name: 'daily-trigger-disabled' - <<: *fraser - - huawei-pod7: - slave-label: huawei-pod7 - SUT: compass - auto-trigger-name: 'daily-trigger-disabled' - <<: *fraser - - # ------------------------------- - testsuite: - - 'default' - - 'proposed_tests' - - jobs: - - 'dovetail-{SUT}-{pod}-{testsuite}-{stream}' - -################################ -# job templates -################################ -- job-template: - name: 'dovetail-{SUT}-{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: 300 - abort: true - - fix-workspace-permissions - - triggers: - - '{auto-trigger-name}' - - parameters: - - project-parameter: - project: '{project}' - branch: '{dovetail-branch}' - - '{SUT}-defaults' - - '{slave-label}-defaults' - - string: - name: DEPLOY_SCENARIO - default: 'os-nosdn-nofeature-ha' - - string: - name: DOCKER_TAG - default: '{docker-tag}' - description: 'Tag to pull dovetail docker image' - - string: - name: CI_DEBUG - default: 'true' - description: "Show debug output information" - - string: - name: TESTSUITE - default: '{testsuite}' - description: "dovetail testsuite to run" - - string: - name: DOVETAIL_REPO_DIR - default: "/home/opnfv/dovetail" - description: "Directory where the dovetail repository is cloned" - - string: - name: SUT_BRANCH - default: '{branch}' - description: "SUT branch" - - scm: - - git-scm - - builders: - - description-setter: - description: "POD: $NODE_NAME" - - 'dovetail-cleanup' - - 'dovetail-run' - - publishers: - - archive: - artifacts: 'results/**/*' - allow-empty: true - fingerprint: true - - email-jenkins-admins-on-failure - -# ------------------------- -# builder macros -# ------------------------- -- builder: - name: dovetail-run - builders: - - shell: - !include-raw: ./dovetail-run.sh - -- builder: - name: dovetail-cleanup - builders: - - shell: - !include-raw: ./dovetail-cleanup.sh diff --git a/jjb/dovetail/dovetail-project-jobs.yaml b/jjb/dovetail/dovetail-project-jobs.yaml new file mode 100644 index 000000000..1accffcdb --- /dev/null +++ b/jjb/dovetail/dovetail-project-jobs.yaml @@ -0,0 +1,116 @@ +--- +################################################### +# Non-ci jobs for Dovetail project +# They will only be enabled on request by projects! +################################################### +- project: + name: dovetail-project-jobs + + project: 'dovetail' + + jobs: + - 'dovetail-verify-{stream}' + - 'dovetail-merge-{stream}' + + stream: + - master: + branch: '{stream}' + disabled: false + - danube: + branch: 'stable/{stream}' + gs-pathname: '/{stream}' + disabled: false + +################################ +# job templates +################################ + +- job-template: + name: 'dovetail-verify-{stream}' + + disabled: '{obj:disabled}' + + parameters: + - project-parameter: + project: '{project}' + branch: '{branch}' + - '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}' + builders: + - dovetail-unit-tests + +- job-template: + name: 'dovetail-merge-{stream}' + + disabled: '{obj:disabled}' + + parameters: + - project-parameter: + project: '{project}' + branch: '{branch}' + - 'opnfv-build-ubuntu-defaults' + + scm: + - git-scm + + triggers: + - gerrit: + server-name: 'gerrit.opnfv.org' + trigger-on: + - change-merged-event + - comment-added-contains-event: + comment-contains-value: 'remerge' + projects: + - project-compare-type: 'ANT' + project-pattern: '{project}' + branches: + - branch-compare-type: 'ANT' + branch-pattern: '**/{branch}' + + builders: + - dovetail-unit-tests + +################################ +# builders for dovetail project +############################### +- builder: + name: dovetail-hello-world + builders: + - shell: | + #!/bin/bash + set -o errexit + + echo "hello world" + + +- builder: + name: dovetail-unit-tests + builders: + - shell: | + #!/bin/bash + set -o errexit + set -o pipefail + + tox diff --git a/jjb/dovetail/dovetail-project-jobs.yml b/jjb/dovetail/dovetail-project-jobs.yml deleted file mode 100644 index 1accffcdb..000000000 --- a/jjb/dovetail/dovetail-project-jobs.yml +++ /dev/null @@ -1,116 +0,0 @@ ---- -################################################### -# Non-ci jobs for Dovetail project -# They will only be enabled on request by projects! -################################################### -- project: - name: dovetail-project-jobs - - project: 'dovetail' - - jobs: - - 'dovetail-verify-{stream}' - - 'dovetail-merge-{stream}' - - stream: - - master: - branch: '{stream}' - disabled: false - - danube: - branch: 'stable/{stream}' - gs-pathname: '/{stream}' - disabled: false - -################################ -# job templates -################################ - -- job-template: - name: 'dovetail-verify-{stream}' - - disabled: '{obj:disabled}' - - parameters: - - project-parameter: - project: '{project}' - branch: '{branch}' - - '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}' - builders: - - dovetail-unit-tests - -- job-template: - name: 'dovetail-merge-{stream}' - - disabled: '{obj:disabled}' - - parameters: - - project-parameter: - project: '{project}' - branch: '{branch}' - - 'opnfv-build-ubuntu-defaults' - - scm: - - git-scm - - triggers: - - gerrit: - server-name: 'gerrit.opnfv.org' - trigger-on: - - change-merged-event - - comment-added-contains-event: - comment-contains-value: 'remerge' - projects: - - project-compare-type: 'ANT' - project-pattern: '{project}' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' - - builders: - - dovetail-unit-tests - -################################ -# builders for dovetail project -############################### -- builder: - name: dovetail-hello-world - builders: - - shell: | - #!/bin/bash - set -o errexit - - echo "hello world" - - -- builder: - name: dovetail-unit-tests - builders: - - shell: | - #!/bin/bash - set -o errexit - set -o pipefail - - tox diff --git a/jjb/dovetail/dovetail-weekly-jobs.yaml b/jjb/dovetail/dovetail-weekly-jobs.yaml new file mode 100644 index 000000000..5a162bb7f --- /dev/null +++ b/jjb/dovetail/dovetail-weekly-jobs.yaml @@ -0,0 +1,139 @@ +--- +- project: + name: dovetail-weekly-jobs + project: dovetail + # ------------------------------- + # BRANCH ANCHORS + # ------------------------------- + master: &master + stream: master + branch: '{stream}' + dovetail-branch: '{stream}' + gs-pathname: '' + docker-tag: 'latest' + danube: &danube + stream: danube + branch: 'stable/{stream}' + dovetail-branch: master + gs-pathname: '/{stream}' + docker-tag: 'latest' + + # ------------------------------- + # 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: + # - baremetal: + # slave-label: apex-baremetal + # SUT: apex + # <<: *danube + - baremetal: + slave-label: compass-baremetal + SUT: compass + <<: *danube + # - baremetal: + # slave-label: fuel-baremetal + # SUT: fuel + # <<: *danube + # - baremetal: + # slave-label: joid-baremetal + # SUT: joid + # <<: *danube + + testsuite: + - 'debug' + - 'compliance_set' + - 'proposed_tests' + + loop: + - 'weekly': + job-timeout: 180 + + jobs: + - 'dovetail-{SUT}-{pod}-{testsuite}-{loop}-{stream}' + +################################ +# job template +################################ +- job-template: + name: 'dovetail-{SUT}-{pod}-{testsuite}-{loop}-{stream}' + + disabled: true + + 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: '{job-timeout}' + abort: true + - fix-workspace-permissions + + parameters: + - project-parameter: + project: '{project}' + branch: '{dovetail-branch}' + - '{SUT}-defaults' + - '{slave-label}-defaults' + - string: + name: DEPLOY_SCENARIO + default: 'os-nosdn-nofeature-ha' + - string: + name: DOCKER_TAG + default: '{docker-tag}' + description: 'Tag to pull dovetail docker image' + - string: + name: CI_DEBUG + default: 'true' + description: "Show debug output information" + - string: + name: TESTSUITE + default: '{testsuite}' + description: "dovetail testsuite to run" + - string: + name: DOVETAIL_REPO_DIR + default: "/home/opnfv/dovetail" + description: "Directory where the dovetail repository is cloned" + + scm: + - git-scm + + builders: + - description-setter: + description: "POD: $NODE_NAME" + - 'dovetail-cleanup' + - 'dovetail-run' + + publishers: + - archive: + artifacts: 'results/**/*' + allow-empty: true + fingerprint: true + - email-jenkins-admins-on-failure + +######################## +# builder macros +######################## +- builder: + name: dovetail-run-weekly + builders: + - shell: + !include-raw: ./dovetail-run.sh + +- builder: + name: dovetail-cleanup-weekly + builders: + - shell: + !include-raw: ./dovetail-cleanup.sh diff --git a/jjb/dovetail/dovetail-weekly-jobs.yml b/jjb/dovetail/dovetail-weekly-jobs.yml deleted file mode 100644 index 5a162bb7f..000000000 --- a/jjb/dovetail/dovetail-weekly-jobs.yml +++ /dev/null @@ -1,139 +0,0 @@ ---- -- project: - name: dovetail-weekly-jobs - project: dovetail - # ------------------------------- - # BRANCH ANCHORS - # ------------------------------- - master: &master - stream: master - branch: '{stream}' - dovetail-branch: '{stream}' - gs-pathname: '' - docker-tag: 'latest' - danube: &danube - stream: danube - branch: 'stable/{stream}' - dovetail-branch: master - gs-pathname: '/{stream}' - docker-tag: 'latest' - - # ------------------------------- - # 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: - # - baremetal: - # slave-label: apex-baremetal - # SUT: apex - # <<: *danube - - baremetal: - slave-label: compass-baremetal - SUT: compass - <<: *danube - # - baremetal: - # slave-label: fuel-baremetal - # SUT: fuel - # <<: *danube - # - baremetal: - # slave-label: joid-baremetal - # SUT: joid - # <<: *danube - - testsuite: - - 'debug' - - 'compliance_set' - - 'proposed_tests' - - loop: - - 'weekly': - job-timeout: 180 - - jobs: - - 'dovetail-{SUT}-{pod}-{testsuite}-{loop}-{stream}' - -################################ -# job template -################################ -- job-template: - name: 'dovetail-{SUT}-{pod}-{testsuite}-{loop}-{stream}' - - disabled: true - - 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: '{job-timeout}' - abort: true - - fix-workspace-permissions - - parameters: - - project-parameter: - project: '{project}' - branch: '{dovetail-branch}' - - '{SUT}-defaults' - - '{slave-label}-defaults' - - string: - name: DEPLOY_SCENARIO - default: 'os-nosdn-nofeature-ha' - - string: - name: DOCKER_TAG - default: '{docker-tag}' - description: 'Tag to pull dovetail docker image' - - string: - name: CI_DEBUG - default: 'true' - description: "Show debug output information" - - string: - name: TESTSUITE - default: '{testsuite}' - description: "dovetail testsuite to run" - - string: - name: DOVETAIL_REPO_DIR - default: "/home/opnfv/dovetail" - description: "Directory where the dovetail repository is cloned" - - scm: - - git-scm - - builders: - - description-setter: - description: "POD: $NODE_NAME" - - 'dovetail-cleanup' - - 'dovetail-run' - - publishers: - - archive: - artifacts: 'results/**/*' - allow-empty: true - fingerprint: true - - email-jenkins-admins-on-failure - -######################## -# builder macros -######################## -- builder: - name: dovetail-run-weekly - builders: - - shell: - !include-raw: ./dovetail-run.sh - -- builder: - name: dovetail-cleanup-weekly - builders: - - shell: - !include-raw: ./dovetail-cleanup.sh -- cgit