Skip to content

Commit 99c6850

Browse files
committed
Remove DeploymentConfig commands as it is already deprecated
and not available since OpenShift 4.14+ Signed-off-by: Petr "Stone" Hracek <[email protected]>
1 parent bc49c74 commit 99c6850

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

test-lib-openshift.sh

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -566,12 +566,9 @@ function ct_os_test_s2i_app_func() {
566566
local check_command_exp
567567
local image_id
568568

569-
# get image ID from the deployment config
570-
image_id=$(oc get "deploymentconfig.apps.openshift.io/${service_name}" -o custom-columns=IMAGE:.spec.template.spec.containers[*].image | tail -n 1)
571-
572569
ip=$(ct_os_get_service_ip "${service_name}")
573570
# shellcheck disable=SC2001
574-
check_command_exp=$(echo "$check_command" | sed -e "s/<IP>/$ip/g" -e "s|<SAME_IMAGE>|${image_id}|g")
571+
check_command_exp=$(echo "$check_command" | sed -e "s/<IP>/$ip/g")
575572

576573
echo " Checking APP using $check_command_exp ..."
577574
local result=0
@@ -712,12 +709,9 @@ function ct_os_test_template_app_func() {
712709
local check_command_exp
713710
local image_id
714711

715-
# get image ID from the deployment config
716-
image_id=$(oc get "deploymentconfig.apps.openshift.io/${service_name}" -o custom-columns=IMAGE:.spec.template.spec.containers[*].image | tail -n 1)
717-
718712
ip=$(ct_os_get_service_ip "${service_name}")
719713
# shellcheck disable=SC2001
720-
check_command_exp=$(echo "$check_command" | sed -e "s/<IP>/$ip/g" -e "s|<SAME_IMAGE>|${image_id}|g")
714+
check_command_exp=$(echo "$check_command" | sed -e "s/<IP>/$ip/g")
721715

722716
echo " Checking APP using $check_command_exp ..."
723717
local result=0

0 commit comments

Comments
 (0)