@@ -372,17 +372,13 @@ apply_yaml_files() {
372372 common::create_configmap_from_file " dynamic-global-header-config" " $project " \
373373 " dynamic-global-header-config.yaml" " $dir /resources/config_map/dynamic-global-header-config.yaml"
374374
375- # Skip Topology resources for K8s deployments (AKS/EKS/GKE)
376- if [[ " $JOB_NAME " != * " aks" * && " $JOB_NAME " != * " eks" * && " $JOB_NAME " != * " gke" * ]]; then
377- # Create Deployment and Pipeline for Topology test.
378- oc apply -f " $dir /resources/topology_test/topology-test.yaml" --namespace=" ${project} "
379- if [[ -z " ${IS_OPENSHIFT} " || " ${IS_OPENSHIFT} " == " false" ]]; then
380- kubectl apply -f " $dir /resources/topology_test/topology-test-ingress.yaml" --namespace=" ${project} "
381- else
382- oc apply -f " $dir /resources/topology_test/topology-test-route.yaml" --namespace=" ${project} "
383- fi
375+ # Create Deployment and Pipeline for Topology test.
376+ oc apply -f " $dir /resources/topology_test/topology-test.yaml" --namespace=" ${project} "
377+
378+ if [[ -z " ${IS_OPENSHIFT} " || " ${IS_OPENSHIFT} " == " false" ]]; then
379+ kubectl apply -f " $dir /resources/topology_test/topology-test-ingress.yaml" --namespace=" ${project} "
384380 else
385- log::info " Skipping Topology resources for K8s deployment ( ${JOB_NAME} ) "
381+ oc apply -f " $dir / resources/topology_test/topology-test-route.yaml " --namespace= " ${project} "
386382 fi
387383
388384 rm -rf " ${tmpdir} "
@@ -478,12 +474,16 @@ cluster_setup_ocp_operator() {
478474
479475cluster_setup_k8s_operator () {
480476 operator::install_olm
477+ # Install Tekton Pipelines for K8s deployments (AKS/EKS/GKE) for topology tests to work
478+ operator::install_tekton
481479 # operator::install_postgres_k8s # Works with K8s but disabled in values file
482480}
483481
484482cluster_setup_k8s_helm () {
485- log::info " No additional cluster setup required for K8s Helm deployment"
483+ # Install Tekton Pipelines for K8s deployments (AKS/EKS/GKE) for topology tests to work
484+ log::info " Installing Tekton Pipelines for K8s Helm deployment"
486485 # operator::install_olm
486+ operator::install_tekton
487487 # operator::install_postgres_k8s # Works with K8s but disabled in values file
488488}
489489
0 commit comments