Skip to content

Commit

Permalink
tests: migrate to quay.ceph.io registry
Browse files Browse the repository at this point in the history
in order to avoid docker.io rate limiting

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
  • Loading branch information
guits committed Sep 7, 2020
1 parent ae38b01 commit 2cbb7de
Show file tree
Hide file tree
Showing 39 changed files with 157 additions and 167 deletions.
4 changes: 2 additions & 2 deletions docs/source/testing/tox.rst
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ The following environent variables are available for use:
* ``UPDATE_CEPH_STABLE_RELEASE``: (default: ``kraken``) This would configure the ``ceph-ansible`` variable ``ceph_stable_relese`` during an ``update``
scenario. This is set automatically when using the ``jewel-*`` or ``kraken-*`` testing scenarios.

* ``CEPH_DOCKER_REGISTRY``: (default: ``docker.io``) This would configure the ``ceph-ansible`` variable ``ceph_docker_registry``.
* ``CEPH_DOCKER_REGISTRY``: (default: ``quay.ceph.io``) This would configure the ``ceph-ansible`` variable ``ceph_docker_registry``.

* ``CEPH_DOCKER_IMAGE``: (default: ``ceph/daemon``) This would configure the ``ceph-ansible`` variable ``ceph_docker_image``.
* ``CEPH_DOCKER_IMAGE``: (default: ``ceph-ci/daemon``) This would configure the ``ceph-ansible`` variable ``ceph_docker_image``.

* ``CEPH_DOCKER_IMAGE_TAG``: (default: ``latest``) This would configure the ``ceph-ansible`` variable ``ceph_docker_image_name``.

Expand Down
5 changes: 4 additions & 1 deletion tests/functional/add-mdss/container/group_vars/all
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,7 @@ ceph_conf_overrides:
mon_allow_pool_size_one: true
mon_warn_on_pool_no_redundancy: false
osd_pool_default_size: 1
dashboard_enabled: False
dashboard_enabled: False
ceph_docker_registry: quay.ceph.io
ceph_docker_image: ceph-ci/daemon
ceph_docker_image_tag: latest-master
5 changes: 4 additions & 1 deletion tests/functional/add-mgrs/container/group_vars/all
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,7 @@ ceph_conf_overrides:
mon_allow_pool_size_one: true
mon_warn_on_pool_no_redundancy: false
osd_pool_default_size: 1
dashboard_enabled: False
dashboard_enabled: False
ceph_docker_registry: quay.ceph.io
ceph_docker_image: ceph-ci/daemon
ceph_docker_image_tag: latest-master
5 changes: 4 additions & 1 deletion tests/functional/add-mons/container/group_vars/all
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,7 @@ ceph_conf_overrides:
mon_allow_pool_size_one: true
mon_warn_on_pool_no_redundancy: false
osd_pool_default_size: 1
dashboard_enabled: False
dashboard_enabled: False
ceph_docker_registry: quay.ceph.io
ceph_docker_image: ceph-ci/daemon
ceph_docker_image_tag: latest-master
5 changes: 4 additions & 1 deletion tests/functional/add-osds/container/group_vars/all
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,7 @@ ceph_conf_overrides:
mon_allow_pool_size_one: true
mon_warn_on_pool_no_redundancy: false
osd_pool_default_size: 1
dashboard_enabled: False
dashboard_enabled: False
ceph_docker_registry: quay.ceph.io
ceph_docker_image: ceph-ci/daemon
ceph_docker_image_tag: latest-master
5 changes: 4 additions & 1 deletion tests/functional/add-rbdmirrors/container/group_vars/all
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,7 @@ ceph_conf_overrides:
mon_allow_pool_size_one: true
mon_warn_on_pool_no_redundancy: false
osd_pool_default_size: 1
dashboard_enabled: False
dashboard_enabled: False
ceph_docker_registry: quay.ceph.io
ceph_docker_image: ceph-ci/daemon
ceph_docker_image_tag: latest-master
5 changes: 4 additions & 1 deletion tests/functional/add-rgws/container/group_vars/all
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,7 @@ ceph_conf_overrides:
osd_pool_default_size: 1
rgw_override_bucket_index_max_shards: 16
rgw_bucket_default_quota_max_objects: 1638400
dashboard_enabled: False
dashboard_enabled: False
ceph_docker_registry: quay.ceph.io
ceph_docker_image: ceph-ci/daemon
ceph_docker_image_tag: latest-master
5 changes: 4 additions & 1 deletion tests/functional/all-in-one/container/group_vars/all
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,7 @@ lvm_volumes:
- data: data-lv2
data_vg: test_group
db: journal1
db_vg: journals
db_vg: journals
ceph_docker_registry: quay.ceph.io
ceph_docker_image: ceph-ci/daemon
ceph_docker_image_tag: latest-master
8 changes: 7 additions & 1 deletion tests/functional/all_daemons/container/group_vars/all
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,10 @@ handler_health_mon_check_delay: 10
handler_health_osd_check_delay: 10
mds_max_mds: 2
dashboard_admin_password: $sX!cD$rYU6qR^B!
grafana_admin_password: +xFRe+RES@7vg24n
grafana_admin_password: +xFRe+RES@7vg24n
ceph_docker_registry: quay.ceph.io
ceph_docker_image: ceph-ci/daemon
ceph_docker_image_tag: latest-master
node_exporter_container_image: "quay.io/prometheus/node-exporter:v0.17.0"
prometheus_container_image: "quay.io/prometheus/prometheus:v2.7.2"
alertmanager_container_image: "quay.io/prometheus/alertmanager:v0.16.2"
6 changes: 5 additions & 1 deletion tests/functional/all_daemons/group_vars/all
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,8 @@ handler_health_mon_check_delay: 10
handler_health_osd_check_delay: 10
mds_max_mds: 2
dashboard_admin_password: $sX!cD$rYU6qR^B!
grafana_admin_password: +xFRe+RES@7vg24n
grafana_admin_password: +xFRe+RES@7vg24n
node_exporter_container_image: "quay.io/prometheus/node-exporter:v0.17.0"
prometheus_container_image: "quay.io/prometheus/prometheus:v2.7.2"
alertmanager_container_image: "quay.io/prometheus/alertmanager:v0.16.2"
ceph_docker_registry: quay.ceph.io
3 changes: 3 additions & 0 deletions tests/functional/cephadm/group_vars/all
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,6 @@ monitor_interface: eth1
public_network: "192.168.30.0/24"
cluster_network: "192.168.31.0/24"
dashboard_admin_password: $sX!cD$rYU6qR^B!
ceph_docker_registry: quay.ceph.io
ceph_docker_image: ceph-ci/daemon
ceph_docker_image_tag: latest-master
8 changes: 7 additions & 1 deletion tests/functional/collocation/container/group_vars/all
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,10 @@ handler_health_mon_check_delay: 10
handler_health_osd_check_delay: 10
dashboard_admin_password: $sX!cD$rYU6qR^B!
dashboard_admin_user_ro: true
grafana_admin_password: +xFRe+RES@7vg24n
grafana_admin_password: +xFRe+RES@7vg24n
ceph_docker_registry: quay.ceph.io
ceph_docker_image: ceph-ci/daemon
ceph_docker_image_tag: latest-master
node_exporter_container_image: "quay.io/prometheus/node-exporter:v0.17.0"
prometheus_container_image: "quay.io/prometheus/prometheus:v2.7.2"
alertmanager_container_image: "quay.io/prometheus/alertmanager:v0.16.2"
5 changes: 4 additions & 1 deletion tests/functional/docker2podman/group_vars/all
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,7 @@ openstack_pools:
handler_health_mon_check_delay: 10
handler_health_osd_check_delay: 10
dashboard_admin_password: $sX!cD$rYU6qR^B!
grafana_admin_password: +xFRe+RES@7vg24n
grafana_admin_password: +xFRe+RES@7vg24n
ceph_docker_registry: quay.ceph.io
ceph_docker_image: ceph-ci/daemon
ceph_docker_image_tag: latest-master
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,7 @@ lvm_volumes:
db: journal1
db_vg: journals
fsid: 40358a87-ab6e-4bdc-83db-1d909147861c
generate_fsid: false
generate_fsid: false
ceph_docker_registry: quay.ceph.io
ceph_docker_image: ceph-ci/daemon
ceph_docker_image_tag: latest-master
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,7 @@ ceph_conf_overrides:
osd_pool_default_size: 1
dashboard_enabled: False
handler_health_mon_check_delay: 10
handler_health_osd_check_delay: 10
handler_health_osd_check_delay: 10
ceph_docker_registry: quay.ceph.io
ceph_docker_image: ceph-ci/daemon
ceph_docker_image_tag: latest-master
5 changes: 4 additions & 1 deletion tests/functional/lvm-auto-discovery/container/group_vars/all
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,7 @@ ceph_conf_overrides:
osd_pool_default_size: 1
dashboard_enabled: False
handler_health_mon_check_delay: 10
handler_health_osd_check_delay: 10
handler_health_osd_check_delay: 10
ceph_docker_registry: quay.ceph.io
ceph_docker_image: ceph-ci/daemon
ceph_docker_image_tag: latest-master
5 changes: 4 additions & 1 deletion tests/functional/lvm-batch/container/group_vars/all
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,7 @@ ceph_conf_overrides:
osd_pool_default_size: 1
dashboard_enabled: False
handler_health_mon_check_delay: 10
handler_health_osd_check_delay: 10
handler_health_osd_check_delay: 10
ceph_docker_registry: quay.ceph.io
ceph_docker_image: ceph-ci/daemon
ceph_docker_image_tag: latest-master
5 changes: 4 additions & 1 deletion tests/functional/lvm-osds/container/group_vars/all
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,7 @@ openstack_cinder_pool:
application: rbd
openstack_pools:
- "{{ openstack_glance_pool }}"
- "{{ openstack_cinder_pool }}"
- "{{ openstack_cinder_pool }}"
ceph_docker_registry: quay.ceph.io
ceph_docker_image: ceph-ci/daemon
ceph_docker_image_tag: latest-master
4 changes: 2 additions & 2 deletions tests/functional/ooo-collocation/hosts
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ all:
rgw_keystone_admin_user: swift, rgw_keystone_api_version: 3, rgw_keystone_implicit_tenants: 'true',
rgw_keystone_url: 'http://192.168.95.10:5000', rgw_s3_auth_use_keystone: 'true', rgw_keystone_revocation_interval: 0}
cluster: mycluster
ceph_docker_image: ceph/daemon
ceph_docker_image: ceph-ci/daemon
ceph_docker_image_tag: latest-master
ceph_docker_registry: docker.io
ceph_docker_registry: quay.ceph.io
cephfs_data_pool:
name: 'manila_data'
pg_num: "{{ osd_pool_default_pg_num }}"
Expand Down
5 changes: 4 additions & 1 deletion tests/functional/podman/group_vars/all
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,7 @@ openstack_pools:
handler_health_mon_check_delay: 10
handler_health_osd_check_delay: 10
dashboard_admin_password: $sX!cD$rYU6qR^B!
grafana_admin_password: +xFRe+RES@7vg24n
grafana_admin_password: +xFRe+RES@7vg24n
ceph_docker_registry: quay.ceph.io
ceph_docker_image: ceph-ci/daemon
ceph_docker_image_tag: latest-master
5 changes: 4 additions & 1 deletion tests/functional/rgw-multisite/container/group_vars/all
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,7 @@ ceph_conf_overrides:
mon_allow_pool_size_one: true
mon_warn_on_pool_no_redundancy: false
osd_pool_default_size: 1
dashboard_enabled: False
dashboard_enabled: False
ceph_docker_registry: quay.ceph.io
ceph_docker_image: ceph-ci/daemon
ceph_docker_image_tag: latest-master
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,7 @@ ceph_conf_overrides:
mon_allow_pool_size_one: true
mon_warn_on_pool_no_redundancy: false
osd_pool_default_size: 1
dashboard_enabled: False
dashboard_enabled: False
ceph_docker_registry: quay.ceph.io
ceph_docker_image: ceph-ci/daemon
ceph_docker_image_tag: latest-master
5 changes: 4 additions & 1 deletion tests/functional/shrink_mds/container/group_vars/all
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,7 @@ ceph_conf_overrides:
osd_pool_default_size: 1
openstack_config: False
dashboard_enabled: False
copy_admin_key: True
copy_admin_key: True
ceph_docker_registry: quay.ceph.io
ceph_docker_image: ceph-ci/daemon
ceph_docker_image_tag: latest-master
5 changes: 4 additions & 1 deletion tests/functional/shrink_mgr/container/group_vars/all
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,7 @@ ceph_conf_overrides:
mon_warn_on_pool_no_redundancy: false
osd_pool_default_size: 1
openstack_config: False
dashboard_enabled: False
dashboard_enabled: False
ceph_docker_registry: quay.ceph.io
ceph_docker_image: ceph-ci/daemon
ceph_docker_image_tag: latest-master
5 changes: 4 additions & 1 deletion tests/functional/shrink_mon/container/group_vars/all
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,7 @@ ceph_conf_overrides:
mon_warn_on_pool_no_redundancy: false
osd_pool_default_size: 1
openstack_config: False
dashboard_enabled: False
dashboard_enabled: False
ceph_docker_registry: quay.ceph.io
ceph_docker_image: ceph-ci/daemon
ceph_docker_image_tag: latest-master
5 changes: 4 additions & 1 deletion tests/functional/shrink_osd/container/group_vars/all
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,7 @@ ceph_conf_overrides:
osd_pool_default_size: 1
openstack_config: False
dashboard_enabled: False
copy_admin_key: True
copy_admin_key: True
ceph_docker_registry: quay.ceph.io
ceph_docker_image: ceph-ci/daemon
ceph_docker_image_tag: latest-master
5 changes: 4 additions & 1 deletion tests/functional/shrink_rbdmirror/container/group_vars/all
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,7 @@ ceph_conf_overrides:
osd_pool_default_size: 1
openstack_config: False
dashboard_enabled: False
copy_admin_key: True
copy_admin_key: True
ceph_docker_registry: quay.ceph.io
ceph_docker_image: ceph-ci/daemon
ceph_docker_image_tag: latest-master
5 changes: 4 additions & 1 deletion tests/functional/shrink_rgw/container/group_vars/all
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,7 @@ ceph_conf_overrides:
osd_pool_default_size: 1
openstack_config: False
dashboard_enabled: False
copy_admin_key: True
copy_admin_key: True
ceph_docker_registry: quay.ceph.io
ceph_docker_image: ceph-ci/daemon
ceph_docker_image_tag: latest-master
Loading

0 comments on commit 2cbb7de

Please sign in to comment.