Merge branch 'master' into f/watsonx-runtimeup

bdattoma · Oct 20, 2023 · d2062bb · d2062bb
2 parents dc840af + acc0e86
commit d2062bb
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/ods_ci/tests/Resources/Page/Operators/OpenShiftPipelines.resource b/ods_ci/tests/Resources/Page/Operators/OpenShiftPipelines.resource
@@ -20,19 +20,16 @@ Install Red Hat OpenShift Pipelines
     [Documentation]    Install Red Hat OpenShift Pipelines operator depending on
     ...     OpenShift version, platform (AWS/GCP/...) and RHODS flavor (Managed/Self-Managed) with the objective of
     ...     testing all the operator versions without having to test all possible combinations:
-    ...     - OpenShift 4.10:                      OpenShift Pipelines 1.8
     ...     - OpenShift 4.11:                      OpenShift Pipelines 1.9
     ...     - OpenShift 4.12, 4.13 (AWS and GCP):  OpenShift Pipelines 1.10 / 1.11 (depending on platform and flavor)
     ...     - OpenShift >= 4.12 (OpenStack):       OpenShift Pipelines 1.11
-    ...     - OpenShift 4.14:                      OpenShift Pipelines 1.11
+    ...     - OpenShift 4.14:                      OpenShift Pipelines 1.12
     ...     Note: the complete operator compatiblity matrix is published at
     ...      https://docs.openshift.com/container-platform/4.13/cicd/pipelines/op-release-notes.html
     ${oc_version}=    Get OpenShift Version
     ${is_self_managed}=    Is RHODS Self-Managed
     ${platform}=    Fetch Cluster Platform Type
-    IF    "4.10" in "${oc_version}"
-        ${openshift_pipelines_version}=    Set Variable    pipelines-1.8"
-    ELSE IF    "4.11" in "${oc_version}"
+    IF    "4.11" in "${oc_version}"
         ${openshift_pipelines_version}=    Set Variable    pipelines-1.9
     ELSE IF    "4.12" in "${oc_version}" or "4.13" in "${oc_version}"
         IF    ${is_self_managed} == ${TRUE} and "${platform}" == "AWS"
@@ -44,10 +41,12 @@ Install Red Hat OpenShift Pipelines
         ELSE IF    ${is_self_managed} == ${FALSE} and "${platform}" == "GCP"
             ${openshift_pipelines_version}=    Set Variable    pipelines-1.10
         ELSE
-            ${openshift_pipelines_version}=    Set Variable    pipelines-1.11
+            ${openshift_pipelines_version}=    Set Variable    pipelines-1.12
         END
+    ELSE IF    "4.14" in "${oc_version}"
+        ${openshift_pipelines_version}=    Set Variable    pipelines-1.12
     ELSE
-        ${openshift_pipelines_version}=    Set Variable    pipelines-1.11
+        ${openshift_pipelines_version}=    Set Variable    pipelines-1.12
     END
     Log    message=Installing OpenShift Pipelines operator: ${openshift_pipelines_version} (${platform} ${oc_version} Self-Managed: ${is_self_managed})
     ...    console=True