From ae2e93f5f12fcceb340ae740b46b5ba0edabc873 Mon Sep 17 00:00:00 2001 From: David Galloway Date: Wed, 18 May 2022 14:22:52 -0400 Subject: [PATCH] qa: Pull from quay.io not docker.io We are pushing to quay.io now due to docker.io rate limiting. Signed-off-by: David Galloway --- .../fs/upgrade/mds_upgrade_sequence/tasks/0-from/pacific.yaml | 2 +- .../fs/upgrade/mds_upgrade_sequence/tasks/0-from/v16.2.4.yaml | 2 +- qa/suites/orch/cephadm/mgr-nfs-upgrade/1-bootstrap/16.2.4.yaml | 2 +- qa/suites/orch/cephadm/mgr-nfs-upgrade/1-bootstrap/16.2.5.yaml | 2 +- qa/suites/orch/cephadm/mgr-nfs-upgrade/1-bootstrap/octopus.yaml | 2 +- .../1-start-distro/1-start-centos_8.stream_container-tools.yaml | 2 +- .../upgrade/1-start-distro/1-start-ubuntu_20.04-15.2.9.yaml | 2 +- .../cephadm/upgrade/1-start-distro/1-start-ubuntu_20.04.yaml | 2 +- qa/suites/upgrade/octopus-x/parallel/1-tasks.yaml | 2 +- qa/suites/upgrade/octopus-x/stress-split/1-start.yaml | 2 +- qa/suites/upgrade/pacific-x/parallel/1-tasks.yaml | 2 +- qa/suites/upgrade/pacific-x/stress-split/1-start.yaml | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/pacific.yaml b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/pacific.yaml index 74c40d2477320..67c27ba6bac3e 100644 --- a/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/pacific.yaml +++ b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/pacific.yaml @@ -9,7 +9,7 @@ tasks: - ceph-volume - print: "**** done install task..." - cephadm: - image: docker.io/ceph/daemon-base:latest-pacific + image: quay.io/ceph/daemon-base:latest-pacific roleless: true cephadm_branch: pacific cephadm_git_url: https://github.com/ceph/ceph diff --git a/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/v16.2.4.yaml b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/v16.2.4.yaml index 47166a9aff8e7..c732d692ac13d 100644 --- a/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/v16.2.4.yaml +++ b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/v16.2.4.yaml @@ -15,7 +15,7 @@ tasks: - print: "**** done install task..." - cephadm: roleless: true - image: docker.io/ceph/ceph:v16.2.4 + image: quay.io/ceph/ceph:v16.2.4 cephadm_branch: v16.2.4 cephadm_git_url: https://github.com/ceph/ceph # needed for v16.2.4 due to --skip-admin-label diff --git a/qa/suites/orch/cephadm/mgr-nfs-upgrade/1-bootstrap/16.2.4.yaml b/qa/suites/orch/cephadm/mgr-nfs-upgrade/1-bootstrap/16.2.4.yaml index 991562b94df62..1cbe5a134f932 100644 --- a/qa/suites/orch/cephadm/mgr-nfs-upgrade/1-bootstrap/16.2.4.yaml +++ b/qa/suites/orch/cephadm/mgr-nfs-upgrade/1-bootstrap/16.2.4.yaml @@ -1,7 +1,7 @@ tasks: - cephadm: roleless: true - image: docker.io/ceph/ceph:v16.2.4 + image: quay.io/ceph/ceph:v16.2.4 cephadm_branch: v16.2.4 cephadm_git_url: https://github.com/ceph/ceph # needed for v16.2.4 due to --skip-admin-label diff --git a/qa/suites/orch/cephadm/mgr-nfs-upgrade/1-bootstrap/16.2.5.yaml b/qa/suites/orch/cephadm/mgr-nfs-upgrade/1-bootstrap/16.2.5.yaml index 2568f23fabec1..381088d5b64eb 100644 --- a/qa/suites/orch/cephadm/mgr-nfs-upgrade/1-bootstrap/16.2.5.yaml +++ b/qa/suites/orch/cephadm/mgr-nfs-upgrade/1-bootstrap/16.2.5.yaml @@ -1,6 +1,6 @@ tasks: - cephadm: roleless: true - image: docker.io/ceph/ceph:v16.2.5 + image: quay.io/ceph/ceph:v16.2.5 cephadm_branch: v16.2.5 cephadm_git_url: https://github.com/ceph/ceph diff --git a/qa/suites/orch/cephadm/mgr-nfs-upgrade/1-bootstrap/octopus.yaml b/qa/suites/orch/cephadm/mgr-nfs-upgrade/1-bootstrap/octopus.yaml index 16670e7ecd25b..927c1d5bfeb05 100644 --- a/qa/suites/orch/cephadm/mgr-nfs-upgrade/1-bootstrap/octopus.yaml +++ b/qa/suites/orch/cephadm/mgr-nfs-upgrade/1-bootstrap/octopus.yaml @@ -1,7 +1,7 @@ tasks: - cephadm: roleless: true - image: docker.io/ceph/ceph:v15 + image: quay.io/ceph/ceph:v15 cephadm_branch: octopus cephadm_git_url: https://github.com/ceph/ceph avoid_pacific_features: true diff --git a/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-centos_8.stream_container-tools.yaml b/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-centos_8.stream_container-tools.yaml index a1a9cb5effc7b..0cbd7906424e1 100644 --- a/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-centos_8.stream_container-tools.yaml +++ b/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-centos_8.stream_container-tools.yaml @@ -9,7 +9,7 @@ tasks: - sudo dnf -y module install container-tools - sudo cp /etc/containers/registries.conf.backup /etc/containers/registries.conf - cephadm: - image: docker.io/ceph/ceph:v15.2.0 + image: quay.io/ceph/ceph:v15.2.0 cephadm_branch: v15.2.0 cephadm_git_url: https://github.com/ceph/ceph # avoid --cap-add=PTRACE + --privileged for older cephadm versions diff --git a/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-ubuntu_20.04-15.2.9.yaml b/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-ubuntu_20.04-15.2.9.yaml index fde68b32aa484..0fec8a3aa0aa1 100644 --- a/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-ubuntu_20.04-15.2.9.yaml +++ b/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-ubuntu_20.04-15.2.9.yaml @@ -3,7 +3,7 @@ os_version: "20.04" tasks: - cephadm: - image: docker.io/ceph/ceph:v15.2.9 + image: quay.io/ceph/ceph:v15.2.9 cephadm_branch: v15.2.9 cephadm_git_url: https://github.com/ceph/ceph # avoid --cap-add=PTRACE + --privileged for older cephadm versions diff --git a/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-ubuntu_20.04.yaml b/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-ubuntu_20.04.yaml index 983b4f3dc92bf..ba81c537cd973 100644 --- a/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-ubuntu_20.04.yaml +++ b/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-ubuntu_20.04.yaml @@ -3,7 +3,7 @@ os_version: "20.04" tasks: - cephadm: - image: docker.io/ceph/ceph:v15.2.0 + image: quay.io/ceph/ceph:v15.2.0 cephadm_branch: v15.2.0 cephadm_git_url: https://github.com/ceph/ceph # avoid --cap-add=PTRACE + --privileged for older cephadm versions diff --git a/qa/suites/upgrade/octopus-x/parallel/1-tasks.yaml b/qa/suites/upgrade/octopus-x/parallel/1-tasks.yaml index 0be7a0b7b0c05..6daa914369f34 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.io/ceph/daemon-base:latest-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 211a369f35205..32ba9a48aa08c 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.io/ceph/daemon-base:latest-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 61403f33e4151..013c2605707a7 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.io/ceph/daemon-base:latest-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 3daf723a35767..b0fd44af46e3e 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.io/ceph/daemon-base:latest-pacific cephadm_branch: pacific cephadm_git_url: https://github.com/ceph/ceph conf: -- 2.39.5