From d0381ed7e68a6de7c9ff1e4220698ed8eab28ac6 Mon Sep 17 00:00:00 2001 From: Yuri Weinstein Date: Wed, 29 Mar 2023 14:32:38 -0700 Subject: [PATCH] qa/upgrade: consistently use the tip of the branch as the start version Also corrected line to use image: quay.ceph.io/ceph-ci/ceph:* In order to make sure that latest versions of ceph is used as initial install Fixes: https://tracker.ceph.com/issues/58914 Signed-off-by: Yuri Weinstein --- qa/suites/upgrade/pacific-x/parallel/1-tasks.yaml | 2 +- qa/suites/upgrade/pacific-x/stress-split/1-start.yaml | 2 +- .../pacific-x/stress-split/2-first-half-tasks/rbd-cls.yaml | 2 +- .../stress-split/2-first-half-tasks/rbd-import-export.yaml | 2 +- .../pacific-x/stress-split/2-first-half-tasks/rbd_api.yaml | 2 +- .../upgrade/pacific-x/stress-split/3-stress-tasks/rbd-cls.yaml | 2 +- .../stress-split/3-stress-tasks/rbd-import-export.yaml | 2 +- .../upgrade/pacific-x/stress-split/3-stress-tasks/rbd_api.yaml | 2 +- .../stress-split/4-second-half-tasks/rbd-import-export.yaml | 2 +- qa/suites/upgrade/quincy-x/parallel/1-tasks.yaml | 2 +- qa/suites/upgrade/quincy-x/stress-split/1-start.yaml | 2 +- .../quincy-x/stress-split/2-first-half-tasks/rbd-cls.yaml | 2 +- .../stress-split/2-first-half-tasks/rbd-import-export.yaml | 2 +- .../quincy-x/stress-split/2-first-half-tasks/rbd_api.yaml | 2 +- .../upgrade/quincy-x/stress-split/3-stress-tasks/rbd-cls.yaml | 2 +- .../quincy-x/stress-split/3-stress-tasks/rbd-import-export.yaml | 2 +- .../upgrade/quincy-x/stress-split/3-stress-tasks/rbd_api.yaml | 2 +- .../stress-split/4-second-half-tasks/rbd-import-export.yaml | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/qa/suites/upgrade/pacific-x/parallel/1-tasks.yaml b/qa/suites/upgrade/pacific-x/parallel/1-tasks.yaml index ab406111429..064d0758d19 100644 --- a/qa/suites/upgrade/pacific-x/parallel/1-tasks.yaml +++ b/qa/suites/upgrade/pacific-x/parallel/1-tasks.yaml @@ -6,7 +6,7 @@ tasks: - print: "**** done install task..." - print: "**** done start installing pacific cephadm ..." - cephadm: - image: quay.io/ceph/daemon-base:latest-pacific + image: quay.ceph.io/ceph-ci/ceph:pacific cephadm_branch: pacific cephadm_git_url: https://github.com/ceph/ceph conf: diff --git a/qa/suites/upgrade/pacific-x/stress-split/1-start.yaml b/qa/suites/upgrade/pacific-x/stress-split/1-start.yaml index b0fd44af46e..9a552df9991 100644 --- a/qa/suites/upgrade/pacific-x/stress-split/1-start.yaml +++ b/qa/suites/upgrade/pacific-x/stress-split/1-start.yaml @@ -5,7 +5,7 @@ tasks: - ceph-volume - cephadm: - image: quay.io/ceph/daemon-base:latest-pacific + image: quay.ceph.io/ceph-ci/ceph:pacific cephadm_branch: pacific cephadm_git_url: https://github.com/ceph/ceph conf: diff --git a/qa/suites/upgrade/pacific-x/stress-split/2-first-half-tasks/rbd-cls.yaml b/qa/suites/upgrade/pacific-x/stress-split/2-first-half-tasks/rbd-cls.yaml index ffe09dc7410..4ebc0931045 100644 --- a/qa/suites/upgrade/pacific-x/stress-split/2-first-half-tasks/rbd-cls.yaml +++ b/qa/suites/upgrade/pacific-x/stress-split/2-first-half-tasks/rbd-cls.yaml @@ -3,7 +3,7 @@ meta: run basic cls tests for rbd first-half-tasks: - workunit: - branch: octopus + branch: pacific clients: client.0: - cls/test_cls_rbd.sh diff --git a/qa/suites/upgrade/pacific-x/stress-split/2-first-half-tasks/rbd-import-export.yaml b/qa/suites/upgrade/pacific-x/stress-split/2-first-half-tasks/rbd-import-export.yaml index 992f31bd782..6835c9125fe 100644 --- a/qa/suites/upgrade/pacific-x/stress-split/2-first-half-tasks/rbd-import-export.yaml +++ b/qa/suites/upgrade/pacific-x/stress-split/2-first-half-tasks/rbd-import-export.yaml @@ -3,7 +3,7 @@ meta: run basic import/export cli tests for rbd first-half-tasks: - workunit: - branch: octopus + branch: pacific clients: client.0: - rbd/import_export.sh diff --git a/qa/suites/upgrade/pacific-x/stress-split/2-first-half-tasks/rbd_api.yaml b/qa/suites/upgrade/pacific-x/stress-split/2-first-half-tasks/rbd_api.yaml index e4c1d54e8d0..400cc5f7de5 100644 --- a/qa/suites/upgrade/pacific-x/stress-split/2-first-half-tasks/rbd_api.yaml +++ b/qa/suites/upgrade/pacific-x/stress-split/2-first-half-tasks/rbd_api.yaml @@ -3,7 +3,7 @@ meta: librbd C and C++ api tests first-half-tasks: - workunit: - branch: octopus + branch: pacific clients: client.0: - rbd/test_librbd.sh diff --git a/qa/suites/upgrade/pacific-x/stress-split/3-stress-tasks/rbd-cls.yaml b/qa/suites/upgrade/pacific-x/stress-split/3-stress-tasks/rbd-cls.yaml index 07ab6e10ec9..e72875c14e0 100644 --- a/qa/suites/upgrade/pacific-x/stress-split/3-stress-tasks/rbd-cls.yaml +++ b/qa/suites/upgrade/pacific-x/stress-split/3-stress-tasks/rbd-cls.yaml @@ -3,7 +3,7 @@ meta: run basic cls tests for rbd stress-tasks: - workunit: - branch: octopus + branch: pacific clients: client.0: - cls/test_cls_rbd.sh diff --git a/qa/suites/upgrade/pacific-x/stress-split/3-stress-tasks/rbd-import-export.yaml b/qa/suites/upgrade/pacific-x/stress-split/3-stress-tasks/rbd-import-export.yaml index a3968fef3f3..c3008f3b10b 100644 --- a/qa/suites/upgrade/pacific-x/stress-split/3-stress-tasks/rbd-import-export.yaml +++ b/qa/suites/upgrade/pacific-x/stress-split/3-stress-tasks/rbd-import-export.yaml @@ -3,7 +3,7 @@ meta: run basic import/export cli tests for rbd stress-tasks: - workunit: - branch: octopus + branch: pacific clients: client.0: - rbd/import_export.sh diff --git a/qa/suites/upgrade/pacific-x/stress-split/3-stress-tasks/rbd_api.yaml b/qa/suites/upgrade/pacific-x/stress-split/3-stress-tasks/rbd_api.yaml index 7212d3fc6c4..a3f5c9e39c3 100644 --- a/qa/suites/upgrade/pacific-x/stress-split/3-stress-tasks/rbd_api.yaml +++ b/qa/suites/upgrade/pacific-x/stress-split/3-stress-tasks/rbd_api.yaml @@ -3,7 +3,7 @@ meta: librbd C and C++ api tests stress-tasks: - workunit: - branch: octopus + branch: pacific clients: client.0: - rbd/test_librbd.sh diff --git a/qa/suites/upgrade/pacific-x/stress-split/4-second-half-tasks/rbd-import-export.yaml b/qa/suites/upgrade/pacific-x/stress-split/4-second-half-tasks/rbd-import-export.yaml index f223bda4678..00cf88d54f1 100644 --- a/qa/suites/upgrade/pacific-x/stress-split/4-second-half-tasks/rbd-import-export.yaml +++ b/qa/suites/upgrade/pacific-x/stress-split/4-second-half-tasks/rbd-import-export.yaml @@ -3,7 +3,7 @@ meta: run basic import/export cli tests for rbd second-half-tasks: - workunit: - branch: octopus + branch: pacific clients: client.0: - rbd/import_export.sh diff --git a/qa/suites/upgrade/quincy-x/parallel/1-tasks.yaml b/qa/suites/upgrade/quincy-x/parallel/1-tasks.yaml index d876c510df5..e57e31f2fbe 100644 --- a/qa/suites/upgrade/quincy-x/parallel/1-tasks.yaml +++ b/qa/suites/upgrade/quincy-x/parallel/1-tasks.yaml @@ -6,7 +6,7 @@ tasks: - print: "**** done install task..." - print: "**** done start installing quincy cephadm ..." - cephadm: - image: quay.io/ceph/daemon-base:latest-quincy + image: quay.ceph.io/ceph-ci/ceph:quincy cephadm_branch: quincy cephadm_git_url: https://github.com/ceph/ceph conf: diff --git a/qa/suites/upgrade/quincy-x/stress-split/1-start.yaml b/qa/suites/upgrade/quincy-x/stress-split/1-start.yaml index 4b620948076..b9bca65fb6f 100644 --- a/qa/suites/upgrade/quincy-x/stress-split/1-start.yaml +++ b/qa/suites/upgrade/quincy-x/stress-split/1-start.yaml @@ -5,7 +5,7 @@ tasks: - ceph-volume - cephadm: - image: quay.io/ceph/daemon-base:latest-quincy + image: quay.ceph.io/ceph-ci/ceph:quincy cephadm_branch: quincy cephadm_git_url: https://github.com/ceph/ceph conf: diff --git a/qa/suites/upgrade/quincy-x/stress-split/2-first-half-tasks/rbd-cls.yaml b/qa/suites/upgrade/quincy-x/stress-split/2-first-half-tasks/rbd-cls.yaml index ffe09dc7410..b722f187361 100644 --- a/qa/suites/upgrade/quincy-x/stress-split/2-first-half-tasks/rbd-cls.yaml +++ b/qa/suites/upgrade/quincy-x/stress-split/2-first-half-tasks/rbd-cls.yaml @@ -3,7 +3,7 @@ meta: run basic cls tests for rbd first-half-tasks: - workunit: - branch: octopus + branch: quincy clients: client.0: - cls/test_cls_rbd.sh diff --git a/qa/suites/upgrade/quincy-x/stress-split/2-first-half-tasks/rbd-import-export.yaml b/qa/suites/upgrade/quincy-x/stress-split/2-first-half-tasks/rbd-import-export.yaml index 992f31bd782..2063890559e 100644 --- a/qa/suites/upgrade/quincy-x/stress-split/2-first-half-tasks/rbd-import-export.yaml +++ b/qa/suites/upgrade/quincy-x/stress-split/2-first-half-tasks/rbd-import-export.yaml @@ -3,7 +3,7 @@ meta: run basic import/export cli tests for rbd first-half-tasks: - workunit: - branch: octopus + branch: quincy clients: client.0: - rbd/import_export.sh diff --git a/qa/suites/upgrade/quincy-x/stress-split/2-first-half-tasks/rbd_api.yaml b/qa/suites/upgrade/quincy-x/stress-split/2-first-half-tasks/rbd_api.yaml index e4c1d54e8d0..87b89ec197b 100644 --- a/qa/suites/upgrade/quincy-x/stress-split/2-first-half-tasks/rbd_api.yaml +++ b/qa/suites/upgrade/quincy-x/stress-split/2-first-half-tasks/rbd_api.yaml @@ -3,7 +3,7 @@ meta: librbd C and C++ api tests first-half-tasks: - workunit: - branch: octopus + branch: quincy clients: client.0: - rbd/test_librbd.sh diff --git a/qa/suites/upgrade/quincy-x/stress-split/3-stress-tasks/rbd-cls.yaml b/qa/suites/upgrade/quincy-x/stress-split/3-stress-tasks/rbd-cls.yaml index 07ab6e10ec9..649b024a476 100644 --- a/qa/suites/upgrade/quincy-x/stress-split/3-stress-tasks/rbd-cls.yaml +++ b/qa/suites/upgrade/quincy-x/stress-split/3-stress-tasks/rbd-cls.yaml @@ -3,7 +3,7 @@ meta: run basic cls tests for rbd stress-tasks: - workunit: - branch: octopus + branch: quincy clients: client.0: - cls/test_cls_rbd.sh diff --git a/qa/suites/upgrade/quincy-x/stress-split/3-stress-tasks/rbd-import-export.yaml b/qa/suites/upgrade/quincy-x/stress-split/3-stress-tasks/rbd-import-export.yaml index a3968fef3f3..2267e4462f5 100644 --- a/qa/suites/upgrade/quincy-x/stress-split/3-stress-tasks/rbd-import-export.yaml +++ b/qa/suites/upgrade/quincy-x/stress-split/3-stress-tasks/rbd-import-export.yaml @@ -3,7 +3,7 @@ meta: run basic import/export cli tests for rbd stress-tasks: - workunit: - branch: octopus + branch: quincy clients: client.0: - rbd/import_export.sh diff --git a/qa/suites/upgrade/quincy-x/stress-split/3-stress-tasks/rbd_api.yaml b/qa/suites/upgrade/quincy-x/stress-split/3-stress-tasks/rbd_api.yaml index 7212d3fc6c4..1d4714ab4a0 100644 --- a/qa/suites/upgrade/quincy-x/stress-split/3-stress-tasks/rbd_api.yaml +++ b/qa/suites/upgrade/quincy-x/stress-split/3-stress-tasks/rbd_api.yaml @@ -3,7 +3,7 @@ meta: librbd C and C++ api tests stress-tasks: - workunit: - branch: octopus + branch: quincy clients: client.0: - rbd/test_librbd.sh diff --git a/qa/suites/upgrade/quincy-x/stress-split/4-second-half-tasks/rbd-import-export.yaml b/qa/suites/upgrade/quincy-x/stress-split/4-second-half-tasks/rbd-import-export.yaml index f223bda4678..1c509f755f8 100644 --- a/qa/suites/upgrade/quincy-x/stress-split/4-second-half-tasks/rbd-import-export.yaml +++ b/qa/suites/upgrade/quincy-x/stress-split/4-second-half-tasks/rbd-import-export.yaml @@ -3,7 +3,7 @@ meta: run basic import/export cli tests for rbd second-half-tasks: - workunit: - branch: octopus + branch: quincy clients: client.0: - rbd/import_export.sh -- 2.39.5