From: Adam King <adking@redhat.com>
Date: Tue, 27 Aug 2024 13:29:14 +0000 (-0400)
Subject: qa/upgrade: change pacific/octopus upgrade tests to use published image
X-Git-Tag: v17.2.8~12^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=398572ec1e605a809ddc75d99ffc5e261f04cb8b;p=ceph.git

qa/upgrade: change pacific/octopus upgrade tests to use published image

Since we no longer build octopus or pacific, we can't use
the ci build for these tests any more

Signed-off-by: Adam King <adking@redhat.com>
---

diff --git a/qa/suites/upgrade/octopus-x/parallel/1-tasks.yaml b/qa/suites/upgrade/octopus-x/parallel/1-tasks.yaml
index 47731267dcb..ffc413ebab4 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: quay.ceph.io/ceph-ci/ceph:octopus
+    image: quay.io/ceph/ceph:v15.2
     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 c896fbfcf19..e41c2123ccb 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: quay.ceph.io/ceph-ci/ceph:octopus
+    image: quay.io/ceph/ceph:v15.2
     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 8d27ad451e8..310d4fa1733 100644
--- a/qa/suites/upgrade/pacific-x/parallel/1-tasks.yaml
+++ b/qa/suites/upgrade/pacific-x/parallel/1-tasks.yaml
@@ -13,7 +13,7 @@ tasks:
 - print: "**** done install task..."
 - print: "**** done start installing pacific cephadm ..."
 - cephadm:
-    image: quay.ceph.io/ceph-ci/ceph:pacific
+    image: quay.io/ceph/ceph:v16.2
     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 9a552df9991..6d675f41d32 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.ceph.io/ceph-ci/ceph:pacific
+    image: quay.io/ceph/ceph:v16.2
     cephadm_branch: pacific
     cephadm_git_url: https://github.com/ceph/ceph
     conf: