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 <yweinste@redhat.com>

diff --git a/qa/suites/upgrade/pacific-x/parallel/1-tasks.yaml b/qa/suites/upgrade/pacific-x/parallel/1-tasks.yaml
index ab406111429e2c0c9e2796ec09f4470a607148aa..064d0758d193409cd11499cb4efbea6786e6884a 100644 (file)
--- 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 b0fd44af46e3e37ad639fd8ca6039cb97c16f176..9a552df9991fd652100c1b68cd1fb71417490da1 100644 (file)
--- 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 ffe09dc74102b068b020e743e5f51f23194cddc7..4ebc0931045e8809a450623f543ed901a1f4e051 100644 (file)
--- 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 992f31bd782b123b32e49077cdfa6b4177b80c47..6835c9125fe782b7cf4a769e85aa15c4a4cf71a2 100644 (file)
--- 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 e4c1d54e8d06e35bc44695631c75f28202ebbb52..400cc5f7de58eb7c0f103fef6dc36cd9e027a4e7 100644 (file)
--- 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 07ab6e10ec9701e8f8232d7eaac8c45a1ded312d..e72875c14e0638bbfc925e41467594796f9cdf94 100644 (file)
--- 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 a3968fef3f38eec8e0c6ea2dca8ea1d0f32a2f00..c3008f3b10b08d3b229cbde46230cb3d1026b33a 100644 (file)
--- 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 7212d3fc6c4484301e9ec1ed31f3a3f9274e210f..a3f5c9e39c37a078deae65b178411ad4fe3b7c4d 100644 (file)
--- 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 f223bda46787ad8f802d41b8bfadb20df9cf2070..00cf88d54f16f11ea3e2ab1d7c3c467766a36ba7 100644 (file)
--- 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 d876c510df5bdf1a5fb49a080258378612d03d80..e57e31f2fbe4289448da8915cbf5eb87f794c5f8 100644 (file)
--- 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 4b620948076976f8c7e9c47a92f70037ce4d42c9..b9bca65fb6f850e72db61533f0e792dbe16d4e71 100644 (file)
--- 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 ffe09dc74102b068b020e743e5f51f23194cddc7..b722f18736183dede9c7c2cd3f61bfb1cf5dcb16 100644 (file)
--- 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 992f31bd782b123b32e49077cdfa6b4177b80c47..2063890559e3e968f8fef21aff665e3fc8cce8d2 100644 (file)
--- 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 e4c1d54e8d06e35bc44695631c75f28202ebbb52..87b89ec197bd4f055cda18ba9846733acc333bd5 100644 (file)
--- 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 07ab6e10ec9701e8f8232d7eaac8c45a1ded312d..649b024a476e53feae524fb095b085fbd7a377de 100644 (file)
--- 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 a3968fef3f38eec8e0c6ea2dca8ea1d0f32a2f00..2267e4462f50a62a33937078a768f6cee0863190 100644 (file)
--- 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 7212d3fc6c4484301e9ec1ed31f3a3f9274e210f..1d4714ab4a0c9999550cea861df7f04b005c77d8 100644 (file)
--- 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 f223bda46787ad8f802d41b8bfadb20df9cf2070..1c509f755f876cc689efcb530ed9d28b409f5f82 100644 (file)
--- 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