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/qtip/qtip-experimental-jobs.yaml | 49 +++++++++ jjb/qtip/qtip-experimental-jobs.yml | 49 --------- jjb/qtip/qtip-validate-jobs.yaml | 159 ++++++++++++++++++++++++++++ jjb/qtip/qtip-validate-jobs.yml | 159 ---------------------------- jjb/qtip/qtip-verify-jobs.yaml | 195 +++++++++++++++++++++++++++++++++++ jjb/qtip/qtip-verify-jobs.yml | 195 ----------------------------------- 6 files changed, 403 insertions(+), 403 deletions(-) create mode 100644 jjb/qtip/qtip-experimental-jobs.yaml delete mode 100644 jjb/qtip/qtip-experimental-jobs.yml create mode 100644 jjb/qtip/qtip-validate-jobs.yaml delete mode 100644 jjb/qtip/qtip-validate-jobs.yml create mode 100644 jjb/qtip/qtip-verify-jobs.yaml delete mode 100644 jjb/qtip/qtip-verify-jobs.yml (limited to 'jjb/qtip') diff --git a/jjb/qtip/qtip-experimental-jobs.yaml b/jjb/qtip/qtip-experimental-jobs.yaml new file mode 100644 index 000000000..4e79c0553 --- /dev/null +++ b/jjb/qtip/qtip-experimental-jobs.yaml @@ -0,0 +1,49 @@ +--- +########################################### +# Experimental jobs for development purpose +########################################### + +- project: + name: qtip-experimental-jobs + project: qtip + jobs: + - 'qtip-experimental-{pod}-{stream}' + stream: + - master: + branch: '{stream}' + gs-pathname: '' + disabled: false + + pod: + - zte-virtual5: + installer: apex + pod: zte-virtual5 + +################################ +## job templates +################################# + +- job-template: + name: 'qtip-experimental-{pod}-{stream}' + + disabled: '{obj:disabled}' + + parameters: + - project-parameter: + project: '{project}' + branch: '{branch}' + - '{installer}-defaults' + - '{pod}-defaults' + scm: + - git-scm-gerrit + + triggers: + - experimental: + project: '{project}' + branch: '{branch}' + files: '**' + + builders: + - shell: | + #!/bin/bash + source tests/ci/experimental.sh diff --git a/jjb/qtip/qtip-experimental-jobs.yml b/jjb/qtip/qtip-experimental-jobs.yml deleted file mode 100644 index 4e79c0553..000000000 --- a/jjb/qtip/qtip-experimental-jobs.yml +++ /dev/null @@ -1,49 +0,0 @@ ---- -########################################### -# Experimental jobs for development purpose -########################################### - -- project: - name: qtip-experimental-jobs - project: qtip - jobs: - - 'qtip-experimental-{pod}-{stream}' - stream: - - master: - branch: '{stream}' - gs-pathname: '' - disabled: false - - pod: - - zte-virtual5: - installer: apex - pod: zte-virtual5 - -################################ -## job templates -################################# - -- job-template: - name: 'qtip-experimental-{pod}-{stream}' - - disabled: '{obj:disabled}' - - parameters: - - project-parameter: - project: '{project}' - branch: '{branch}' - - '{installer}-defaults' - - '{pod}-defaults' - scm: - - git-scm-gerrit - - triggers: - - experimental: - project: '{project}' - branch: '{branch}' - files: '**' - - builders: - - shell: | - #!/bin/bash - source tests/ci/experimental.sh diff --git a/jjb/qtip/qtip-validate-jobs.yaml b/jjb/qtip/qtip-validate-jobs.yaml new file mode 100644 index 000000000..0fc623c74 --- /dev/null +++ b/jjb/qtip/qtip-validate-jobs.yaml @@ -0,0 +1,159 @@ +--- +####################### +# validate after MERGE +####################### +- project: + name: qtip + project: qtip + + # ------------------------------- + # BRANCH ANCHORS + # ------------------------------- + master: &master + stream: master + branch: '{stream}' + gs-pathname: '' + docker-tag: latest + fraser: &fraser + stream: fraser + branch: 'stable/{stream}' + gs-pathname: '{stream}' + docker-tag: 'stable' + + # ------------------------------- + # JOB VARIABLES + # ------------------------------- + qpi: + - compute: + installer: apex + pod: zte-virtual5 + sut: node + <<: *master + - storage: + installer: apex + pod: zte-virtual5 + sut: '' + <<: *master + - network: + installer: apex + pod: zte-virtual5 + sut: '' + <<: *master + - compute: + installer: fuel + pod: zte-virtual6 + sut: vnf + <<: *master + - compute: + installer: apex + pod: zte-virtual5 + sut: node + <<: *fraser + - storage: + installer: apex + pod: zte-virtual5 + sut: '' + <<: *fraser + - compute: + installer: fuel + pod: zte-virtual6 + sut: vnf + <<: *fraser + + + # ------------------------------- + # JOB LIST + # ------------------------------- + jobs: + - 'qtip-{qpi}-{installer}-{pod}-{stream}' + +################################ +# job templates +################################ +- job-template: + name: 'qtip-{qpi}-{installer}-{pod}-{stream}' + disabled: false + + parameters: + - project-parameter: + project: '{project}' + branch: '{branch}' + - '{installer}-defaults' + - '{pod}-defaults' + - string: + name: DEPLOY_SCENARIO + default: generic + - string: + name: DOCKER_TAG + default: '{docker-tag}' + description: 'Tag to pull docker image' + - string: + name: CI_DEBUG + default: 'false' + description: "Show debug output information" + - string: + name: TEST_SUITE + default: '{qpi}' + - string: + name: TESTAPI_URL + default: 'http://testresults.opnfv.org/test/api/v1' + - string: + name: OPNFV_RELEASE + default: '{stream}' + - string: + name: SUT + description: "System Under Test" + default: '{sut}' + scm: + - git-scm + + wrappers: + - timeout: + timeout: 120 + abort: true + - timestamps + + triggers: + - 'qtip-daily' + + builders: + - description-setter: + description: "POD: $NODE_NAME" + - shell: | + #!/bin/bash + source tests/ci/periodic.sh + + publishers: + - qtip-common-publishers + - email-jenkins-admins-on-failure + +################ +# MARCOS +################ + +# -------- +# builder +# -------- + +# ---------- +# parameter +# ---------- + +# ---------- +# publisher +# ---------- + +- publisher: + name: qtip-common-publishers + publishers: + - email: + recipients: wu.zhihui1@zte.com.cn, zhang.yujunz@zte.com.cn + +# -------- +# trigger +# -------- + +- trigger: + name: 'qtip-daily' + triggers: + - timed: '0 15 * * *' diff --git a/jjb/qtip/qtip-validate-jobs.yml b/jjb/qtip/qtip-validate-jobs.yml deleted file mode 100644 index 0fc623c74..000000000 --- a/jjb/qtip/qtip-validate-jobs.yml +++ /dev/null @@ -1,159 +0,0 @@ ---- -####################### -# validate after MERGE -####################### -- project: - name: qtip - project: qtip - - # ------------------------------- - # BRANCH ANCHORS - # ------------------------------- - master: &master - stream: master - branch: '{stream}' - gs-pathname: '' - docker-tag: latest - fraser: &fraser - stream: fraser - branch: 'stable/{stream}' - gs-pathname: '{stream}' - docker-tag: 'stable' - - # ------------------------------- - # JOB VARIABLES - # ------------------------------- - qpi: - - compute: - installer: apex - pod: zte-virtual5 - sut: node - <<: *master - - storage: - installer: apex - pod: zte-virtual5 - sut: '' - <<: *master - - network: - installer: apex - pod: zte-virtual5 - sut: '' - <<: *master - - compute: - installer: fuel - pod: zte-virtual6 - sut: vnf - <<: *master - - compute: - installer: apex - pod: zte-virtual5 - sut: node - <<: *fraser - - storage: - installer: apex - pod: zte-virtual5 - sut: '' - <<: *fraser - - compute: - installer: fuel - pod: zte-virtual6 - sut: vnf - <<: *fraser - - - # ------------------------------- - # JOB LIST - # ------------------------------- - jobs: - - 'qtip-{qpi}-{installer}-{pod}-{stream}' - -################################ -# job templates -################################ -- job-template: - name: 'qtip-{qpi}-{installer}-{pod}-{stream}' - disabled: false - - parameters: - - project-parameter: - project: '{project}' - branch: '{branch}' - - '{installer}-defaults' - - '{pod}-defaults' - - string: - name: DEPLOY_SCENARIO - default: generic - - string: - name: DOCKER_TAG - default: '{docker-tag}' - description: 'Tag to pull docker image' - - string: - name: CI_DEBUG - default: 'false' - description: "Show debug output information" - - string: - name: TEST_SUITE - default: '{qpi}' - - string: - name: TESTAPI_URL - default: 'http://testresults.opnfv.org/test/api/v1' - - string: - name: OPNFV_RELEASE - default: '{stream}' - - string: - name: SUT - description: "System Under Test" - default: '{sut}' - scm: - - git-scm - - wrappers: - - timeout: - timeout: 120 - abort: true - - timestamps - - triggers: - - 'qtip-daily' - - builders: - - description-setter: - description: "POD: $NODE_NAME" - - shell: | - #!/bin/bash - source tests/ci/periodic.sh - - publishers: - - qtip-common-publishers - - email-jenkins-admins-on-failure - -################ -# MARCOS -################ - -# -------- -# builder -# -------- - -# ---------- -# parameter -# ---------- - -# ---------- -# publisher -# ---------- - -- publisher: - name: qtip-common-publishers - publishers: - - email: - recipients: wu.zhihui1@zte.com.cn, zhang.yujunz@zte.com.cn - -# -------- -# trigger -# -------- - -- trigger: - name: 'qtip-daily' - triggers: - - timed: '0 15 * * *' diff --git a/jjb/qtip/qtip-verify-jobs.yaml b/jjb/qtip/qtip-verify-jobs.yaml new file mode 100644 index 000000000..12cfa95b7 --- /dev/null +++ b/jjb/qtip/qtip-verify-jobs.yaml @@ -0,0 +1,195 @@ +--- +###################### +# verify before MERGE +###################### + +- project: + name: qtip-verify-jobs + project: qtip + jobs: + - 'qtip-verify-{stream}' + stream: + - master: + branch: '{stream}' + gs-pathname: '' + disabled: false + - fraser: + branch: 'stable/{stream}' + gs-pathname: '/{stream}' + disabled: false + +################################ +## job templates +################################# +- job-template: + name: 'qtip-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}' + disable-strict-forbidden-file-verification: 'true' + forbidden-file-paths: + - compare-type: ANT + pattern: 'docs/**|.gitignore' + + builders: + - qtip-unit-tests-and-docs-build + publishers: + - publish-coverage + - email-jenkins-admins-on-failure + +# Upload juypter notebook to artifacts for review +# TODO(yujunz): deal with *.ipynb deletion +- job-template: + name: 'qtip-verify-notebook-{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}' + disable-strict-forbidden-file-verification: 'true' + file-paths: + - compare-type: ANT + pattern: '**/*.ipynb' + + builders: + - upload-under-review-notebooks-to-opnfv-artifacts + - report-build-result-to-gerrit + +- job-template: + name: 'qtip-merged-notebook-{stream}' + + disabled: '{obj:disabled}' + + parameters: + - project-parameter: + project: $GERRIT_PROJECT + branch: '{branch}' + - string: + name: GS_URL + default: '$GS_BASE{gs-pathname}' + description: "Directory where the build artifact will be located upon the completion of the build." + + 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: '*' + branches: + - branch-compare-type: 'ANT' + branch-pattern: '**/{branch}' + file-paths: + - compare-type: ANT + pattern: '**/*ipynb' + + builders: + - remove-old-docs-from-opnfv-artifacts + +################################ +## job builders +################################# +- builder: + name: qtip-unit-tests-and-docs-build + builders: + - shell: | + #!/bin/bash + set -o errexit + set -o pipefail + set -o xtrace + + tox + +# modified from upload-under-review-docs-to-opnfv-artifacts +# in global/releng-macro.yml +- builder: + name: upload-under-review-notebooks-to-opnfv-artifacts + builders: + - shell: | + #!/bin/bash + set -o errexit + set -o pipefail + set -o xtrace + export PATH=$PATH:/usr/local/bin/ + + [[ $GERRIT_CHANGE_NUMBER =~ .+ ]] + + echo + echo "###########################" + echo "UPLOADING DOCS UNDER REVIEW" + echo "###########################" + echo + + gs_base="artifacts.opnfv.org/$PROJECT/review" + gs_path="$gs_base/$GERRIT_CHANGE_NUMBER" + local_path="upload/$GERRIT_CHANGE_NUMBER" + + mkdir -p $local_path + + git diff HEAD~1 --name-status | grep -E "[AM]\t.+\.ipynb$" | awk '{print $2}' \ + | xargs -I '{}' cp '{}' $local_path + gsutil -m cp -r "$local_path" "gs://$gs_base/" + + echo "Document link(s):" >> gerrit_comment.txt + find "$local_path" | grep -e 'ipynb$' | \ + sed -e "s|^$local_path| https://nbviewer.jupyter.org/url/$gs_path|" >> gerrit_comment.txt diff --git a/jjb/qtip/qtip-verify-jobs.yml b/jjb/qtip/qtip-verify-jobs.yml deleted file mode 100644 index 12cfa95b7..000000000 --- a/jjb/qtip/qtip-verify-jobs.yml +++ /dev/null @@ -1,195 +0,0 @@ ---- -###################### -# verify before MERGE -###################### - -- project: - name: qtip-verify-jobs - project: qtip - jobs: - - 'qtip-verify-{stream}' - stream: - - master: - branch: '{stream}' - gs-pathname: '' - disabled: false - - fraser: - branch: 'stable/{stream}' - gs-pathname: '/{stream}' - disabled: false - -################################ -## job templates -################################# -- job-template: - name: 'qtip-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}' - disable-strict-forbidden-file-verification: 'true' - forbidden-file-paths: - - compare-type: ANT - pattern: 'docs/**|.gitignore' - - builders: - - qtip-unit-tests-and-docs-build - publishers: - - publish-coverage - - email-jenkins-admins-on-failure - -# Upload juypter notebook to artifacts for review -# TODO(yujunz): deal with *.ipynb deletion -- job-template: - name: 'qtip-verify-notebook-{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}' - disable-strict-forbidden-file-verification: 'true' - file-paths: - - compare-type: ANT - pattern: '**/*.ipynb' - - builders: - - upload-under-review-notebooks-to-opnfv-artifacts - - report-build-result-to-gerrit - -- job-template: - name: 'qtip-merged-notebook-{stream}' - - disabled: '{obj:disabled}' - - parameters: - - project-parameter: - project: $GERRIT_PROJECT - branch: '{branch}' - - string: - name: GS_URL - default: '$GS_BASE{gs-pathname}' - description: "Directory where the build artifact will be located upon the completion of the build." - - 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: '*' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' - file-paths: - - compare-type: ANT - pattern: '**/*ipynb' - - builders: - - remove-old-docs-from-opnfv-artifacts - -################################ -## job builders -################################# -- builder: - name: qtip-unit-tests-and-docs-build - builders: - - shell: | - #!/bin/bash - set -o errexit - set -o pipefail - set -o xtrace - - tox - -# modified from upload-under-review-docs-to-opnfv-artifacts -# in global/releng-macro.yml -- builder: - name: upload-under-review-notebooks-to-opnfv-artifacts - builders: - - shell: | - #!/bin/bash - set -o errexit - set -o pipefail - set -o xtrace - export PATH=$PATH:/usr/local/bin/ - - [[ $GERRIT_CHANGE_NUMBER =~ .+ ]] - - echo - echo "###########################" - echo "UPLOADING DOCS UNDER REVIEW" - echo "###########################" - echo - - gs_base="artifacts.opnfv.org/$PROJECT/review" - gs_path="$gs_base/$GERRIT_CHANGE_NUMBER" - local_path="upload/$GERRIT_CHANGE_NUMBER" - - mkdir -p $local_path - - git diff HEAD~1 --name-status | grep -E "[AM]\t.+\.ipynb$" | awk '{print $2}' \ - | xargs -I '{}' cp '{}' $local_path - gsutil -m cp -r "$local_path" "gs://$gs_base/" - - echo "Document link(s):" >> gerrit_comment.txt - find "$local_path" | grep -e 'ipynb$' | \ - sed -e "s|^$local_path| https://nbviewer.jupyter.org/url/$gs_path|" >> gerrit_comment.txt -- cgit