From: Trevor Bramwell Date: Thu, 27 Jun 2019 20:12:40 +0000 (+0000) Subject: Merge "Add Docker jobs for Hunter" X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=cc143b936c8337ee65c21e5fa78c1c56d2d833e1;hp=130035b670054a9486331a0ed8e396ed82623a20;p=releng.git Merge "Add Docker jobs for Hunter" --- diff --git a/jjb/auto/auto-rtd-jobs.yaml b/jjb/auto/auto-rtd-jobs.yaml deleted file mode 100644 index f23fe95d9..000000000 --- a/jjb/auto/auto-rtd-jobs.yaml +++ /dev/null @@ -1,20 +0,0 @@ ---- -- project: - name: auto-rtd - project: auto - project-name: auto - - project-pattern: 'auto' - rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-auto/47350/' - rtd-token: '3c2277762678c97e59d24c83201194d6b56d7983' - - stream: - - master: - branch: '{stream}' - disabled: false - - gambia: - branch: 'stable/{stream}' - disabled: false - - jobs: - - '{project-name}-rtd-jobs' diff --git a/jjb/auto/auto.yaml b/jjb/auto/auto.yaml deleted file mode 100644 index 3b47c47ee..000000000 --- a/jjb/auto/auto.yaml +++ /dev/null @@ -1,250 +0,0 @@ ---- -# jenkins job templates for Auto -- project: - name: 'auto-ci-jobs' - project: 'auto' - - # ------------------------------- - # BRANCH ANCHORS - # ------------------------------- - stream: - - master: - branch: '{stream}' - gs-pathname: '' - disabled: false - - gambia: - branch: 'stable/{stream}' - gs-pathname: '/{stream}' - disabled: false - - fraser: - branch: 'stable/{stream}' - gs-pathname: '/{stream}' - disabled: false - # ------------------------------- - # DEPLOY TYPE ANCHORS - # ------------------------------- - baremetal: &baremetal - installer: 'fuel' - slave-label: 'auto-baremetal' - # ------------------------------- - # POD, INSTALLER, AND BRANCH MAPPING - # ------------------------------- - # CI POD's - # ------------------------------- - pod: - - auto-baremetal: - <<: *baremetal - # ------------------------------- - # scenarios - # ------------------------------- - scenario: - # HA scenarios - - 'os-nosdn-onap-ha': - auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger' - - jobs: - - 'fuel-{scenario}-{pod}-auto-daily-{stream}' - - 'fuel-deploy-{pod}-daily-{stream}' - - 'auto-daily-{stream}' - - 'auto-verify-{stream}' - - 'auto-merge-{stream}' - -######################## -# job templates -######################## -- job-template: - name: 'fuel-{scenario}-{pod}-auto-daily-{stream}' - - disabled: '{obj:disabled}' - - concurrent: false - - properties: - - logrotate-default - - throttle: - enabled: true - max-total: 4 - max-per-node: 1 - option: 'project' - - build-blocker: - use-build-blocker: true - blocking-jobs: - - 'fuel-os-.*?-{pod}-auto-daily-.*' - blocking-level: 'NODE' - - wrappers: - - build-name: - name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO' - - triggers: - - '{auto-trigger-name}' - - parameters: - - project-parameter: - project: '{project}' - branch: '{branch}' - - '{installer}-defaults': - gs-pathname: '{gs-pathname}' - - '{slave-label}-defaults': - installer: '{installer}' - - string: - name: DEPLOY_SCENARIO - default: '{scenario}' - - builders: - - trigger-builds: - - project: 'fuel-deploy-{pod}-daily-{stream}' - current-parameters: false - predefined-parameters: | - DEPLOY_SCENARIO=os-nosdn-nofeature-ha - PROJECT=armband - same-node: true - block: true - -- job-template: - name: 'auto-daily-{stream}' - - disabled: '{obj:disabled}' - - properties: - - logrotate-default - - build-blocker: - use-build-blocker: true - blocking-jobs: - - 'auto-daily-.*' - blocking-level: 'NODE' - - parameters: - - project-parameter: - project: '{project}' - branch: '{branch}' - - 'intel-pod18-defaults' - - scm: - - git-scm - - triggers: - - timed: '0 16 * * *' - - builders: - - shell: | - pwd - ./ci/build-auto.sh daily - -- job-template: - name: 'auto-verify-{stream}' - - disabled: '{obj:disabled}' - - project-type: freestyle - - concurrent: true - - properties: - - logrotate-default - - 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}' - forbidden-file-paths: - - compare-type: ANT - pattern: 'docs/**' - - builders: - - shell: | - pwd - ./ci/build-auto.sh verify - -- job-template: - name: 'auto-merge-{stream}' - - disabled: '{obj:disabled}' - - project-type: freestyle - - concurrent: true - - properties: - - logrotate-default - - 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}' - forbidden-file-paths: - - compare-type: ANT - pattern: 'docs/**' - - builders: - - shell: | - pwd - ./ci/build-auto.sh merge - -######################## -# trigger macros -######################## -# CI PODs -# ---------------------------------------------------------------- -# Auto CI Baremetal Triggers running against master branch -# ---------------------------------------------------------------- -- trigger: - name: 'fuel-os-nosdn-onap-ha-auto-baremetal-master-trigger' - triggers: - - timed: '' -# --------------------------------------------------------------------- -# Auto CI Baremetal Triggers running against fraser branch -# --------------------------------------------------------------------- -- trigger: - name: 'fuel-os-nosdn-onap-ha-auto-baremetal-fraser-trigger' - triggers: - - timed: '' -# --------------------------------------------------------------------- -# Auto CI Baremetal Triggers running against gambia branch -# --------------------------------------------------------------------- -- trigger: - name: 'fuel-os-nosdn-onap-ha-auto-baremetal-gambia-trigger' - triggers: - - timed: '' diff --git a/jjb/availability/availability-rtd-jobs.yaml b/jjb/availability/availability-rtd-jobs.yaml index e245e597d..8488ea781 100644 --- a/jjb/availability/availability-rtd-jobs.yaml +++ b/jjb/availability/availability-rtd-jobs.yaml @@ -13,6 +13,10 @@ - master: branch: '{stream}' disabled: false + - hunter: &hunter + branch: 'stable/{stream}' + gs-pathname: '/{stream}' + disabled: false - gambia: branch: 'stable/{stream}' disabled: false diff --git a/jjb/bottlenecks/bottlenecks-project-jobs.yaml b/jjb/bottlenecks/bottlenecks-project-jobs.yaml index dac1659f8..456181083 100644 --- a/jjb/bottlenecks/bottlenecks-project-jobs.yaml +++ b/jjb/bottlenecks/bottlenecks-project-jobs.yaml @@ -21,12 +21,7 @@ # This is used for different test suite dependent packages storage gs-packagepath: '/{suite}' disabled: false - - gambia: - branch: 'stable/{stream}' - gs-pathname: '/{stream}' - gs-packagepath: '/{stream}/{suite}' - disabled: false - - fraser: + - hunter: &hunter branch: 'stable/{stream}' gs-pathname: '/{stream}' gs-packagepath: '/{stream}/{suite}' diff --git a/jjb/bottlenecks/bottlenecks-rtd-jobs.yaml b/jjb/bottlenecks/bottlenecks-rtd-jobs.yaml index 9730f24ef..57ecd802c 100644 --- a/jjb/bottlenecks/bottlenecks-rtd-jobs.yaml +++ b/jjb/bottlenecks/bottlenecks-rtd-jobs.yaml @@ -13,7 +13,7 @@ - master: branch: '{stream}' disabled: false - - gambia: + - hunter: branch: 'stable/{stream}' disabled: false diff --git a/jjb/clover/clover-project.yaml b/jjb/clover/clover-project.yaml index 4abbc0865..f75a59e80 100644 --- a/jjb/clover/clover-project.yaml +++ b/jjb/clover/clover-project.yaml @@ -18,11 +18,7 @@ branch: '{stream}' gs-pathname: '' disabled: false - - gambia: - branch: 'stable/{stream}' - gs-pathname: '/{stream}' - disabled: false - - fraser: + - hunter: branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false diff --git a/jjb/clover/clover-rtd-jobs.yaml b/jjb/clover/clover-rtd-jobs.yaml index b58b71e27..d768c7cd7 100644 --- a/jjb/clover/clover-rtd-jobs.yaml +++ b/jjb/clover/clover-rtd-jobs.yaml @@ -13,7 +13,7 @@ - master: branch: '{stream}' disabled: false - - gambia: + - hunter: branch: 'stable/{stream}' disabled: false diff --git a/jjb/container4nfv/container4nfv-arm64.yaml b/jjb/container4nfv/container4nfv-arm64.yaml index c5ba3be1f..04fdd5a1d 100644 --- a/jjb/container4nfv/container4nfv-arm64.yaml +++ b/jjb/container4nfv/container4nfv-arm64.yaml @@ -7,8 +7,8 @@ stream: - master: branch: master - - gambia: - branch: stable/gambia + - hunter: + branch: stable/hunter scenario: - 'k8-multus-nofeature-noha': disabled: false @@ -48,10 +48,8 @@ - 'trigger-deploy-{pod}-{stream}' builders: - - shell: - !include-raw: arm64/compass-build.sh - - shell: - !include-raw: arm64/compass-deploy.sh + - 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 @@ -63,8 +61,7 @@ unstable-threshold: 'Failure' - project: functest-compass-arm-virtual-daily-master current-parameters: false - predefined-parameters: - DEPLOY_SCENARIO='k8-nosdn-nofeature-ha' + predefined-parameters: DEPLOY_SCENARIO='k8-nosdn-nofeature-ha' same-node: true block: true block-thresholds: @@ -111,8 +108,7 @@ wipe-workspace: true builders: - - shell: - !include-raw: arm64/deploy-cni.sh + - shell: !include-raw: arm64/deploy-cni.sh - trigger: @@ -120,7 +116,7 @@ triggers: - timed: '0 12 * * *' - trigger: - name: 'trigger-deploy-virtual-gambia' + name: 'trigger-deploy-virtual-hunter' triggers: - timed: '0 18 * * *' - trigger: @@ -128,6 +124,6 @@ triggers: - timed: '0 12 * * *' - trigger: - name: 'trigger-deploy-baremetal-gambia' + name: 'trigger-deploy-baremetal-hunter' triggers: - timed: '0 18 * * *' diff --git a/jjb/container4nfv/container4nfv-project.yaml b/jjb/container4nfv/container4nfv-project.yaml index f1d58da4a..ca286bff7 100644 --- a/jjb/container4nfv/container4nfv-project.yaml +++ b/jjb/container4nfv/container4nfv-project.yaml @@ -18,7 +18,7 @@ branch: '{stream}' gs-pathname: '' disabled: false - - gambia: + - hunter: branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false diff --git a/jjb/container4nfv/container4nfv-rtd-jobs.yaml b/jjb/container4nfv/container4nfv-rtd-jobs.yaml index b55f958e5..70512a985 100644 --- a/jjb/container4nfv/container4nfv-rtd-jobs.yaml +++ b/jjb/container4nfv/container4nfv-rtd-jobs.yaml @@ -13,7 +13,7 @@ - master: branch: '{stream}' disabled: false - - gambia: + - hunter: branch: 'stable/{stream}' disabled: false diff --git a/jjb/doctor/doctor-rtd-jobs.yaml b/jjb/doctor/doctor-rtd-jobs.yaml index 13ff8605d..512b9907a 100644 --- a/jjb/doctor/doctor-rtd-jobs.yaml +++ b/jjb/doctor/doctor-rtd-jobs.yaml @@ -13,7 +13,7 @@ - master: branch: '{stream}' disabled: false - - gambia: + - hunter: branch: 'stable/{stream}' disabled: false diff --git a/jjb/doctor/doctor.yaml b/jjb/doctor/doctor.yaml index 5f0e677c8..ccdf66193 100644 --- a/jjb/doctor/doctor.yaml +++ b/jjb/doctor/doctor.yaml @@ -11,11 +11,7 @@ branch: '{stream}' gs-pathname: '' disabled: false - - gambia: &gambia - branch: 'stable/{stream}' - gs-pathname: '/{stream}' - disabled: false - - fraser: + - hunter: branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false @@ -63,10 +59,10 @@ builders: - shell: | - #!/bin/bash - # we do nothing here as the main stuff will be done - # in phase jobs - echo "Triggering phase jobs!" + #!/bin/bash + # we do nothing here as the main stuff will be done + # in phase jobs + echo "Triggering phase jobs!" - multijob: name: 'doctor-verify-sample' execution-type: PARALLEL @@ -227,10 +223,9 @@ name: 'doctor-verify-installer-inspector-builders-macro' builders: # yamllint disable rule:indentation - - shell: - !include-raw: - - ./doctor-env-presetup.sh - - ../../utils/fetch_os_creds.sh + - shell: !include-raw: + - ./doctor-env-presetup.sh + - ../../utils/fetch_os_creds.sh - shell: | # prepare the env for test source $HOME/opnfv-openrc.sh diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml index 9f8f22d5e..427ccc2ff 100644 --- a/jjb/functest/functest-kubernetes.yaml +++ b/jjb/functest/functest-kubernetes.yaml @@ -106,7 +106,7 @@ -v /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config \ $image run_tests -t {test} res=$? - gsutil -m cp -r $WORKSPACE/ \ + gsutil -dd -m cp -r $WORKSPACE/ \ gs://artifacts.opnfv.org/functest-kubernetes/$JOB_NAME-$BUILD_ID find $WORKSPACE -type f \ -printf \ diff --git a/jjb/models/models.yaml b/jjb/models/models.yaml deleted file mode 100644 index 40fcf68de..000000000 --- a/jjb/models/models.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- -- project: - name: models - - project: '{name}' - - jobs: - - '{project}-verify-basic' diff --git a/jjb/moon/moon-rtd-jobs.yaml b/jjb/moon/moon-rtd-jobs.yaml deleted file mode 100644 index 9d5f3c345..000000000 --- a/jjb/moon/moon-rtd-jobs.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -- project: - name: moon-rtd - project: moon - project-name: moon - - gerrit-skip-vote: true - project-pattern: 'moon' - rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-moon/47373/' - rtd-token: 'f4dc698744431a8688a58746f84fc5d7bee694b2' - - jobs: - - '{project-name}-rtd-jobs' diff --git a/jjb/moon/moon.yaml b/jjb/moon/moon.yaml deleted file mode 100644 index 73b0fc731..000000000 --- a/jjb/moon/moon.yaml +++ /dev/null @@ -1,60 +0,0 @@ ---- -- project: - name: moon - - project: '{name}' - - jobs: - - 'moon-verify-{stream}' - - stream: - - master: - branch: '{stream}' - gs-pathname: '' - disabled: true - - euphrates: - branch: 'stable/{stream}' - gs-pathname: '/{stream}' - disabled: true - -- job-template: - name: 'moon-verify-{stream}' - - 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: - - shell: | - #!/bin/bash - echo "launch Moon unit tests" - #nosetest $WORKSPACE/keystone-moon/keystone/tests/moon/unit diff --git a/jjb/opera/opera-daily-jobs.yaml b/jjb/opera/opera-daily-jobs.yaml deleted file mode 100644 index f0841a34b..000000000 --- a/jjb/opera/opera-daily-jobs.yaml +++ /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 deleted file mode 100644 index f866342a4..000000000 --- a/jjb/opera/opera-project-jobs.yaml +++ /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-rtd-jobs.yaml b/jjb/opera/opera-rtd-jobs.yaml deleted file mode 100644 index b923c9f81..000000000 --- a/jjb/opera/opera-rtd-jobs.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -- project: - name: opera-rtd - project: opera - project-name: opera - - gerrit-skip-vote: true - project-pattern: 'opera' - rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-opera/47379/' - rtd-token: '4dc678d2d96adf6376b4f8f9aafdbbeb24dbb006' - - jobs: - - '{project-name}-rtd-jobs' diff --git a/jjb/opera/opera-verify-jobs.yaml b/jjb/opera/opera-verify-jobs.yaml deleted file mode 100644 index 97c9a43ec..000000000 --- a/jjb/opera/opera-verify-jobs.yaml +++ /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!" diff --git a/jjb/orchestra/orchestra-daily-jobs.yaml b/jjb/orchestra/orchestra-daily-jobs.yaml deleted file mode 100644 index 94f9d8b1c..000000000 --- a/jjb/orchestra/orchestra-daily-jobs.yaml +++ /dev/null @@ -1,100 +0,0 @@ ---- -################################### -# job configuration for orchestra -################################### -- project: - name: 'orchestra-daily-jobs' - - project: 'orchestra' - - # ------------------------------- - # BRANCH ANCHORS - # ------------------------------- - master: &master - stream: master - branch: '{stream}' - gs-pathname: '' - disabled: true - - # ------------------------------------------------------ - # POD, INSTALLER, AND BRANCH MAPPING - # ------------------------------------------------------ - pod: - - virtual: - slave-label: 'joid-virtual' - os-version: 'xenial' - <<: *master - - jobs: - - 'orchestra-{pod}-daily-{stream}' - -################################ -# job template -################################ -- job-template: - name: 'orchestra-{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: '@daily' - - parameters: - - 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_MODE=testcase - FUNCTEST_SUITE_NAME=orchestra_ims - node-parameters: true - kill-phase-on: NEVER - abort-all-job: true diff --git a/jjb/orchestra/orchestra-project-jobs.yaml b/jjb/orchestra/orchestra-project-jobs.yaml deleted file mode 100644 index 60732ce03..000000000 --- a/jjb/orchestra/orchestra-project-jobs.yaml +++ /dev/null @@ -1,49 +0,0 @@ ---- -- project: - - name: orchestra-project - - project: 'orchestra' - - stream: - - master: - branch: '{stream}' - gs-pathname: '' - - jobs: - - 'orchestra-build-{stream}' - -- job-template: - name: 'orchestra-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}' - - scm: - - git-scm - - triggers: - - timed: 'H 23 * * *' - - builders: - - 'orchestra-build-macro' - -- builder: - name: 'orchestra-build-macro' - builders: - - shell: | - #!/bin/bash - - echo "Hello world!" diff --git a/jjb/orchestra/orchestra-rtd-jobs.yaml b/jjb/orchestra/orchestra-rtd-jobs.yaml deleted file mode 100644 index d1279eba4..000000000 --- a/jjb/orchestra/orchestra-rtd-jobs.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -- project: - name: orchestra-rtd - project: orchestra - project-name: orchestra - - gerrit-skip-vote: true - project-pattern: 'orchestra' - rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-orchestra/47380/' - rtd-token: 'c7f8cb2949a592bf6040c648552b0afa61f7da15' - - jobs: - - '{project-name}-rtd-jobs' diff --git a/jjb/ovsnfv/ovsnfv-rtd-jobs.yaml b/jjb/ovsnfv/ovsnfv-rtd-jobs.yaml deleted file mode 100644 index ecbcecae3..000000000 --- a/jjb/ovsnfv/ovsnfv-rtd-jobs.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -- project: - name: ovsnfv-rtd - project: ovsnfv - project-name: ovsnfv - - gerrit-skip-vote: true - project-pattern: 'ovsnfv' - rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-ovsnfv/47383/' - rtd-token: '1faa400aa3da4eca3c6018f8ed0e48a33fa66a00' - - jobs: - - '{project-name}-rtd-jobs' diff --git a/jjb/ovsnfv/ovsnfv.yaml b/jjb/ovsnfv/ovsnfv.yaml deleted file mode 100644 index 87c6ca14f..000000000 --- a/jjb/ovsnfv/ovsnfv.yaml +++ /dev/null @@ -1,157 +0,0 @@ ---- -- project: - name: ovsnfv - - project: '{name}' - - jobs: - - 'ovsnfv-verify-{stream}' - - 'ovsnfv-merge-{stream}' - - 'ovsnfv-daily-{stream}' - - stream: - - master: - branch: '{stream}' - gs-pathname: '' - disabled: false - - euphrates: - branch: 'stable/{stream}' - gs-pathname: '/{stream}' - disabled: false - -- job-template: - name: 'ovsnfv-verify-{stream}' - - disabled: '{obj:disabled}' - - parameters: - - project-parameter: - project: '{project}' - branch: '{branch}' - - 'opnfv-build-centos-defaults' - - 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-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}' - file-paths: - - compare-type: ANT - pattern: 'build/**' - - compare-type: ANT - pattern: 'ci/**' - - builders: - - build-rpms - -- job-template: - name: 'ovsnfv-merge-{stream}' - - disabled: '{obj:disabled}' - - parameters: - - project-parameter: - project: '{project}' - branch: '{branch}' - - 'opnfv-build-centos-defaults' - - 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 - - wrappers: - - timeout: - timeout: 24 - fail: true - - 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}' - file-paths: - - compare-type: ANT - pattern: 'build/**' - - compare-type: ANT - pattern: 'ci/**' - - builders: - - build-rpms - -- job-template: - name: 'ovsnfv-daily-{stream}' - - disabled: 'true' - - parameters: - - project-parameter: - project: '{project}' - branch: '{branch}' - - 'opnfv-build-centos-defaults' - - 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 - - wrappers: - - timeout: - timeout: 24 - fail: true - - triggers: - - timed: '@midnight' - - builders: - - build-rpms - - publishers: - - email: - recipients: therbert@redhat.com mark.d.gray@intel.com billy.o.mahony@intel.com - - email-jenkins-admins-on-failure - -- builder: - name: build-rpms - builders: - - shell: | - #!/bin/bash - set -o errexit - set -o nounset - set -o pipefail - - cd $WORKSPACE/ci - ./build.sh diff --git a/jjb/parser/parser-rtd-jobs.yaml b/jjb/parser/parser-rtd-jobs.yaml deleted file mode 100644 index df880f22b..000000000 --- a/jjb/parser/parser-rtd-jobs.yaml +++ /dev/null @@ -1,12 +0,0 @@ ---- -- project: - name: parser-rtd - project: parser - project-name: parser - - project-pattern: 'parser' - rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-parser/47384/' - rtd-token: '10223af1183fc8bdc191932045d82a0c1d7c874a' - - jobs: - - '{project-name}-rtd-jobs' diff --git a/jjb/parser/parser.yaml b/jjb/parser/parser.yaml deleted file mode 100644 index 574138f6d..000000000 --- a/jjb/parser/parser.yaml +++ /dev/null @@ -1,78 +0,0 @@ ---- -################################################### -# All the jobs except verify have been removed! -# They will only be enabled on request by projects! -################################################### -- project: - name: parser - - project: '{name}' - - jobs: - - 'parser-verify-{stream}' - - stream: - - master: - branch: '{stream}' - gs-pathname: '' - disabled: false - - fraser: &fraser - branch: 'stable/{stream}' - gs-pathname: '/{stream}' - disabled: false - -- job-template: - name: 'parser-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/**' - - compare-type: ANT - pattern: 'governance/**' - - compare-type: ANT - pattern: '*.txt|.gitignore|.gitreview|INFO|LICENSE' - - builders: - - shell: | - #!/bin/bash - set -o errexit - set -o pipefail - set -o xtrace - export PATH=$PATH:/usr/local/bin/ - - # ut and pep8 check parser/tosca2heat - echo "Running tox on tosca2heat/tosca-parser ..." - cd $WORKSPACE/tosca2heat/tosca-parser && tox - echo "Running tox on tosca2heat/heat-translator ..." - cd $WORKSPACE/tosca2heat/heat-translator && tox diff --git a/jjb/qtip/qtip-experimental-jobs.yaml b/jjb/qtip/qtip-experimental-jobs.yaml deleted file mode 100644 index 9f72954a2..000000000 --- a/jjb/qtip/qtip-experimental-jobs.yaml +++ /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: true - - 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-rtd-jobs.yaml b/jjb/qtip/qtip-rtd-jobs.yaml deleted file mode 100644 index 4af5997ba..000000000 --- a/jjb/qtip/qtip-rtd-jobs.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -- project: - name: qtip-rtd - project: qtip - project-name: qtip - - gerrit-skip-vote: true - project-pattern: 'qtip' - rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-qtip/47387/' - rtd-token: 'eb407b024fbe12c416d012f48db866caf5fbab7c' - - jobs: - - '{project-name}-rtd-jobs' diff --git a/jjb/qtip/qtip-validate-jobs.yaml b/jjb/qtip/qtip-validate-jobs.yaml deleted file mode 100644 index f7d66dfdd..000000000 --- a/jjb/qtip/qtip-validate-jobs.yaml +++ /dev/null @@ -1,166 +0,0 @@ ---- -####################### -# validate after MERGE -####################### -- project: - name: qtip - project: qtip - - # ------------------------------- - # BRANCH ANCHORS - # ------------------------------- - master: &master - stream: master - branch: '{stream}' - gs-pathname: '' - docker-tag: latest - disabled: false - fraser: &fraser - stream: fraser - branch: 'stable/{stream}' - gs-pathname: '{stream}' - docker-tag: 'stable' - disabled: false - - # ------------------------------- - # JOB VARIABLES - # ------------------------------- - qpi: - - compute: - installer: apex - pod: zte-virtual5 - disabled: true - sut: node - <<: *master - - storage: - installer: apex - pod: zte-virtual5 - disabled: true - sut: '' - <<: *master - - network: - installer: apex - pod: zte-virtual5 - disabled: true - sut: '' - <<: *master - - compute: - installer: fuel - pod: zte-virtual6 - sut: vnf - <<: *master - - compute: - installer: apex - pod: zte-virtual5 - disabled: true - sut: node - <<: *fraser - - storage: - installer: apex - pod: zte-virtual5 - disabled: true - 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: '{obj:disabled}' - - 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 deleted file mode 100644 index 12cfa95b7..000000000 --- a/jjb/qtip/qtip-verify-jobs.yaml +++ /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 diff --git a/jjb/snaps/snaps-verify-jobs.yaml b/jjb/snaps/snaps-verify-jobs.yaml index 10514c3b6..2055bc1c4 100644 --- a/jjb/snaps/snaps-verify-jobs.yaml +++ b/jjb/snaps/snaps-verify-jobs.yaml @@ -16,7 +16,11 @@ branch: '{stream}' gs-pathname: '' disabled: true - - fraser: &fraser + - hunter: &hunter + branch: 'stable/{stream}' + gs-pathname: '/{stream}' + disabled: false + - fraser: branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: true diff --git a/jjb/stor4nfv/stor4nfv-rtd-jobs.yaml b/jjb/stor4nfv/stor4nfv-rtd-jobs.yaml index 0e03e7b5f..0383c77c7 100644 --- a/jjb/stor4nfv/stor4nfv-rtd-jobs.yaml +++ b/jjb/stor4nfv/stor4nfv-rtd-jobs.yaml @@ -12,6 +12,10 @@ - master: branch: '{stream}' disabled: false + - hunter: &hunter + branch: 'stable/{stream}' + gs-pathname: '/{stream}' + disabled: false - gambia: branch: 'stable/{stream}' disabled: false