summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorvamahaja <vamahaja@redhat.com>2020-12-03 14:44:38 +0530
committervamahaja <vamahaja@redhat.com>2020-12-08 11:07:23 +0530
commitd0bc92df671f56b2ae15f68a71b5af1e2529f544 (patch)
tree9d0f7cd97b3dc51cc3969d356ba37ae9419fa75e /tests
parente298b5a967c4d8878ebd606adc604cd7fb6e162e (diff)
[TestFix] Add config to read i/o images
Add support to pass I/O image from config file Change-Id: I2c943ba0efaeab3a44eef63030965f36f8086c1b
Diffstat (limited to 'tests')
-rwxr-xr-xtests/functional/arbiter/test_arbiter.py4
-rw-r--r--tests/functional/heketi/test_heketi_zones.py3
-rw-r--r--tests/functional/prometheous/test_prometheus_validations_file.py3
-rw-r--r--tests/functional/provisioning/test_dynamic_provisioning_file.py18
-rw-r--r--tests/functional/provisioning/test_pv_resize.py9
-rw-r--r--tests/functional/provisioning/test_storage_class_cases.py3
-rw-r--r--tests/glusterfs-containers-tests-config.yaml6
7 files changed, 31 insertions, 15 deletions
diff --git a/tests/functional/arbiter/test_arbiter.py b/tests/functional/arbiter/test_arbiter.py
index a3c7279a..8a0a8f9e 100755
--- a/tests/functional/arbiter/test_arbiter.py
+++ b/tests/functional/arbiter/test_arbiter.py
@@ -155,7 +155,7 @@ class TestArbiterVolumeCreateExpandDelete(baseclass.BaseClass):
mount_path = "/mnt"
pod_name = openshift_ops.oc_create_tiny_pod_with_volume(
self.node, self.pvc_name, "test-arbiter-pvc-mount-on-app-pod",
- mount_path=mount_path)
+ mount_path=mount_path, image=self.io_container_image_cirros)
self.addCleanup(openshift_ops.oc_delete, self.node, 'pod', pod_name)
# Wait for POD be up and running
@@ -1513,7 +1513,7 @@ class TestArbiterVolumeCreateExpandDelete(baseclass.BaseClass):
# Create PVC and corresponding App pod
self.create_and_wait_for_pvc(sc_name=sc_name)
dc_name, pod_name = self.create_dc_with_pvc(
- self.pvc_name, is_busybox=True)
+ self.pvc_name, image=self.io_container_image_busybox)
# Get vol info
vol_info = openshift_ops.get_gluster_vol_info_by_pvc_name(
diff --git a/tests/functional/heketi/test_heketi_zones.py b/tests/functional/heketi/test_heketi_zones.py
index e1cd5dd4..5c5d3df5 100644
--- a/tests/functional/heketi/test_heketi_zones.py
+++ b/tests/functional/heketi/test_heketi_zones.py
@@ -626,7 +626,8 @@ class TestHeketiZones(baseclass.BaseClass):
# Create app dcs with I/O
for pvc_name in pvc_names:
app_dc = openshift_ops.oc_create_app_dc_with_io(
- self.node, pvc_name=pvc_name, dc_name_prefix=prefix)
+ self.node, pvc_name=pvc_name,
+ dc_name_prefix=prefix, image=self.io_container_image_cirros)
self.addCleanup(openshift_ops.oc_delete, self.node, 'dc', app_dc)
# Get pod names and label them
diff --git a/tests/functional/prometheous/test_prometheus_validations_file.py b/tests/functional/prometheous/test_prometheus_validations_file.py
index bcde3b9c..313cb713 100644
--- a/tests/functional/prometheous/test_prometheus_validations_file.py
+++ b/tests/functional/prometheous/test_prometheus_validations_file.py
@@ -100,7 +100,8 @@ class TestPrometheusValidationFile(baseclass.BaseClass):
# Create PVC and wait for it to be in 'Bound' state
pvc_name = self.create_and_wait_for_pvc()
pod_name = openshift_ops.oc_create_tiny_pod_with_volume(
- self._master, pvc_name, "autotest-volume")
+ self._master, pvc_name, "autotest-volume",
+ image=self.io_container_image_cirros)
self.addCleanup(openshift_ops.oc_delete, self._master, 'pod', pod_name,
raise_on_absence=False)
diff --git a/tests/functional/provisioning/test_dynamic_provisioning_file.py b/tests/functional/provisioning/test_dynamic_provisioning_file.py
index 3a11cbe5..cdffdbf6 100644
--- a/tests/functional/provisioning/test_dynamic_provisioning_file.py
+++ b/tests/functional/provisioning/test_dynamic_provisioning_file.py
@@ -56,7 +56,8 @@ class TestDynamicProvisioningP0(BaseClass):
pvc_name = self.create_and_wait_for_pvc()
# Create DC with POD and attached PVC to it.
- dc_name = oc_create_app_dc_with_io(self.node, pvc_name)
+ dc_name = oc_create_app_dc_with_io(
+ self.node, pvc_name, image=self.io_container_image_cirros)
self.addCleanup(oc_delete, self.node, 'dc', dc_name)
self.addCleanup(scale_dc_pod_amount_and_wait, self.node, dc_name, 0)
@@ -144,7 +145,7 @@ class TestDynamicProvisioningP0(BaseClass):
# Create app POD with attached volume
app_1_pod_name = oc_create_tiny_pod_with_volume(
self.node, app_1_pvc_name, "test-pvc-mount-on-app-pod",
- mount_path=mount_path)
+ mount_path=mount_path, image=self.io_container_image_cirros)
self.addCleanup(
wait_for_resource_absence, self.node, 'pod', app_1_pod_name)
self.addCleanup(oc_delete, self.node, 'pod', app_1_pod_name)
@@ -184,7 +185,7 @@ class TestDynamicProvisioningP0(BaseClass):
# Create second app POD
app_2_pod_name = oc_create_tiny_pod_with_volume(
self.node, app_2_pvc_name, "test-pvc-mount-on-app-pod",
- mount_path=mount_path)
+ mount_path=mount_path, image=self.io_container_image_cirros)
self.addCleanup(
wait_for_resource_absence, self.node, 'pod', app_2_pod_name)
self.addCleanup(oc_delete, self.node, 'pod', app_2_pod_name)
@@ -225,7 +226,7 @@ class TestDynamicProvisioningP0(BaseClass):
# Create app POD with attached volume
pod_name = oc_create_tiny_pod_with_volume(
self.node, pvc_name, "test-pvc-mount-on-app-pod",
- mount_path=mount_path)
+ mount_path=mount_path, image=self.io_container_image_cirros)
self.addCleanup(
wait_for_resource_absence, self.node, 'pod', pod_name)
self.addCleanup(oc_delete, self.node, 'pod', pod_name)
@@ -312,7 +313,8 @@ class TestDynamicProvisioningP0(BaseClass):
pvc_name = self.create_and_wait_for_pvc(sc_name=sc_name)
# Create DC with POD and attached PVC to it.
- dc_name = oc_create_app_dc_with_io(self.node, pvc_name)
+ dc_name = oc_create_app_dc_with_io(
+ self.node, pvc_name, image=self.io_container_image_cirros)
self.addCleanup(oc_delete, self.node, 'dc', dc_name)
self.addCleanup(scale_dc_pod_amount_and_wait, self.node, dc_name, 0)
@@ -385,7 +387,8 @@ class TestDynamicProvisioningP0(BaseClass):
# Create DC with application PODs
dc_name = oc_create_app_dc_with_io(
- self.node, pvc_name, replicas=replicas)
+ self.node, pvc_name, replicas=replicas,
+ image=self.io_container_image_cirros)
self.addCleanup(oc_delete, self.node, 'dc', dc_name)
self.addCleanup(scale_dc_pod_amount_and_wait, self.node, dc_name, 0)
@@ -456,7 +459,8 @@ class TestDynamicProvisioningP0(BaseClass):
# Create DC with POD and attached PVC to it.
try:
- dc_name = oc_create_app_dc_with_io(self.node, self.pvc_name)
+ dc_name = oc_create_app_dc_with_io(
+ self.node, self.pvc_name, image=self.io_container_image_cirros)
pod_name = get_pod_name_from_dc(self.node, dc_name)
wait_for_pod_be_ready(self.node, pod_name)
finally:
diff --git a/tests/functional/provisioning/test_pv_resize.py b/tests/functional/provisioning/test_pv_resize.py
index dacdd992..f5833a99 100644
--- a/tests/functional/provisioning/test_pv_resize.py
+++ b/tests/functional/provisioning/test_pv_resize.py
@@ -70,7 +70,8 @@ class TestPvResizeClass(BaseClass):
pvc_name = self.create_and_wait_for_pvc()
# Create DC with POD and attached PVC to it.
- dc_name = oc_create_app_dc_with_io(node, pvc_name)
+ dc_name = oc_create_app_dc_with_io(
+ node, pvc_name, image=self.io_container_image_cirros)
self.addCleanup(oc_delete, node, 'dc', dc_name)
self.addCleanup(scale_dc_pod_amount_and_wait,
node, dc_name, 0)
@@ -194,7 +195,8 @@ class TestPvResizeClass(BaseClass):
pvc_name = self.create_and_wait_for_pvc(pvc_size=pvc_size_gb)
# Create DC with POD and attached PVC to it
- dc_name = oc_create_app_dc_with_io(self.node, pvc_name)
+ dc_name = oc_create_app_dc_with_io(
+ self.node, pvc_name, image=self.io_container_image_cirros)
self.addCleanup(oc_delete, self.node, 'dc', dc_name)
self.addCleanup(scale_dc_pod_amount_and_wait, self.node, dc_name, 0)
pod_name = get_pod_name_from_dc(self.node, dc_name)
@@ -270,7 +272,8 @@ class TestPvResizeClass(BaseClass):
pvc_name = self.create_and_wait_for_pvc(pvc_size=pv_size)
# Create DC with POD and attached PVC to it.
- dc_name = oc_create_app_dc_with_io(node, pvc_name)
+ dc_name = oc_create_app_dc_with_io(
+ node, pvc_name, image=self.io_container_image_cirros)
self.addCleanup(oc_delete, node, 'dc', dc_name)
self.addCleanup(scale_dc_pod_amount_and_wait,
node, dc_name, 0)
diff --git a/tests/functional/provisioning/test_storage_class_cases.py b/tests/functional/provisioning/test_storage_class_cases.py
index 27cfe822..976398db 100644
--- a/tests/functional/provisioning/test_storage_class_cases.py
+++ b/tests/functional/provisioning/test_storage_class_cases.py
@@ -146,7 +146,8 @@ class TestStorageClassCases(BaseClass):
"""
# create pod using pvc created
dc_name = oc_create_app_dc_with_io(
- self.ocp_master_node[0], self.pvc_name
+ self.ocp_master_node[0], self.pvc_name,
+ image=self.io_container_image_cirros
)
pod_name = get_pod_name_from_dc(self.ocp_master_node[0], dc_name)
self.addCleanup(oc_delete, self.ocp_master_node[0], "dc", dc_name)
diff --git a/tests/glusterfs-containers-tests-config.yaml b/tests/glusterfs-containers-tests-config.yaml
index 65409c4d..cbccfbf6 100644
--- a/tests/glusterfs-containers-tests-config.yaml
+++ b/tests/glusterfs-containers-tests-config.yaml
@@ -114,6 +114,12 @@ openshift:
prometheus_resources_selector: "<prometheus_recources_selector>"
alertmanager_resources_selector: "<alertmanager_resources_selector>"
+ # 'io_container_images' section covers the details of container images
+ # used for I/O
+ io_container_images:
+ cirros: quay.io/libpod/cirros
+ busybox: quay.io/prometheus/busybox
+
common:
allow_heketi_zones_update: False
check_heketi_db_inconsistencies: True