From: Yuri Weinstein Date: Wed, 29 Mar 2023 15:06:38 +0000 (-0700) Subject: qa/upgrade: consistently use the tip of the branch as the start version X-Git-Tag: v17.2.7~504^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F50747%2Fhead;p=ceph.git qa/upgrade: consistently use the tip of the branch as the start version Replaced also `image: docker.io/ceph/daemon-base:latest-*` with `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 --- diff --git a/qa/suites/upgrade/octopus-x/parallel/1-tasks.yaml b/qa/suites/upgrade/octopus-x/parallel/1-tasks.yaml index 0be7a0b7b0c0..47731267dcb2 100644 --- a/qa/suites/upgrade/octopus-x/parallel/1-tasks.yaml +++ b/qa/suites/upgrade/octopus-x/parallel/1-tasks.yaml @@ -6,7 +6,7 @@ tasks: - print: "**** done install task..." - print: "**** done start installing octopus cephadm ..." - cephadm: - image: docker.io/ceph/daemon-base:latest-octopus + image: quay.ceph.io/ceph-ci/ceph:octopus cephadm_branch: octopus cephadm_git_url: https://github.com/ceph/ceph conf: diff --git a/qa/suites/upgrade/octopus-x/stress-split/1-start.yaml b/qa/suites/upgrade/octopus-x/stress-split/1-start.yaml index 211a369f3520..c896fbfcf198 100644 --- a/qa/suites/upgrade/octopus-x/stress-split/1-start.yaml +++ b/qa/suites/upgrade/octopus-x/stress-split/1-start.yaml @@ -5,7 +5,7 @@ tasks: - ceph-volume - cephadm: - image: docker.io/ceph/daemon-base:latest-octopus + image: quay.ceph.io/ceph-ci/ceph:octopus cephadm_branch: octopus cephadm_git_url: https://github.com/ceph/ceph conf: diff --git a/qa/suites/upgrade/pacific-x/parallel/1-tasks.yaml b/qa/suites/upgrade/pacific-x/parallel/1-tasks.yaml index 61403f33e415..b06c51fad57e 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: docker.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 3daf723a3576..9a552df9991f 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: docker.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 ffe09dc74102..4ebc0931045e 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 992f31bd782b..6835c9125fe7 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 e4c1d54e8d06..400cc5f7de58 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 07ab6e10ec97..e72875c14e06 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 a3968fef3f38..c3008f3b10b0 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 7212d3fc6c44..a3f5c9e39c37 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 f223bda46787..00cf88d54f16 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