tests: updates functional tests with new image

let's use quay.io/ceph/daemon-base in every tests instead of
`ceph/daemon` since it's not supposed to be built anymore soon.

Signed-off-by: Guillaume Abrioux <gabrioux@ibm.com>

diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index 5270cf6b520831f84d252c36aa58d7021c1a9465..18ee24e0343b8e8b6547f5db71e2b470057512a1 100644 (file)
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -560,7 +560,7 @@ dummy:
 ##########
 # DOCKER #
 ##########
-#ceph_docker_image: "ceph/daemon"
+#ceph_docker_image: "ceph/daemon-base"
 #ceph_docker_image_tag: latest-main
 #ceph_docker_registry: quay.io
 #ceph_docker_registry_auth: false

diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml
index 46c4bfb67298beca50320ab5b7df5045a7b5a380..71882f6ddda944222d96966dba8d1f6943d87996 100644 (file)
--- a/roles/ceph-defaults/defaults/main.yml
+++ b/roles/ceph-defaults/defaults/main.yml
@@ -552,7 +552,7 @@ ceph_tcmalloc_max_total_thread_cache: 134217728
 ##########
 # DOCKER #
 ##########
-ceph_docker_image: "ceph/daemon"
+ceph_docker_image: "ceph/daemon-base"
 ceph_docker_image_tag: latest-main
 ceph_docker_registry: quay.io
 ceph_docker_registry_auth: false

diff --git a/tests/functional/add-mdss/container/group_vars/all b/tests/functional/add-mdss/container/group_vars/all
index 38d4dd02d4679cc8d39a299338c3260378e761ba..abacaac81de740b1784624feb84029f901ce64a5 100644 (file)
--- a/tests/functional/add-mdss/container/group_vars/all
+++ b/tests/functional/add-mdss/container/group_vars/all
@@ -28,5 +28,5 @@ ceph_conf_overrides:
     osd_pool_default_size: 1
 dashboard_enabled: False
 ceph_docker_registry: quay.io
-ceph_docker_image: ceph/daemon
+ceph_docker_image: ceph/daemon-base
 ceph_docker_image_tag: latest-main
\ No newline at end of file

diff --git a/tests/functional/add-mgrs/container/group_vars/all b/tests/functional/add-mgrs/container/group_vars/all
index 6aee70b91d83b3ffdea7186e09cbaec9f0d86d3e..34065af173d5e38ebe428d8432566df552153362 100644 (file)
--- a/tests/functional/add-mgrs/container/group_vars/all
+++ b/tests/functional/add-mgrs/container/group_vars/all
@@ -28,5 +28,5 @@ ceph_conf_overrides:
     osd_pool_default_size: 1
 dashboard_enabled: False
 ceph_docker_registry: quay.io
-ceph_docker_image: ceph/daemon
+ceph_docker_image: ceph/daemon-base
 ceph_docker_image_tag: latest-main
\ No newline at end of file

diff --git a/tests/functional/add-mons/container/group_vars/all b/tests/functional/add-mons/container/group_vars/all
index 4e01dd49c982d75c5a3d0b24dbd59fc75ddbd8f5..1fff68805fb0aa9ce8f00fbbcf5813e5893be652 100644 (file)
--- a/tests/functional/add-mons/container/group_vars/all
+++ b/tests/functional/add-mons/container/group_vars/all
@@ -28,5 +28,5 @@ ceph_conf_overrides:
     osd_pool_default_size: 1
 dashboard_enabled: False
 ceph_docker_registry: quay.io
-ceph_docker_image: ceph/daemon
+ceph_docker_image: ceph/daemon-base
 ceph_docker_image_tag: latest-main
\ No newline at end of file

diff --git a/tests/functional/add-osds/container/group_vars/all b/tests/functional/add-osds/container/group_vars/all
index 998cafeb4b661dbfbcde23163589bfca3f1c6666..39022d7a608003861b50b179e699ca784a2feb71 100644 (file)
--- a/tests/functional/add-osds/container/group_vars/all
+++ b/tests/functional/add-osds/container/group_vars/all
@@ -28,5 +28,5 @@ ceph_conf_overrides:
     osd_pool_default_size: 1
 dashboard_enabled: False
 ceph_docker_registry: quay.io
-ceph_docker_image: ceph/daemon
+ceph_docker_image: ceph/daemon-base
 ceph_docker_image_tag: latest-main
\ No newline at end of file

diff --git a/tests/functional/add-rbdmirrors/container/group_vars/all b/tests/functional/add-rbdmirrors/container/group_vars/all
index f23db26fb92eae757509d241e09f1e503f9f8986..c275d4f084bd166d458cfa6f068af514f7a77f59 100644 (file)
--- a/tests/functional/add-rbdmirrors/container/group_vars/all
+++ b/tests/functional/add-rbdmirrors/container/group_vars/all
@@ -28,5 +28,5 @@ ceph_conf_overrides:
     osd_pool_default_size: 1
 dashboard_enabled: False
 ceph_docker_registry: quay.io
-ceph_docker_image: ceph/daemon
+ceph_docker_image: ceph/daemon-base
 ceph_docker_image_tag: latest-main
\ No newline at end of file

diff --git a/tests/functional/add-rgws/container/group_vars/all b/tests/functional/add-rgws/container/group_vars/all
index 3e45dd62d3cad6fc4e688176aec89dec4123da79..1de1eea6f8933cfb213695c2cae95050efca9c01 100644 (file)
--- a/tests/functional/add-rgws/container/group_vars/all
+++ b/tests/functional/add-rgws/container/group_vars/all
@@ -30,5 +30,5 @@ rgw_override_bucket_index_max_shards: 16
 rgw_bucket_default_quota_max_objects: 1638400
 dashboard_enabled: False
 ceph_docker_registry: quay.io
-ceph_docker_image: ceph/daemon
+ceph_docker_image: ceph/daemon-base
 ceph_docker_image_tag: latest-main
\ No newline at end of file

diff --git a/tests/functional/all-in-one/container/group_vars/all b/tests/functional/all-in-one/container/group_vars/all
index 5a923726a7ff7eef4626afbe3dd40fe9d2097be7..daa915a6568740954808e186a36d93cf049b7070 100644 (file)
--- a/tests/functional/all-in-one/container/group_vars/all
+++ b/tests/functional/all-in-one/container/group_vars/all
@@ -44,5 +44,5 @@ lvm_volumes:
     db: journal1
     db_vg: journals
 ceph_docker_registry: quay.io
-ceph_docker_image: ceph/daemon
+ceph_docker_image: ceph/daemon-base
 ceph_docker_image_tag: latest-main
\ No newline at end of file

diff --git a/tests/functional/all_daemons/container/group_vars/all b/tests/functional/all_daemons/container/group_vars/all
index f8c3edb35626a20a861f0f7a47f382e12afddb2d..6dfcb137c949f8d183ad27c6ad26f24780437362 100644 (file)
--- a/tests/functional/all_daemons/container/group_vars/all
+++ b/tests/functional/all_daemons/container/group_vars/all
@@ -37,7 +37,7 @@ mds_max_mds: 2
 dashboard_admin_password: $sX!cD$rYU6qR^B!
 grafana_admin_password: +xFRe+RES@7vg24n
 ceph_docker_registry: quay.io
-ceph_docker_image: ceph/daemon
+ceph_docker_image: ceph/daemon-base
 ceph_docker_image_tag: latest-main
 node_exporter_container_image: "quay.io/prometheus/node-exporter:v0.17.0"
 prometheus_container_image: "quay.io/prometheus/prometheus:v2.7.2"

diff --git a/tests/functional/collocation/container/group_vars/all b/tests/functional/collocation/container/group_vars/all
index e441fb6dd766ce60e65fefcaf477c9518108c927..e6f0fab1edf259edb474d570f101a6a4ad1f148b 100644 (file)
--- a/tests/functional/collocation/container/group_vars/all
+++ b/tests/functional/collocation/container/group_vars/all
@@ -26,7 +26,7 @@ dashboard_admin_password: $sX!cD$rYU6qR^B!
 dashboard_admin_user_ro: true
 grafana_admin_password: +xFRe+RES@7vg24n
 ceph_docker_registry: quay.io
-ceph_docker_image: ceph/daemon
+ceph_docker_image: ceph/daemon-base
 ceph_docker_image_tag: latest-main
 node_exporter_container_image: "quay.io/prometheus/node-exporter:v0.17.0"
 prometheus_container_image: "quay.io/prometheus/prometheus:v2.7.2"

diff --git a/tests/functional/docker2podman/group_vars/all b/tests/functional/docker2podman/group_vars/all
index 77091fa71c44ffa08299aa3cbef98e1059adcb7a..42e97ffd8e5146d2b3af00ae569d341b67c47720 100644 (file)
--- a/tests/functional/docker2podman/group_vars/all
+++ b/tests/functional/docker2podman/group_vars/all
@@ -34,7 +34,7 @@ handler_health_osd_check_delay: 10
 dashboard_admin_password: $sX!cD$rYU6qR^B!
 grafana_admin_password: +xFRe+RES@7vg24n
 ceph_docker_registry: quay.io
-ceph_docker_image: ceph/daemon
+ceph_docker_image: ceph/daemon-base
 ceph_docker_image_tag: latest-main
 node_exporter_container_image: "quay.io/prometheus/node-exporter:v0.17.0"
 prometheus_container_image: "quay.io/prometheus/prometheus:v2.7.2"

diff --git a/tests/functional/external_clients/container/inventory/group_vars/all b/tests/functional/external_clients/container/inventory/group_vars/all
index b8840f32b28316f220bafc0af7a3dec19f53720d..940a55ff861d809f49ec9eac45bc88211373b5da 100644 (file)
--- a/tests/functional/external_clients/container/inventory/group_vars/all
+++ b/tests/functional/external_clients/container/inventory/group_vars/all
@@ -38,5 +38,5 @@ lvm_volumes:
 fsid: 40358a87-ab6e-4bdc-83db-1d909147861c
 generate_fsid: false
 ceph_docker_registry: quay.io
-ceph_docker_image: ceph/daemon
+ceph_docker_image: ceph/daemon-base
 ceph_docker_image_tag: latest-main
\ No newline at end of file

diff --git a/tests/functional/lvm-auto-discovery/container/group_vars/all b/tests/functional/lvm-auto-discovery/container/group_vars/all
index 5c2da2fa846633b82c50207ca88a136af76bee51..dab885f7a8d18402b9447cffb9b44d415b3722e0 100644 (file)
--- a/tests/functional/lvm-auto-discovery/container/group_vars/all
+++ b/tests/functional/lvm-auto-discovery/container/group_vars/all
@@ -28,5 +28,5 @@ dashboard_enabled: False
 handler_health_mon_check_delay: 10
 handler_health_osd_check_delay: 10
 ceph_docker_registry: quay.io
-ceph_docker_image: ceph/daemon
+ceph_docker_image: ceph/daemon-base
 ceph_docker_image_tag: latest-main
\ No newline at end of file

diff --git a/tests/functional/lvm-batch/container/group_vars/all b/tests/functional/lvm-batch/container/group_vars/all
index 87787c6ad4c0a8187dc0ffd8e6c5f89b80c25296..a3e868dd31305c5396d50607d970bb1a78e42b29 100644 (file)
--- a/tests/functional/lvm-batch/container/group_vars/all
+++ b/tests/functional/lvm-batch/container/group_vars/all
@@ -28,5 +28,5 @@ dashboard_enabled: False
 handler_health_mon_check_delay: 10
 handler_health_osd_check_delay: 10
 ceph_docker_registry: quay.io
-ceph_docker_image: ceph/daemon
+ceph_docker_image: ceph/daemon-base
 ceph_docker_image_tag: latest-main
\ No newline at end of file

diff --git a/tests/functional/lvm-osds/container/group_vars/all b/tests/functional/lvm-osds/container/group_vars/all
index 0e42c2d28958a6a5e895b6adead38fbca088b02a..5e812e3556270865af8ebe7a90081ef72aed4fc0 100644 (file)
--- a/tests/functional/lvm-osds/container/group_vars/all
+++ b/tests/functional/lvm-osds/container/group_vars/all
@@ -37,5 +37,5 @@ openstack_pools:
   - "{{ openstack_glance_pool }}"
   - "{{ openstack_cinder_pool }}"
 ceph_docker_registry: quay.io
-ceph_docker_image: ceph/daemon
+ceph_docker_image: ceph/daemon-base
 ceph_docker_image_tag: latest-main
\ No newline at end of file

diff --git a/tests/functional/podman/group_vars/all b/tests/functional/podman/group_vars/all
index dcb7b9d26a4dfc89433e8a1602f85dfbe3f8b165..6101343ecd17c8d77565c7bc1cc9c5fab7940135 100644 (file)
--- a/tests/functional/podman/group_vars/all
+++ b/tests/functional/podman/group_vars/all
@@ -33,7 +33,7 @@ handler_health_osd_check_delay: 10
 dashboard_admin_password: $sX!cD$rYU6qR^B!
 grafana_admin_password: +xFRe+RES@7vg24n
 ceph_docker_registry: quay.io
-ceph_docker_image: ceph/daemon
+ceph_docker_image: ceph/daemon-base
 ceph_docker_image_tag: latest-main
 node_exporter_container_image: "quay.io/prometheus/node-exporter:v0.17.0"
 prometheus_container_image: "quay.io/prometheus/prometheus:v2.7.2"

diff --git a/tests/functional/rbdmirror/container/group_vars/all b/tests/functional/rbdmirror/container/group_vars/all
index d8568f16c0dc3ebd3ebaf2c2d72da0b106a04df6..54924683cdfe6a0277901d946bcbda1fe431f3e4 100644 (file)
--- a/tests/functional/rbdmirror/container/group_vars/all
+++ b/tests/functional/rbdmirror/container/group_vars/all
@@ -28,5 +28,5 @@ ceph_conf_overrides:
     mon_max_pg_per_osd: 512
 dashboard_enabled: False
 ceph_docker_registry: quay.io
-ceph_docker_image: ceph/daemon
+ceph_docker_image: ceph/daemon-base
 ceph_docker_image_tag: latest-main

diff --git a/tests/functional/rbdmirror/container/secondary/group_vars/all b/tests/functional/rbdmirror/container/secondary/group_vars/all
index 8d7dacc9e5d47f5193f2639ecf742fac01b8b149..ccc55d1cf827ecd72536c8bb6cdf345596ecc364 100644 (file)
--- a/tests/functional/rbdmirror/container/secondary/group_vars/all
+++ b/tests/functional/rbdmirror/container/secondary/group_vars/all
@@ -28,5 +28,5 @@ ceph_conf_overrides:
     mon_max_pg_per_osd: 512
 dashboard_enabled: False
 ceph_docker_registry: quay.io
-ceph_docker_image: ceph/daemon
+ceph_docker_image: ceph/daemon-base
 ceph_docker_image_tag: latest-main

diff --git a/tests/functional/rgw-multisite/container/group_vars/all b/tests/functional/rgw-multisite/container/group_vars/all
index 4ffd48a1141b15d640c9a094caf184674aa0fcb8..9f49977576d4d5dd015e66aa8d267af30bc04110 100644 (file)
--- a/tests/functional/rgw-multisite/container/group_vars/all
+++ b/tests/functional/rgw-multisite/container/group_vars/all
@@ -29,5 +29,5 @@ ceph_conf_overrides:
     mon_max_pg_per_osd: 512
 dashboard_enabled: False
 ceph_docker_registry: quay.io
-ceph_docker_image: ceph/daemon
+ceph_docker_image: ceph/daemon-base
 ceph_docker_image_tag: latest-main

diff --git a/tests/functional/rgw-multisite/container/secondary/group_vars/all b/tests/functional/rgw-multisite/container/secondary/group_vars/all
index afdc5022218e9aa07be47979d52e301b2495d4d6..eec0e966198517dd1af18fa539171867c7a4d961 100644 (file)
--- a/tests/functional/rgw-multisite/container/secondary/group_vars/all
+++ b/tests/functional/rgw-multisite/container/secondary/group_vars/all
@@ -29,5 +29,5 @@ ceph_conf_overrides:
     mon_max_pg_per_osd: 512
 dashboard_enabled: False
 ceph_docker_registry: quay.io
-ceph_docker_image: ceph/daemon
+ceph_docker_image: ceph/daemon-base
 ceph_docker_image_tag: latest-main

diff --git a/tests/functional/shrink_mds/container/group_vars/all b/tests/functional/shrink_mds/container/group_vars/all
index f7b976e90e752b83068641f13443227deb187348..43f2de24d98d1720850a479bd29e34c517575723 100644 (file)
--- a/tests/functional/shrink_mds/container/group_vars/all
+++ b/tests/functional/shrink_mds/container/group_vars/all
@@ -17,5 +17,5 @@ openstack_config: False
 dashboard_enabled: False
 copy_admin_key: True
 ceph_docker_registry: quay.io
-ceph_docker_image: ceph/daemon
+ceph_docker_image: ceph/daemon-base
 ceph_docker_image_tag: latest-main
\ No newline at end of file

diff --git a/tests/functional/shrink_mgr/container/group_vars/all b/tests/functional/shrink_mgr/container/group_vars/all
index b6d4562a40a803e198ddc58efdb0cd4b577472c4..5488b6c41aca76f29af516777e73058708148f1c 100644 (file)
--- a/tests/functional/shrink_mgr/container/group_vars/all
+++ b/tests/functional/shrink_mgr/container/group_vars/all
@@ -16,5 +16,5 @@ ceph_conf_overrides:
 openstack_config: False
 dashboard_enabled: False
 ceph_docker_registry: quay.io
-ceph_docker_image: ceph/daemon
+ceph_docker_image: ceph/daemon-base
 ceph_docker_image_tag: latest-main
\ No newline at end of file

diff --git a/tests/functional/shrink_mon/container/group_vars/all b/tests/functional/shrink_mon/container/group_vars/all
index 93ec6e8c3182b1bfc8e683dde1c6df1d5f3ea7f7..2fd03e9b5e10f302d74470eafc103a3c34c2d29c 100644 (file)
--- a/tests/functional/shrink_mon/container/group_vars/all
+++ b/tests/functional/shrink_mon/container/group_vars/all
@@ -16,5 +16,5 @@ ceph_conf_overrides:
 openstack_config: False
 dashboard_enabled: False
 ceph_docker_registry: quay.io
-ceph_docker_image: ceph/daemon
+ceph_docker_image: ceph/daemon-base
 ceph_docker_image_tag: latest-main
\ No newline at end of file

diff --git a/tests/functional/shrink_osd/container/group_vars/all b/tests/functional/shrink_osd/container/group_vars/all
index e0930dc9c0fdafeafb0b642fa110ca5fa633b962..9e6f481b842709dd7c48b1e3d81089f44aa98975 100644 (file)
--- a/tests/functional/shrink_osd/container/group_vars/all
+++ b/tests/functional/shrink_osd/container/group_vars/all
@@ -17,5 +17,5 @@ openstack_config: False
 dashboard_enabled: False
 copy_admin_key: True
 ceph_docker_registry: quay.io
-ceph_docker_image: ceph/daemon
+ceph_docker_image: ceph/daemon-base
 ceph_docker_image_tag: latest-main
\ No newline at end of file

diff --git a/tests/functional/shrink_rbdmirror/container/group_vars/all b/tests/functional/shrink_rbdmirror/container/group_vars/all
index 8d2c4bc03c6e6d9426c2c7364b0051a14cdc3ae9..7eeffe2663bfefd0b7d540db1d9787ff6ee8976d 100644 (file)
--- a/tests/functional/shrink_rbdmirror/container/group_vars/all
+++ b/tests/functional/shrink_rbdmirror/container/group_vars/all
@@ -16,5 +16,5 @@ openstack_config: False
 dashboard_enabled: False
 copy_admin_key: True
 ceph_docker_registry: quay.io
-ceph_docker_image: ceph/daemon
+ceph_docker_image: ceph/daemon-base
 ceph_docker_image_tag: latest-main
\ No newline at end of file

diff --git a/tests/functional/shrink_rgw/container/group_vars/all b/tests/functional/shrink_rgw/container/group_vars/all
index 0ff6b90b026b9c8acf01619281d5a80caf4be012..052f9ffc9fda2b4052b539784fd3e7127a6179f9 100644 (file)
--- a/tests/functional/shrink_rgw/container/group_vars/all
+++ b/tests/functional/shrink_rgw/container/group_vars/all
@@ -18,5 +18,5 @@ openstack_config: False
 dashboard_enabled: False
 copy_admin_key: True
 ceph_docker_registry: quay.io
-ceph_docker_image: ceph/daemon
+ceph_docker_image: ceph/daemon-base
 ceph_docker_image_tag: latest-main
\ No newline at end of file

diff --git a/tests/functional/subset_update/container/group_vars/all b/tests/functional/subset_update/container/group_vars/all
index ce5a1a31366c085d8c0571e1d8c2314b8717a993..4b8941b96ff9eae8eaeaee1ff3929189b44fdfe6 100644 (file)
--- a/tests/functional/subset_update/container/group_vars/all
+++ b/tests/functional/subset_update/container/group_vars/all
@@ -28,7 +28,7 @@ dashboard_enabled: false
 dashboard_admin_password: $sX!cD$rYU6qR^B!
 grafana_admin_password: +xFRe+RES@7vg24n
 ceph_docker_registry: quay.io
-ceph_docker_image: ceph/daemon
+ceph_docker_image: ceph/daemon-base
 ceph_docker_image_tag: latest-main
 node_exporter_container_image: "quay.io/prometheus/node-exporter:v0.17.0"
 prometheus_container_image: "quay.io/prometheus/prometheus:v2.7.2"

diff --git a/tox.ini b/tox.ini
index b57b2801d611bf957a0326b682fe72a31cab2b77..3cda705f7fb9aaa0d28d4c9ff34fae2771bccbaf 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -44,7 +44,7 @@ commands=
 commands=
   ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/rbd_map_devices.yml --extra-vars "\
       ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:quay.io} \
-      ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \
+      ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon-base} \
       ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-main} \
   "
 
@@ -52,7 +52,7 @@ commands=
       ireallymeanit=yes \
       remove_packages=yes \
       ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:quay.io} \
-      ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \
+      ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon-base} \
       ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-main} \
   "
 
@@ -76,7 +76,7 @@ commands=
   ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/purge-dashboard.yml --extra-vars "\
       ireallymeanit=yes \
       ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:quay.io} \
-      ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \
+      ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon-base} \
       ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-main} \
   "
 
@@ -160,7 +160,7 @@ commands=
       ireallymeanit=yes \
       ceph_docker_image_tag=latest-main-devel \
       ceph_docker_registry=quay.io \
-      ceph_docker_image=ceph/daemon \
+      ceph_docker_image=ceph/daemon-base \
       ceph_docker_registry_auth=True \
       ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \
       ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \