diff options
Diffstat (limited to 'jjb')
-rw-r--r-- | jjb/armband/armband-ci-jobs.yaml | 8 | ||||
-rwxr-xr-x | jjb/cperf/cperf-robot-netvirt-csit.sh | 2 | ||||
-rw-r--r-- | jjb/doctor/doctor.yaml | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/jjb/armband/armband-ci-jobs.yaml b/jjb/armband/armband-ci-jobs.yaml index f80311585..ad96cf38e 100644 --- a/jjb/armband/armband-ci-jobs.yaml +++ b/jjb/armband/armband-ci-jobs.yaml @@ -284,7 +284,7 @@ - trigger: name: 'fuel-os-nosdn-nofeature-ha-armband-baremetal-master-trigger' triggers: - - timed: '0 1 * * 1' + - timed: '10 1 * * 2,4,6,7' - trigger: name: 'fuel-os-nosdn-nofeature-noha-armband-baremetal-master-trigger' triggers: @@ -292,15 +292,15 @@ - trigger: name: 'fuel-os-odl-nofeature-ha-armband-baremetal-master-trigger' triggers: - - timed: '0 1 * * 3,7' + - timed: '0 1 * * 2,4,6,7' - trigger: name: 'fuel-os-ovn-nofeature-ha-armband-baremetal-master-trigger' triggers: - - timed: '' + - timed: '10 1 * * 1,3,5' - trigger: name: 'fuel-os-nosdn-ovs-ha-armband-baremetal-master-trigger' triggers: - - timed: '0 1 * * 4' + - timed: '0 1 * * 1,3,5' # --------------------------------------------------------------------- # Enea Armband CI Baremetal Triggers running against fraser branch # --------------------------------------------------------------------- diff --git a/jjb/cperf/cperf-robot-netvirt-csit.sh b/jjb/cperf/cperf-robot-netvirt-csit.sh index 71508b005..c30ff4e02 100755 --- a/jjb/cperf/cperf-robot-netvirt-csit.sh +++ b/jjb/cperf/cperf-robot-netvirt-csit.sh @@ -93,8 +93,8 @@ robot_cmd="pybot \ -v ODL_STREAM:$ODL_STREAM \ -v ODL_SYSTEM_IP:$CONTROLLER_1_IP \ -v OS_CONTROL_NODE_IP:$CONTROLLER_1_IP \ - -v OS_DEPLOY="0cmb-1ctl-2cmp" \ -v OPENSTACK_BRANCH:$FULL_OS_VER \ + -v OPENSTACK_TOPO="0cmb-1ctl-2cmp" \ -v OS_USER:heat-admin \ -v ODL_ENABLE_L3_FWD:yes \ -v ODL_SYSTEM_USER:heat-admin \ diff --git a/jjb/doctor/doctor.yaml b/jjb/doctor/doctor.yaml index e91911194..dae280e7d 100644 --- a/jjb/doctor/doctor.yaml +++ b/jjb/doctor/doctor.yaml @@ -186,7 +186,6 @@ name: 'doctor-verify-installer-inspector-builders-macro' builders: # yamllint disable rule:indentation - - 'clean-workspace-log' - shell: !include-raw: - ./doctor-env-presetup.sh @@ -203,6 +202,7 @@ # As Jenkins user, it has no permission to send ICMP package sudo -E tox -e py34 + # ------------------------------- # publisher macros # ------------------------------- @@ -212,7 +212,7 @@ - archive: artifacts: 'doctor_tests/*.log' - email-jenkins-admins-on-failure - + - workspace-cleanup ##################################### # trigger macros |