diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/apex/apex-project-jobs.yml | 5 | ||||
| -rw-r--r-- | jjb/apex/apex-verify-jobs.yml | 5 | ||||
| -rw-r--r-- | jjb/apex/apex.yml | 204 | ||||
| -rw-r--r-- | jjb/apex/apex.yml.j2 | 15 | ||||
| -rw-r--r-- | jjb/apex/scenarios.yaml.hidden | 19 | ||||
| -rw-r--r-- | jjb/compass4nfv/compass-ci-jobs.yml | 143 | ||||
| -rw-r--r-- | jjb/daisy4nfv/daisy-daily-jobs.yml | 79 | ||||
| -rwxr-xr-x | jjb/daisy4nfv/daisy-deploy.sh | 9 | ||||
| -rw-r--r-- | jjb/daisy4nfv/daisy-project-jobs.yml | 10 | ||||
| -rw-r--r-- | jjb/daisy4nfv/daisy4nfv-merge-jobs.yml | 4 | ||||
| -rw-r--r-- | jjb/daisy4nfv/daisy4nfv-verify-jobs.yml | 2 | ||||
| -rwxr-xr-x | jjb/functest/functest-env-presetup.sh | 2 | ||||
| -rw-r--r-- | jjb/global/slave-params.yml | 30 | ||||
| -rw-r--r-- | jjb/joid/joid-daily-jobs.yml | 66 | ||||
| -rw-r--r-- | jjb/joid/joid-verify-jobs.yml | 2 | ||||
| -rw-r--r-- | jjb/qtip/qtip-validate-jobs.yml | 2 | ||||
| -rw-r--r-- | jjb/releng/opnfv-lint.yml | 5 | ||||
| -rw-r--r-- | jjb/releng/releng-release-create-branch.sh | 2 |
18 files changed, 446 insertions, 158 deletions
diff --git a/jjb/apex/apex-project-jobs.yml b/jjb/apex/apex-project-jobs.yml index 58072865d..700ff60e8 100644 --- a/jjb/apex/apex-project-jobs.yml +++ b/jjb/apex/apex-project-jobs.yml @@ -9,6 +9,11 @@ gs-pathname: '' concurrent-builds: 3 disabled: false + - fraser: &fraser + branch: 'stable/{stream}' + gs-pathname: '/{stream}' + concurrent-builds: 3 + disabled: false - euphrates: &euphrates branch: 'stable/euphrates' gs-pathname: '/euphrates' diff --git a/jjb/apex/apex-verify-jobs.yml b/jjb/apex/apex-verify-jobs.yml index 302932246..3a693c87e 100644 --- a/jjb/apex/apex-verify-jobs.yml +++ b/jjb/apex/apex-verify-jobs.yml @@ -12,6 +12,11 @@ gs-pathname: '' verify-scenario: 'os-odl-nofeature-ha' disabled: false + - fraser: &fraser + branch: 'stable/{stream}' + gs-pathname: '/{stream}' + verify-scenario: 'os-odl-nofeature-ha' + disabled: false - danube: &danube branch: 'stable/{stream}' gs-pathname: '/{stream}' diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml index 428835683..a4c68600f 100644 --- a/jjb/apex/apex.yml +++ b/jjb/apex/apex.yml @@ -28,6 +28,16 @@ scenario_stream: 'master' disable_daily: false disable_promote: false + - fraser: &fraser + branch: 'stable/fraser' + gs-pathname: '/fraser' + build-slave: 'apex-build-master' + virtual-slave: 'apex-virtual-master' + baremetal-slave: 'apex-baremetal-master' + verify-scenario: 'os-odl-nofeature-ha' + scenario_stream: 'fraser' + disable_daily: true + disable_promote: true - euphrates: &euphrates branch: 'stable/euphrates' gs-pathname: '/euphrates' @@ -52,6 +62,42 @@ scenario: - 'os-nosdn-nofeature-noha': + <<: *fraser + - 'os-nosdn-nofeature-ha': + <<: *fraser + - 'os-odl-nofeature-ha': + <<: *fraser + - 'os-odl-nofeature-noha': + <<: *fraser + - 'os-odl-bgpvpn-ha': + <<: *fraser + - 'os-ovn-nofeature-noha': + <<: *fraser + - 'os-nosdn-fdio-noha': + <<: *fraser + - 'os-nosdn-fdio-ha': + <<: *fraser + - 'os-nosdn-bar-ha': + <<: *fraser + - 'os-nosdn-bar-noha': + <<: *fraser + - 'os-nosdn-nofeature-ha-ipv6': + <<: *fraser + - 'os-nosdn-ovs_dpdk-noha': + <<: *fraser + - 'os-nosdn-ovs_dpdk-ha': + <<: *fraser + - 'os-nosdn-kvm_ovs_dpdk-noha': + <<: *fraser + - 'os-nosdn-kvm_ovs_dpdk-ha': + <<: *fraser + - 'os-odl-sfc-noha': + <<: *fraser + - 'os-odl-sfc-ha': + <<: *fraser + - 'os-nosdn-calipso-noha': + <<: *fraser + - 'os-nosdn-nofeature-noha': <<: *danube - 'os-nosdn-nofeature-ha': <<: *danube @@ -1071,6 +1117,159 @@ # builder macros ######################## +# fraser Builder +- builder: + name: apex-builder-fraser + builders: + - multijob: + name: Baremetal Deploy and Test Phase + condition: SUCCESSFUL + projects: + - name: 'apex-os-nosdn-nofeature-noha-baremetal-fraser' + node-parameters: false + current-parameters: false + predefined-parameters: | + OPNFV_CLEAN=yes + kill-phase-on: NEVER + abort-all-job: true + git-revision: false + - name: 'apex-os-nosdn-nofeature-ha-baremetal-fraser' + node-parameters: false + current-parameters: false + predefined-parameters: | + OPNFV_CLEAN=yes + kill-phase-on: NEVER + abort-all-job: true + git-revision: false + - name: 'apex-os-odl-nofeature-ha-baremetal-fraser' + node-parameters: false + current-parameters: false + predefined-parameters: | + OPNFV_CLEAN=yes + kill-phase-on: NEVER + abort-all-job: true + git-revision: false + - name: 'apex-os-odl-nofeature-noha-baremetal-fraser' + node-parameters: false + current-parameters: false + predefined-parameters: | + OPNFV_CLEAN=yes + kill-phase-on: NEVER + abort-all-job: true + git-revision: false + - name: 'apex-os-odl-bgpvpn-ha-baremetal-fraser' + node-parameters: false + current-parameters: false + predefined-parameters: | + OPNFV_CLEAN=yes + kill-phase-on: NEVER + abort-all-job: true + git-revision: false + - name: 'apex-os-ovn-nofeature-noha-baremetal-fraser' + node-parameters: false + current-parameters: false + predefined-parameters: | + OPNFV_CLEAN=yes + kill-phase-on: NEVER + abort-all-job: true + git-revision: false + - name: 'apex-os-nosdn-fdio-noha-baremetal-fraser' + node-parameters: false + current-parameters: false + predefined-parameters: | + OPNFV_CLEAN=yes + kill-phase-on: NEVER + abort-all-job: true + git-revision: false + - name: 'apex-os-nosdn-fdio-ha-baremetal-fraser' + node-parameters: false + current-parameters: false + predefined-parameters: | + OPNFV_CLEAN=yes + kill-phase-on: NEVER + abort-all-job: true + git-revision: false + - name: 'apex-os-nosdn-bar-ha-baremetal-fraser' + node-parameters: false + current-parameters: false + predefined-parameters: | + OPNFV_CLEAN=yes + kill-phase-on: NEVER + abort-all-job: true + git-revision: false + - name: 'apex-os-nosdn-bar-noha-baremetal-fraser' + node-parameters: false + current-parameters: false + predefined-parameters: | + OPNFV_CLEAN=yes + kill-phase-on: NEVER + abort-all-job: true + git-revision: false + - name: 'apex-os-nosdn-nofeature-ha-ipv6-baremetal-fraser' + node-parameters: false + current-parameters: false + predefined-parameters: | + OPNFV_CLEAN=yes + kill-phase-on: NEVER + abort-all-job: true + git-revision: false + - name: 'apex-os-nosdn-ovs_dpdk-noha-baremetal-fraser' + node-parameters: false + current-parameters: false + predefined-parameters: | + OPNFV_CLEAN=yes + kill-phase-on: NEVER + abort-all-job: true + git-revision: false + - name: 'apex-os-nosdn-ovs_dpdk-ha-baremetal-fraser' + node-parameters: false + current-parameters: false + predefined-parameters: | + OPNFV_CLEAN=yes + kill-phase-on: NEVER + abort-all-job: true + git-revision: false + - name: 'apex-os-nosdn-kvm_ovs_dpdk-noha-baremetal-fraser' + node-parameters: false + current-parameters: false + predefined-parameters: | + OPNFV_CLEAN=yes + kill-phase-on: NEVER + abort-all-job: true + git-revision: false + - name: 'apex-os-nosdn-kvm_ovs_dpdk-ha-baremetal-fraser' + node-parameters: false + current-parameters: false + predefined-parameters: | + OPNFV_CLEAN=yes + kill-phase-on: NEVER + abort-all-job: true + git-revision: false + - name: 'apex-os-odl-sfc-noha-baremetal-fraser' + node-parameters: false + current-parameters: false + predefined-parameters: | + OPNFV_CLEAN=yes + kill-phase-on: NEVER + abort-all-job: true + git-revision: false + - name: 'apex-os-odl-sfc-ha-baremetal-fraser' + node-parameters: false + current-parameters: false + predefined-parameters: | + OPNFV_CLEAN=yes + kill-phase-on: NEVER + abort-all-job: true + git-revision: false + - name: 'apex-os-nosdn-calipso-noha-baremetal-fraser' + node-parameters: false + current-parameters: false + predefined-parameters: | + OPNFV_CLEAN=yes + kill-phase-on: NEVER + abort-all-job: true + git-revision: false + # danube Builder - builder: name: apex-builder-danube @@ -1636,6 +1835,11 @@ - timed: '0 0 1-31/2 * *' - trigger: + name: 'apex-fraser' + triggers: + - timed: '0 0 2-30/2 * *' + +- trigger: name: 'apex-euphrates' triggers: - timed: '0 0 2-30/2 * *' diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2 index 0bedd3560..25b9cd9d7 100644 --- a/jjb/apex/apex.yml.j2 +++ b/jjb/apex/apex.yml.j2 @@ -28,6 +28,16 @@ scenario_stream: 'master' disable_daily: false disable_promote: false + - fraser: &fraser + branch: 'stable/fraser' + gs-pathname: '/fraser' + build-slave: 'apex-build-master' + virtual-slave: 'apex-virtual-master' + baremetal-slave: 'apex-baremetal-master' + verify-scenario: 'os-odl-nofeature-ha' + scenario_stream: 'fraser' + disable_daily: true + disable_promote: true - euphrates: &euphrates branch: 'stable/euphrates' gs-pathname: '/euphrates' @@ -996,6 +1006,11 @@ - timed: '0 0 1-31/2 * *' - trigger: + name: 'apex-fraser' + triggers: + - timed: '0 0 2-30/2 * *' + +- trigger: name: 'apex-euphrates' triggers: - timed: '0 0 2-30/2 * *' diff --git a/jjb/apex/scenarios.yaml.hidden b/jjb/apex/scenarios.yaml.hidden index 93ce931eb..58f1c64f4 100644 --- a/jjb/apex/scenarios.yaml.hidden +++ b/jjb/apex/scenarios.yaml.hidden @@ -19,6 +19,25 @@ master: - 'os-odl-sfc-noha' - 'os-odl-sfc-ha' - 'os-nosdn-calipso-noha' +fraser: + - 'os-nosdn-nofeature-noha' + - 'os-nosdn-nofeature-ha' + - 'os-odl-nofeature-ha' + - 'os-odl-nofeature-noha' + - 'os-odl-bgpvpn-ha' + - 'os-ovn-nofeature-noha' + - 'os-nosdn-fdio-noha' + - 'os-nosdn-fdio-ha' + - 'os-nosdn-bar-ha' + - 'os-nosdn-bar-noha' + - 'os-nosdn-nofeature-ha-ipv6' + - 'os-nosdn-ovs_dpdk-noha' + - 'os-nosdn-ovs_dpdk-ha' + - 'os-nosdn-kvm_ovs_dpdk-noha' + - 'os-nosdn-kvm_ovs_dpdk-ha' + - 'os-odl-sfc-noha' + - 'os-odl-sfc-ha' + - 'os-nosdn-calipso-noha' euphrates: - 'os-nosdn-nofeature-noha' - 'os-nosdn-nofeature-ha' diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml index 44cb84d8e..0d5f92c2a 100644 --- a/jjb/compass4nfv/compass-ci-jobs.yml +++ b/jjb/compass4nfv/compass-ci-jobs.yml @@ -14,13 +14,13 @@ ppa-pathname: '/{stream}' disabled: false openstack-version: pike - euphrates: &euphrates - stream: euphrates + fraser: &fraser + stream: fraser branch: 'stable/{stream}' disabled: false gs-pathname: '/{stream}' ppa-pathname: '/{stream}' - openstack-version: ocata + openstack-version: pike danube: &danube stream: danube branch: 'stable/{stream}' @@ -45,11 +45,11 @@ - baremetal: slave-label: compass-baremetal-branch os-version: 'xenial' - <<: *euphrates + <<: *fraser - virtual: slave-label: compass-virtual-branch os-version: 'xenial' - <<: *euphrates + <<: *fraser # ------------------------------- # master # ------------------------------- @@ -69,9 +69,6 @@ - 'os-nosdn-nofeature-ha': disabled: false auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger' - - 'os-odl_l2-nofeature-ha': - disabled: false - auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger' - 'os-odl_l3-nofeature-ha': disabled: false auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger' @@ -386,7 +383,7 @@ !include-raw-escape: ./compass-deploy.sh - conditional-step: condition-kind: regex-match - regex: (danube|euphrates) + regex: (danube|fraser) label: '{stream}' steps: - shell: @@ -486,10 +483,6 @@ triggers: - timed: '' - trigger: - name: 'compass-os-odl_l2-nofeature-ha-baremetal-centos-master-trigger' - triggers: - - timed: '' -- trigger: name: 'compass-os-odl_l3-nofeature-ha-baremetal-centos-master-trigger' triggers: - timed: '0 15 * * *' @@ -583,10 +576,6 @@ triggers: - timed: '' - trigger: - name: 'compass-os-odl_l2-nofeature-ha-huawei-pod7-danube-trigger' - triggers: - - timed: '' # '0 21 * * *' -- trigger: name: 'compass-os-odl_l3-nofeature-ha-huawei-pod7-danube-trigger' triggers: - timed: '' # '0 15 * * *' @@ -679,10 +668,6 @@ triggers: - timed: '' - trigger: - name: 'compass-os-odl_l2-nofeature-ha-baremetal-master-trigger' - triggers: - - timed: '' -- trigger: name: 'compass-os-odl_l3-nofeature-ha-baremetal-master-trigger' triggers: - timed: '0 18 1-29/2 * *' @@ -701,7 +686,7 @@ - trigger: name: 'compass-os-odl_l2-moon-ha-baremetal-master-trigger' triggers: - - timed: '0 12 2-30/2 * *' + - timed: '' # '0 12 2-30/2 * *' - trigger: name: 'compass-os-nosdn-kvm-ha-baremetal-master-trigger' triggers: @@ -764,98 +749,94 @@ - timed: '' # ------------------- -# ha-baremetal-euphrates +# ha-baremetal-fraser # ------------------- - trigger: - name: 'compass-os-nosdn-nofeature-ha-baremetal-euphrates-trigger' + name: 'compass-os-nosdn-nofeature-ha-baremetal-fraser-trigger' triggers: - timed: '0 1 1-29/2 * *' - trigger: - name: 'compass-os-nosdn-openo-ha-baremetal-euphrates-trigger' + name: 'compass-os-nosdn-openo-ha-baremetal-fraser-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-odl_l2-nofeature-ha-baremetal-euphrates-trigger' - triggers: - - timed: '' -- trigger: - name: 'compass-os-odl_l3-nofeature-ha-baremetal-euphrates-trigger' + name: 'compass-os-odl_l3-nofeature-ha-baremetal-fraser-trigger' triggers: - timed: '0 21 2-30/2 * *' - trigger: - name: 'compass-os-onos-nofeature-ha-baremetal-euphrates-trigger' + name: 'compass-os-onos-nofeature-ha-baremetal-fraser-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-ocl-nofeature-ha-baremetal-euphrates-trigger' + name: 'compass-os-ocl-nofeature-ha-baremetal-fraser-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-onos-sfc-ha-baremetal-euphrates-trigger' + name: 'compass-os-onos-sfc-ha-baremetal-fraser-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-odl_l2-moon-ha-baremetal-euphrates-trigger' + name: 'compass-os-odl_l2-moon-ha-baremetal-fraser-trigger' triggers: - - timed: '0 5 1-29/2 * *' + - timed: '' # '0 5 1-29/2 * *' - trigger: - name: 'compass-os-nosdn-kvm-ha-baremetal-euphrates-trigger' + name: 'compass-os-nosdn-kvm-ha-baremetal-fraser-trigger' triggers: - timed: '0 13 2-30/2 * *' - trigger: - name: 'compass-os-nosdn-ovs_dpdk-ha-baremetal-euphrates-trigger' + name: 'compass-os-nosdn-ovs_dpdk-ha-baremetal-fraser-trigger' triggers: - timed: '0 9 1-29/2 * *' - trigger: - name: 'compass-k8-nosdn-nofeature-ha-baremetal-euphrates-trigger' + name: 'compass-k8-nosdn-nofeature-ha-baremetal-fraser-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-odl-sfc-ha-baremetal-euphrates-trigger' + name: 'compass-os-odl-sfc-ha-baremetal-fraser-trigger' triggers: - timed: '0 17 2-30/2 * *' - trigger: - name: 'compass-os-nosdn-bar-ha-baremetal-euphrates-trigger' + name: 'compass-os-nosdn-bar-ha-baremetal-fraser-trigger' triggers: - timed: '0 21 1-29/2 * *' - trigger: - name: 'compass-k8-nosdn-stor4nfv-ha-baremetal-euphrates-trigger' + name: 'compass-k8-nosdn-stor4nfv-ha-baremetal-fraser-trigger' triggers: - timed: '' # --------------------- -# noha-baremetal-euphrates +# noha-baremetal-fraser # --------------------- - trigger: - name: 'compass-os-nosdn-kvm-noha-baremetal-euphrates-trigger' + name: 'compass-os-nosdn-kvm-noha-baremetal-fraser-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-nosdn-nofeature-noha-baremetal-euphrates-trigger' + name: 'compass-os-nosdn-nofeature-noha-baremetal-fraser-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-odl_l3-nofeature-noha-baremetal-euphrates-trigger' + name: 'compass-os-odl_l3-nofeature-noha-baremetal-fraser-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-odl_l2-moon-noha-baremetal-euphrates-trigger' + name: 'compass-os-odl_l2-moon-noha-baremetal-fraser-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-odl-sfc-noha-baremetal-euphrates-trigger' + name: 'compass-os-odl-sfc-noha-baremetal-fraser-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-nosdn-ovs_dpdk-noha-baremetal-euphrates-trigger' + name: 'compass-os-nosdn-ovs_dpdk-noha-baremetal-fraser-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-nosdn-bar-noha-baremetal-euphrates-trigger' + name: 'compass-os-nosdn-bar-noha-baremetal-fraser-trigger' triggers: - timed: '' - trigger: - name: 'compass-k8-nosdn-stor4nfv-noha-baremetal-euphrates-trigger' + name: 'compass-k8-nosdn-stor4nfv-noha-baremetal-fraser-trigger' triggers: - timed: '' @@ -871,10 +852,6 @@ triggers: - timed: '' - trigger: - name: 'compass-os-odl_l2-nofeature-ha-virtual-master-trigger' - triggers: - - timed: '' -- trigger: name: 'compass-os-odl_l3-nofeature-ha-virtual-master-trigger' triggers: - timed: '0 19 2-30/2 * *' @@ -893,7 +870,7 @@ - trigger: name: 'compass-os-odl_l2-moon-ha-virtual-master-trigger' triggers: - - timed: '30 12 1-29/2 * *' + - timed: '' # '30 12 1-29/2 * *' - trigger: name: 'compass-os-nosdn-kvm-ha-virtual-master-trigger' triggers: @@ -937,7 +914,7 @@ - trigger: name: 'compass-os-odl_l2-moon-noha-virtual-master-trigger' triggers: - - timed: '0 18 2-30/2 * *' + - timed: '' # '0 18 2-30/2 * *' - trigger: name: 'compass-os-odl-sfc-noha-virtual-master-trigger' triggers: @@ -956,97 +933,93 @@ - timed: '0 10 2-30/2 * *' # ----------------- -# ha-virtual-euphrates +# ha-virtual-fraser # ----------------- - trigger: - name: 'compass-os-nosdn-nofeature-ha-virtual-euphrates-trigger' + name: 'compass-os-nosdn-nofeature-ha-virtual-fraser-trigger' triggers: - timed: '0 23 1-29/2 * *' - trigger: - name: 'compass-os-nosdn-openo-ha-virtual-euphrates-trigger' + name: 'compass-os-nosdn-openo-ha-virtual-fraser-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-odl_l2-nofeature-ha-virtual-euphrates-trigger' - triggers: - - timed: '' -- trigger: - name: 'compass-os-odl_l3-nofeature-ha-virtual-euphrates-trigger' + name: 'compass-os-odl_l3-nofeature-ha-virtual-fraser-trigger' triggers: - timed: '0 22 2-30/2 * *' - trigger: - name: 'compass-os-onos-nofeature-ha-virtual-euphrates-trigger' + name: 'compass-os-onos-nofeature-ha-virtual-fraser-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-ocl-nofeature-ha-virtual-euphrates-trigger' + name: 'compass-os-ocl-nofeature-ha-virtual-fraser-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-onos-sfc-ha-virtual-euphrates-trigger' + name: 'compass-os-onos-sfc-ha-virtual-fraser-trigger' triggers: - timed: '' - trigger: - name: 'compass-os-odl_l2-moon-ha-virtual-euphrates-trigger' + name: 'compass-os-odl_l2-moon-ha-virtual-fraser-trigger' triggers: - timed: '0 20 1-29/2 * *' - trigger: - name: 'compass-os-nosdn-kvm-ha-virtual-euphrates-trigger' + name: 'compass-os-nosdn-kvm-ha-virtual-fraser-trigger' triggers: - timed: '0 16 2-30/2 * *' - trigger: - name: 'compass-os-nosdn-ovs_dpdk-ha-virtual-euphrates-trigger' + name: 'compass-os-nosdn-ovs_dpdk-ha-virtual-fraser-trigger' triggers: - timed: '0 14 1-29/2 * *' - trigger: - name: 'compass-os-odl-sfc-ha-virtual-euphrates-trigger' + name: 'compass-os-odl-sfc-ha-virtual-fraser-trigger' triggers: - timed: '0 18 2-30/2 * *' - trigger: - name: 'compass-k8-nosdn-nofeature-ha-virtual-euphrates-trigger' + name: 'compass-k8-nosdn-nofeature-ha-virtual-fraser-trigger' triggers: - timed: '5 1 2-30/2 * *' - trigger: - name: 'compass-os-nosdn-bar-ha-virtual-euphrates-trigger' + name: 'compass-os-nosdn-bar-ha-virtual-fraser-trigger' triggers: - timed: '0 19 1-29/2 * *' - trigger: - name: 'compass-k8-nosdn-stor4nfv-ha-virtual-euphrates-trigger' + name: 'compass-k8-nosdn-stor4nfv-ha-virtual-fraser-trigger' triggers: - - timed: '' # '0 14 1-29/2 * *' + - timed: '0 15 1-29/2 * *' # ------------------- -# noha-virtual-euphrates +# noha-virtual-fraser # ------------------- - trigger: - name: 'compass-os-nosdn-kvm-noha-virtual-euphrates-trigger' + name: 'compass-os-nosdn-kvm-noha-virtual-fraser-trigger' triggers: - timed: '0 15 1-29/2 * *' - trigger: - name: 'compass-os-nosdn-nofeature-noha-virtual-euphrates-trigger' + name: 'compass-os-nosdn-nofeature-noha-virtual-fraser-trigger' triggers: - timed: '0 17 2-30/2 * *' - trigger: - name: 'compass-os-odl_l3-nofeature-noha-virtual-euphrates-trigger' + name: 'compass-os-odl_l3-nofeature-noha-virtual-fraser-trigger' triggers: - timed: '0 23 1-29/2 * *' - trigger: - name: 'compass-os-odl_l2-moon-noha-virtual-euphrates-trigger' + name: 'compass-os-odl_l2-moon-noha-virtual-fraser-trigger' triggers: - timed: '0 21 2-30/2 * *' - trigger: - name: 'compass-os-odl-sfc-noha-virtual-euphrates-trigger' + name: 'compass-os-odl-sfc-noha-virtual-fraser-trigger' triggers: - timed: '0 19 1-29/2 * *' - trigger: - name: 'compass-os-nosdn-ovs_dpdk-noha-virtual-euphrates-trigger' + name: 'compass-os-nosdn-ovs_dpdk-noha-virtual-fraser-trigger' triggers: - timed: '0 12 2-30/2 * *' - trigger: - name: 'compass-os-nosdn-bar-noha-virtual-euphrates-trigger' + name: 'compass-os-nosdn-bar-noha-virtual-fraser-trigger' triggers: - timed: '0 12 1-29/2 * *' - trigger: - name: 'compass-k8-nosdn-stor4nfv-noha-virtual-euphrates-trigger' + name: 'compass-k8-nosdn-stor4nfv-noha-virtual-fraser-trigger' triggers: - - timed: '' # '0 12 2-30/2 * *' + - timed: '0 13 2-30/2 * *' diff --git a/jjb/daisy4nfv/daisy-daily-jobs.yml b/jjb/daisy4nfv/daisy-daily-jobs.yml index cc2dc5a2f..2eb27a663 100644 --- a/jjb/daisy4nfv/daisy-daily-jobs.yml +++ b/jjb/daisy4nfv/daisy-daily-jobs.yml @@ -20,8 +20,8 @@ branch: '{stream}' disabled: false gs-pathname: '' - euphrates: &euphrates - stream: euphrates + fraser: &fraser + stream: fraser branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false @@ -29,21 +29,22 @@ # ------------------------------- # POD, INSTALLER, AND BRANCH MAPPING # ------------------------------- - # CI PODs - # ------------------------------- pod: + # ------------------------------- + # CI PODs + # ------------------------------- - baremetal: slave-label: daisy-baremetal <<: *master - virtual: slave-label: daisy-virtual <<: *master - # - baremetal: - # slave-label: daisy-baremetal - # <<: *euphrates - # - virtual: - # slave-label: daisy-virtual - # <<: *euphrates + - baremetal: + slave-label: daisy-baremetal + <<: *fraser + - virtual: + slave-label: daisy-virtual + <<: *fraser # ------------------------------- # None-CI PODs # ------------------------------- @@ -53,9 +54,9 @@ - zte-pod9: slave-label: zte-pod9 <<: *master - # ------------------------------- - # None-CI PODs - # ------------------------------- + - zte-pod9: + slave-label: zte-pod9 + <<: *fraser # ------------------------------- # scenarios @@ -191,9 +192,9 @@ use-build-blocker: true blocking-jobs: - 'daisy-kolla-build-.*' - - '{installer}-(build|deploy|test)-daily-(euphrates|master)' - - '{installer}-deploy-(baremetal|virtual|zte-pod9)-daily-(euphrates|master)' - - '(functest|yardstick)-{installer}-(baremetal|virtual|zte-pod9)-daily-(euphrates|master)' + - '{installer}-(build|deploy|test)-daily-(fraser|master)' + - '{installer}-deploy-(baremetal|virtual|zte-pod9)-daily-(fraser|master)' + - '(functest|yardstick)-{installer}-(baremetal|virtual|zte-pod9)-daily-(fraser|master)' block-level: 'NODE' parameters: @@ -281,50 +282,50 @@ - timed: '' # ---------------------------------------------- -# Triggers for job running on daisy-baremetal against euphrates branch +# Triggers for job running on daisy-baremetal against fraser branch # ---------------------------------------------- # Basic HA Scenarios - trigger: - name: 'daisy-os-nosdn-nofeature-ha-baremetal-daily-euphrates-trigger' + name: 'daisy-os-nosdn-nofeature-ha-baremetal-daily-fraser-trigger' triggers: - timed: '0 0 * * *' # Basic NOHA Scenarios - trigger: - name: 'daisy-os-nosdn-nofeature-noha-baremetal-daily-euphrates-trigger' + name: 'daisy-os-nosdn-nofeature-noha-baremetal-daily-fraser-trigger' triggers: - timed: '' # ODL Scenarios - trigger: - name: 'daisy-os-odl-nofeature-ha-baremetal-daily-euphrates-trigger' + name: 'daisy-os-odl-nofeature-ha-baremetal-daily-fraser-trigger' triggers: - timed: '0 20 * * *' # ovs_dpdk Scenarios - trigger: - name: 'daisy-os-nosdn-ovs_dpdk-noha-baremetal-daily-euphrates-trigger' + name: 'daisy-os-nosdn-ovs_dpdk-noha-baremetal-daily-fraser-trigger' triggers: - timed: '' # ---------------------------------------------- -# Triggers for job running on daisy-virtual against euphrates branch +# Triggers for job running on daisy-virtual against fraser branch # ---------------------------------------------- # Basic HA Scenarios - trigger: - name: 'daisy-os-nosdn-nofeature-ha-virtual-daily-euphrates-trigger' + name: 'daisy-os-nosdn-nofeature-ha-virtual-daily-fraser-trigger' triggers: - timed: '0 0 * * *' # Basic NOHA Scenarios - trigger: - name: 'daisy-os-nosdn-nofeature-noha-virtual-daily-euphrates-trigger' + name: 'daisy-os-nosdn-nofeature-noha-virtual-daily-fraser-trigger' triggers: - timed: '' # ODL Scenarios - trigger: - name: 'daisy-os-odl-nofeature-ha-virtual-daily-euphrates-trigger' + name: 'daisy-os-odl-nofeature-ha-virtual-daily-fraser-trigger' triggers: - timed: '0 20 * * *' # ovs_dpdk Scenarios - trigger: - name: 'daisy-os-nosdn-ovs_dpdk-noha-virtual-daily-euphrates-trigger' + name: 'daisy-os-nosdn-ovs_dpdk-noha-virtual-daily-fraser-trigger' triggers: - timed: '' @@ -335,7 +336,7 @@ - trigger: name: 'daisy-os-nosdn-ovs_dpdk-noha-zte-pod9-daily-master-trigger' triggers: - - timed: '0 10,20 * * *' + - timed: '0 20 * * *' # Basic HA Scenarios - trigger: name: 'daisy-os-nosdn-nofeature-ha-zte-pod9-daily-master-trigger' @@ -351,3 +352,27 @@ name: 'daisy-os-odl-nofeature-ha-zte-pod9-daily-master-trigger' triggers: - timed: '' + +# ---------------------------------------------- +# ZTE POD9 Triggers running against fraser branch +# ---------------------------------------------- +# ovs_dpdk Scenarios +- trigger: + name: 'daisy-os-nosdn-ovs_dpdk-noha-zte-pod9-daily-fraser-trigger' + triggers: + - timed: '0 10 * * *' +# Basic HA Scenarios +- trigger: + name: 'daisy-os-nosdn-nofeature-ha-zte-pod9-daily-fraser-trigger' + triggers: + - timed: '' +# Basic NOHA Scenarios +- trigger: + name: 'daisy-os-nosdn-nofeature-noha-zte-pod9-daily-fraser-trigger' + triggers: + - timed: '' +# ODL Scenarios +- trigger: + name: 'daisy-os-odl-nofeature-ha-zte-pod9-daily-fraser-trigger' + triggers: + - timed: '' diff --git a/jjb/daisy4nfv/daisy-deploy.sh b/jjb/daisy4nfv/daisy-deploy.sh index f729c380e..ea57ab1b4 100755 --- a/jjb/daisy4nfv/daisy-deploy.sh +++ b/jjb/daisy4nfv/daisy-deploy.sh @@ -27,6 +27,12 @@ else CONFIG_REPO_NAME=pharos fi +if [[ "$BRANCH" =~ "master" ]]; then + DOCTOR_OPT="-d 1" +else + DOCTOR_OPT="" +fi + LABS_DIR=/var/tmp/opnfv-${CONFIG_REPO_NAME} echo "Cloning ${CONFIG_REPO_NAME} repo $BRANCH to $LABS_DIR" @@ -35,7 +41,8 @@ git clone ssh://jenkins-zte@gerrit.opnfv.org:29418/${CONFIG_REPO_NAME} \ --quiet --branch $BRANCH $LABS_DIR DEPLOY_COMMAND="sudo -E ./ci/deploy/deploy.sh -L $LABS_DIR \ - -l $LAB_NAME -p $POD_NAME -B $BRIDGE -s $DEPLOY_SCENARIO" + -l $LAB_NAME -p $POD_NAME -B $BRIDGE -s $DEPLOY_SCENARIO \ + $DOCTOR_OPT" # log info to console echo """ diff --git a/jjb/daisy4nfv/daisy-project-jobs.yml b/jjb/daisy4nfv/daisy-project-jobs.yml index c4edd7738..3ea74a9a8 100644 --- a/jjb/daisy4nfv/daisy-project-jobs.yml +++ b/jjb/daisy4nfv/daisy-project-jobs.yml @@ -21,7 +21,7 @@ branch: '{stream}' gs-pathname: '' disabled: false - - euphrates: + - fraser: branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false @@ -94,7 +94,7 @@ - email-jenkins-admins-on-failure - trigger: - name: 'daisy-kolla-build-euphrates-trigger' + name: 'daisy-kolla-build-fraser-trigger' triggers: - timed: '0 0 * * 0' @@ -218,9 +218,9 @@ - build-blocker: use-build-blocker: true blocking-jobs: - - '{installer}-daily-(build|deploy|test)-(euphrates|master)' - - '{installer}-.*-(baremetal|virtual|zte-pod9)-daily-(euphrates|master)' - - '(functest|yardstick)-{installer}-(baremetal|virtual|zte-pod9)-daily-(euphrates|master)' + - '{installer}-daily-(build|deploy|test)-(fraser|master)' + - '{installer}-.*-(baremetal|virtual|zte-pod9)-daily-(fraser|master)' + - '(functest|yardstick)-{installer}-(baremetal|virtual|zte-pod9)-daily-(fraser|master)' block-level: 'NODE' scm: diff --git a/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml b/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml index f304d0b95..3a0a59fc4 100644 --- a/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml +++ b/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml @@ -19,7 +19,7 @@ branch: '{stream}' gs-pathname: '' disabled: false - - euphrates: + - fraser: branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false @@ -60,7 +60,7 @@ - build-blocker: use-build-blocker: true blocking-jobs: - - '{alias}-merge-(master|euphrates)' + - '{alias}-merge-(master|fraser)' block-level: 'NODE' scm: diff --git a/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml b/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml index 4100990d4..777b67795 100644 --- a/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml +++ b/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml @@ -16,7 +16,7 @@ branch: '{stream}' gs-pathname: '' disabled: false - - euphrates: + - fraser: branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false diff --git a/jjb/functest/functest-env-presetup.sh b/jjb/functest/functest-env-presetup.sh index 4738121de..323b325b4 100755 --- a/jjb/functest/functest-env-presetup.sh +++ b/jjb/functest/functest-env-presetup.sh @@ -49,7 +49,7 @@ elif [[ ${INSTALLER_TYPE} == 'daisy' ]]; then elif [[ ${INSTALLER_TYPE} == 'fuel' ]]; then if [[ ! "${BRANCH}" =~ "danube" ]]; then echo "Map mcp ssh_key" - export sshkey_vol="-v ${SSH_KEY}:/root/.ssh/id_rsa" + export sshkey_vol="-v ${SSH_KEY:-/var/lib/opnfv/mcp.rsa}:/root/.ssh/id_rsa" fi fi diff --git a/jjb/global/slave-params.yml b/jjb/global/slave-params.yml index 6171a6abd..628c13f79 100644 --- a/jjb/global/slave-params.yml +++ b/jjb/global/slave-params.yml @@ -20,6 +20,21 @@ description: 'SSH key to use for Apex' - parameter: + name: 'apex-baremetal-fraser-defaults' + parameters: + - label: + name: SLAVE_LABEL + default: 'apex-baremetal-master' + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: 'Git URL to use on this Jenkins Slave' + - string: + name: SSH_KEY + default: /root/.ssh/id_rsa + description: 'SSH key to use for Apex' + +- parameter: name: 'apex-baremetal-euphrates-defaults' parameters: - label: @@ -66,6 +81,21 @@ description: 'SSH key to use for Apex' - parameter: + name: 'apex-virtual-fraser-defaults' + parameters: + - label: + name: SLAVE_LABEL + default: 'apex-virtual-master' + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: 'Git URL to use on this Jenkins Slave' + - string: + name: SSH_KEY + default: /root/.ssh/id_rsa + description: 'SSH key to use for Apex' + +- parameter: name: 'apex-virtual-euphrates-defaults' parameters: - label: diff --git a/jjb/joid/joid-daily-jobs.yml b/jjb/joid/joid-daily-jobs.yml index 947b2f1ab..1e92fbfef 100644 --- a/jjb/joid/joid-daily-jobs.yml +++ b/jjb/joid/joid-daily-jobs.yml @@ -13,8 +13,8 @@ # ------------------------------- # BRANCH ANCHORS # ------------------------------- - euphrates: &euphrates - stream: euphrates + fraser: &fraser + stream: fraser branch: 'stable/{stream}' disabled: false gs-pathname: '/{stream}' @@ -31,7 +31,7 @@ pod: - baremetal: slave-label: joid-baremetal - <<: *euphrates + <<: *fraser - baremetal: slave-label: joid-baremetal <<: *master @@ -232,9 +232,9 @@ ######################## # trigger macros ######################## -# os-nosdn-nofeature-ha trigger - branch: euphrates +# os-nosdn-nofeature-ha trigger - branch: fraser - trigger: - name: 'joid-os-nosdn-nofeature-ha-baremetal-euphrates-trigger' + name: 'joid-os-nosdn-nofeature-ha-baremetal-fraser-trigger' triggers: - timed: '5 2 * * *' # os-nosdn-nofeature-ha trigger - branch: master @@ -242,9 +242,9 @@ name: 'joid-os-nosdn-nofeature-ha-baremetal-master-trigger' triggers: - timed: '5 2 * * *' -# os-odl_l2-nofeature-ha trigger - branch: euphrates +# os-odl_l2-nofeature-ha trigger - branch: fraser - trigger: - name: 'joid-os-odl_l2-nofeature-ha-baremetal-euphrates-trigger' + name: 'joid-os-odl_l2-nofeature-ha-baremetal-fraser-trigger' triggers: - timed: '5 7 * * *' # os-odl_l2-nofeature-ha trigger - branch: master @@ -252,9 +252,9 @@ name: 'joid-os-odl_l2-nofeature-ha-baremetal-master-trigger' triggers: - timed: '5 7 * * *' -# os-nosdn-lxd-noha trigger - branch: euphrates +# os-nosdn-lxd-noha trigger - branch: fraser - trigger: - name: 'joid-os-nosdn-lxd-noha-baremetal-euphrates-trigger' + name: 'joid-os-nosdn-lxd-noha-baremetal-fraser-trigger' triggers: - timed: '5 22 * * *' # os-nosdn-lxd-noha trigger - branch: master @@ -262,9 +262,9 @@ name: 'joid-os-nosdn-lxd-noha-baremetal-master-trigger' triggers: - timed: '5 22 * * *' -# os-nosdn-lxd-ha trigger - branch: euphrates +# os-nosdn-lxd-ha trigger - branch: fraser - trigger: - name: 'joid-os-nosdn-lxd-ha-baremetal-euphrates-trigger' + name: 'joid-os-nosdn-lxd-ha-baremetal-fraser-trigger' triggers: - timed: '5 10 * * *' # os-nosdn-lxd-ha trigger - branch: master @@ -272,9 +272,9 @@ name: 'joid-os-nosdn-lxd-ha-baremetal-master-trigger' triggers: - timed: '5 10 * * *' -# os-nosdn-nofeature-noha trigger - branch: euphrates +# os-nosdn-nofeature-noha trigger - branch: fraser - trigger: - name: 'joid-os-nosdn-nofeature-noha-baremetal-euphrates-trigger' + name: 'joid-os-nosdn-nofeature-noha-baremetal-fraser-trigger' triggers: - timed: '5 4 * * *' # os-nosdn-nofeature-noha trigger - branch: master @@ -282,9 +282,9 @@ name: 'joid-os-nosdn-nofeature-noha-baremetal-master-trigger' triggers: - timed: '5 4 * * *' -# k8-nosdn-nofeature-noha trigger - branch: euphrates +# k8-nosdn-nofeature-noha trigger - branch: fraser - trigger: - name: 'joid-k8-nosdn-nofeature-noha-baremetal-euphrates-trigger' + name: 'joid-k8-nosdn-nofeature-noha-baremetal-fraser-trigger' triggers: - timed: '5 15 * * *' # k8-nosdn-nofeature-noha trigger - branch: master @@ -292,9 +292,9 @@ name: 'joid-k8-nosdn-nofeature-noha-baremetal-master-trigger' triggers: - timed: '5 15 * * *' -# k8-nosdn-lb-noha trigger - branch: euphrates +# k8-nosdn-lb-noha trigger - branch: fraser - trigger: - name: 'joid-k8-nosdn-lb-noha-baremetal-euphrates-trigger' + name: 'joid-k8-nosdn-lb-noha-baremetal-fraser-trigger' triggers: - timed: '5 20 * * *' # k8-nosdn-lb-noha trigger - branch: master @@ -302,9 +302,9 @@ name: 'joid-k8-nosdn-lb-noha-baremetal-master-trigger' triggers: - timed: '5 20 * * *' -# k8-ovn-lb-noha trigger - branch: euphrates +# k8-ovn-lb-noha trigger - branch: fraser - trigger: - name: 'joid-k8-ovn-lb-noha-baremetal-euphrates-trigger' + name: 'joid-k8-ovn-lb-noha-baremetal-fraser-trigger' triggers: - timed: '5 17 * * *' # k8-ovn-lb-noha trigger - branch: master @@ -312,9 +312,9 @@ name: 'joid-k8-ovn-lb-noha-baremetal-master-trigger' triggers: - timed: '5 17 * * *' -# os-nosdn-openbaton-ha trigger - branch: euphrates +# os-nosdn-openbaton-ha trigger - branch: fraser - trigger: - name: 'joid-os-nosdn-openbaton-ha-baremetal-euphrates-trigger' + name: 'joid-os-nosdn-openbaton-ha-baremetal-fraser-trigger' triggers: - timed: '5 23 * * *' # os-nosdn-openbaton-ha trigger - branch: master @@ -322,9 +322,9 @@ name: 'joid-os-nosdn-openbaton-ha-baremetal-master-trigger' triggers: - timed: '5 23 * * *' -# os-ocl-nofeature-ha trigger - branch: euphrates +# os-ocl-nofeature-ha trigger - branch: fraser - trigger: - name: 'joid-os-ocl-nofeature-ha-baremetal-euphrates-trigger' + name: 'joid-os-ocl-nofeature-ha-baremetal-fraser-trigger' triggers: - timed: '5 13 * * *' # os-ocl-nofeature-ha trigger - branch: master @@ -332,9 +332,9 @@ name: 'joid-os-ocl-nofeature-ha-baremetal-master-trigger' triggers: - timed: '5 13 * * *' -# os-ocl-nofeature-noha trigger - branch: euphrates +# os-ocl-nofeature-noha trigger - branch: fraser - trigger: - name: 'joid-os-ocl-nofeature-noha-baremetal-euphrates-trigger' + name: 'joid-os-ocl-nofeature-noha-baremetal-fraser-trigger' triggers: - timed: '5 16 * * *' # os-ocl-nofeature-noha trigger - branch: master @@ -342,9 +342,9 @@ name: 'joid-os-ocl-nofeature-noha-baremetal-master-trigger' triggers: - timed: '5 16 * * *' -# k8-canal-lb-noha trigger - branch: euphrates +# k8-canal-lb-noha trigger - branch: fraser - trigger: - name: 'joid-k8-canal-lb-noha-baremetal-euphrates-trigger' + name: 'joid-k8-canal-lb-noha-baremetal-fraser-trigger' triggers: - timed: '5 14 * * *' # k8-canal-lb-noha trigger - branch: master @@ -352,9 +352,9 @@ name: 'joid-k8-canal-lb-noha-baremetal-master-trigger' triggers: - timed: '5 14 * * *' -# k8-multus-lb-noha trigger - branch: euphrates +# k8-multus-lb-noha trigger - branch: fraser - trigger: - name: 'joid-k8-multus-lb-noha-baremetal-euphrates-trigger' + name: 'joid-k8-multus-lb-noha-baremetal-fraser-trigger' triggers: - timed: '5 18 * * *' # k8-multus-lb-noha trigger - branch: master @@ -362,9 +362,9 @@ name: 'joid-k8-multus-lb-noha-baremetal-master-trigger' triggers: - timed: '5 18 * * *' -# k8-nosdn-lb_ceph-noha trigger - branch: euphrates +# k8-nosdn-lb_ceph-noha trigger - branch: fraser - trigger: - name: 'joid-k8-nosdn-lb_ceph-noha-baremetal-euphrates-trigger' + name: 'joid-k8-nosdn-lb_ceph-noha-baremetal-fraser-trigger' triggers: - timed: '5 18 * * *' # k8-nosdn-lb_ceph-noha trigger - branch: master @@ -372,9 +372,9 @@ name: 'joid-k8-nosdn-lb_ceph-noha-baremetal-master-trigger' triggers: - timed: '5 18 * * *' -# os-ovn-nofeature-ha trigger - branch: euphrates +# os-ovn-nofeature-ha trigger - branch: fraser - trigger: - name: 'joid-os-ovn-nofeature-ha-baremetal-euphrates-trigger' + name: 'joid-os-ovn-nofeature-ha-baremetal-fraser-trigger' triggers: - timed: '5 19 * * *' # os-ovn-nofeature-ha trigger - branch: master diff --git a/jjb/joid/joid-verify-jobs.yml b/jjb/joid/joid-verify-jobs.yml index 53bc3f38a..2d1c7c9f3 100644 --- a/jjb/joid/joid-verify-jobs.yml +++ b/jjb/joid/joid-verify-jobs.yml @@ -13,7 +13,7 @@ branch: '{stream}' gs-pathname: '' disabled: false - - euphrates: + - fraser: &fraser branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false diff --git a/jjb/qtip/qtip-validate-jobs.yml b/jjb/qtip/qtip-validate-jobs.yml index c5bf58391..b0822cf47 100644 --- a/jjb/qtip/qtip-validate-jobs.yml +++ b/jjb/qtip/qtip-validate-jobs.yml @@ -94,7 +94,7 @@ wrappers: - timeout: - timeout: 30 + timeout: 120 abort: true - timestamps diff --git a/jjb/releng/opnfv-lint.yml b/jjb/releng/opnfv-lint.yml index 0ac552082..80893de89 100644 --- a/jjb/releng/opnfv-lint.yml +++ b/jjb/releng/opnfv-lint.yml @@ -11,12 +11,17 @@ jobs: - 'opnfv-lint-verify-{stream}' - 'opnfv-yamllint-verify-{stream}' + - 'opnfv-pylint-verify-{stream}' stream: - master: branch: '{stream}' gs-pathname: '' disabled: false + - fraser: + branch: 'stable/{stream}' + gs-pathname: '/{stream}' + disabled: false - danube: branch: 'stable/{stream}' gs-pathname: '/{stream}' diff --git a/jjb/releng/releng-release-create-branch.sh b/jjb/releng/releng-release-create-branch.sh index 83755608e..92be0e637 100644 --- a/jjb/releng/releng-release-create-branch.sh +++ b/jjb/releng/releng-release-create-branch.sh @@ -31,7 +31,7 @@ for release_file in $RELEASE_FILES; do NEW_FILES=$(git status --porcelain --untracked=no | cut -c4-) if [ -n "$NEW_FILES" ]; then git add $NEW_FILES - git commit -m "Create Stable Branch Jobs for $(basename $release_file .yaml)" + git commit -sm "Create Stable Branch Jobs for $(basename $release_file .yaml)" git push origin HEAD:refs/for/master fi done |