From 2a01e68a68183b9f7b03c8ca06c56166f1449b74 Mon Sep 17 00:00:00 2001 From: Yuri Weinstein Date: Fri, 18 May 2018 16:01:29 -0700 Subject: [PATCH] qa/tests - reverted clients upgrades for luminous runs removed ~/rhel_only_on_ovh.yaml to be able to run on ovh forced runs on smithi only Signed-off-by: Yuri Weinstein --- qa/crontab/teuthology-cronjobs | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/qa/crontab/teuthology-cronjobs b/qa/crontab/teuthology-cronjobs index f3ed5f9720db0..c675ac7d501b8 100644 --- a/qa/crontab/teuthology-cronjobs +++ b/qa/crontab/teuthology-cronjobs @@ -133,10 +133,10 @@ CEPH_QA_EMAIL="ceph-qa@ceph.com" ## upgrades suites for on luminous ## !!!! three suites below MUST use --suite-branch hammer, kraken OR jewel ## --filter "ubuntu_14.04,ubuntu_16.04,centos_7.4" == test only supported distro -DISTRO_LUMINOUS="ubuntu_14.04,ubuntu_16.04,centos_7.4" -45 05 * * * CEPH_BRANCH=luminous; MACHINE_NAME=ovh; /home/teuthology/bin/cron_wrapper teuthology-suite -v -c $CEPH_BRANCH -n 7 -m $MACHINE_NAME -s upgrade/client-upgrade-hammer -k distro -e $CEPH_QA_EMAIL --suite-branch hammer $DISTRO_LUMINOUS -47 05 * * * CEPH_BRANCH=luminous; MACHINE_NAME=ovh; /home/teuthology/bin/cron_wrapper teuthology-suite -v -c $CEPH_BRANCH -n 7 -m $MACHINE_NAME -s upgrade/client-upgrade-jewel -k distro -e $CEPH_QA_EMAIL --suite-branch jewel $DISTRO_LUMINOUS -50 05 * * * CEPH_BRANCH=luminous; MACHINE_NAME=ovh; /home/teuthology/bin/cron_wrapper teuthology-suite -v -c $CEPH_BRANCH -n 7 -m $MACHINE_NAME -s upgrade/client-upgrade-kraken -k distro -e $CEPH_QA_EMAIL --suite-branch kraken $DISTRO_LUMINOUS +45 05 * * * CEPH_BRANCH=luminous; MACHINE_NAME=ovh; /home/teuthology/bin/cron_wrapper teuthology-suite -v -c $CEPH_BRANCH -n 7 -m $MACHINE_NAME -s upgrade/client-upgrade-hammer -k distro -e $CEPH_QA_EMAIL --suite-branch hammer +47 05 * * * CEPH_BRANCH=luminous; MACHINE_NAME=ovh; /home/teuthology/bin/cron_wrapper teuthology-suite -v -c $CEPH_BRANCH -n 7 -m $MACHINE_NAME -s upgrade/client-upgrade-jewel -k distro -e $CEPH_QA_EMAIL --suite-branch jewel --filter "ubuntu_14.04,ubuntu_16.04,centos_7.4" +50 05 * * * CEPH_BRANCH=luminous; MACHINE_NAME=ovh; /home/teuthology/bin/cron_wrapper teuthology-suite -v -c $CEPH_BRANCH -n 7 -m $MACHINE_NAME -s upgrade/client-upgrade-kraken -k distro -e $CEPH_QA_EMAIL --suite-branch kraken + ########################## @@ -189,9 +189,10 @@ DISTRO_LUMINOUS="ubuntu_14.04,ubuntu_16.04,centos_7.4" ## upgrades suites for on mimic ## !!!! three suites below MUST use --suite-branch hammer, krakel, jewel, luminous (see https://tracker.ceph.com/issues/24021) ## --filter "ubuntu_16.04,ubuntu_18.04,centos_7.4,rhel_7.5" - test ONLY supported distro +## to run on ovh use ~/rhel_only_on_ovh.yaml, we will run on smithi nodes DISTRO_MIMIC="ubuntu_16.04,ubuntu_18.04,centos_7.4,rhel_7.5" -47 01 * * * CEPH_BRANCH=mimic; MACHINE_NAME=ovh; /home/teuthology/bin/cron_wrapper teuthology-suite -v -c $CEPH_BRANCH -n 7 -m $MACHINE_NAME -s upgrade/client-upgrade-jewel -k distro -e $CEPH_QA_EMAIL --suite-branch jewel $DISTRO_MIMIC -50 01 * * * CEPH_BRANCH=mimic; MACHINE_NAME=ovh; /home/teuthology/bin/cron_wrapper teuthology-suite -v -c $CEPH_BRANCH -n 7 -m $MACHINE_NAME -s upgrade/client-upgrade-luminous -k distro -e $CEPH_QA_EMAIL --suite-branch luminous $DISTRO_MIMIC +47 01 * * * CEPH_BRANCH=mimic; MACHINE_NAME=smithi; /home/teuthology/bin/cron_wrapper teuthology-suite -v -c $CEPH_BRANCH -n 7 -m $MACHINE_NAME -s upgrade/client-upgrade-jewel -k distro -e $CEPH_QA_EMAIL --suite-branch jewel --filter $DISTRO_MIMIC +50 01 * * * CEPH_BRANCH=mimic; MACHINE_NAME=smithi; /home/teuthology/bin/cron_wrapper teuthology-suite -v -c $CEPH_BRANCH -n 7 -m $MACHINE_NAME -s upgrade/client-upgrade-luminous -k distro -e $CEPH_QA_EMAIL --suite-branch luminous --filter $DISTRO_MIMIC #********** mimic branch END -- 2.39.5