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 | ||||
| -rwxr-xr-x | jjb/dovetail/dovetail-run.sh | 10 |
3 files changed, 10 insertions, 10 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/dovetail/dovetail-run.sh b/jjb/dovetail/dovetail-run.sh index 1fee4ae53..2797ec5ff 100755 --- a/jjb/dovetail/dovetail-run.sh +++ b/jjb/dovetail/dovetail-run.sh @@ -207,15 +207,15 @@ if [ -f ${DOVETAIL_CONFIG}/pod.yaml ]; then if [ "$INSTALLER_TYPE" == "apex" ]; then cat << EOF >> ${DOVETAIL_CONFIG}/pod.yaml process_info: -- {testcase_name: dovetail.ha.rabbitmq, attack_process: rabbitmq_server} +- {testcase_name: yardstick.ha.rabbitmq, attack_process: rabbitmq_server} EOF elif [ "$INSTALLER_TYPE" == "fuel" ]; then cat << EOF >> ${DOVETAIL_CONFIG}/pod.yaml process_info: -- {testcase_name: dovetail.ha.cinder_api, attack_process: cinder-wsgi} -- {testcase_name: dovetail.ha.rabbitmq, attack_process: rabbitmq-server, attack_host: msg01} -- {testcase_name: dovetail.ha.neutron_l3_agent, attack_process: neutron-l3-agent, attack_host: cmp01} -- {testcase_name: dovetail.ha.database, attack_process: mysqld, attack_host: dbs01} +- {testcase_name: yardstick.ha.cinder_api, attack_process: cinder-wsgi} +- {testcase_name: yardstick.ha.rabbitmq, attack_process: rabbitmq_server, attack_host: msg01} +- {testcase_name: yardstick.ha.neutron_l3_agent, attack_process: neutron-l3-agent, attack_host: cmp01} +- {testcase_name: yardstick.ha.database, attack_process: mysqld, attack_host: dbs01} EOF fi |