@@ -2730,21 +2730,23 @@ periodics:
27302730 memory: 200Mi
27312731 tests:
27322732 - as: e2e-$(CLUSTER_TYPE)
2733- commands: TEST_SUITE=openshift/conformance/parallel run-tests
2734- openshift_installer:
2733+ steps:
27352734 cluster_profile: "$(CLUSTER_TYPE)"
2735+ workflow: openshift-e2e-$(CLUSTER_TYPE)
27362736 - as: e2e-$(CLUSTER_TYPE)-serial
2737- commands: TEST_SUITE=openshift/conformance/serial run-tests
2738- openshift_installer:
2737+ steps:
27392738 cluster_profile: "$(CLUSTER_TYPE)"
2739+ workflow: openshift-e2e-$(CLUSTER_TYPE)-serial
27402740 - as: e2e-$(CLUSTER_TYPE)-upgrade
27412741 steps:
27422742 cluster_profile: "$(CLUSTER_TYPE)"
27432743 workflow: openshift-upgrade-$(CLUSTER_TYPE)
27442744 - as: launch-$(CLUSTER_TYPE)
2745- commands: sleep 9000 & wait
2746- openshift_installer:
2745+ steps:
27472746 cluster_profile: "$(CLUSTER_TYPE)"
2747+ test:
2748+ - ref: clusterbot-wait
2749+ workflow: openshift-e2e-$(CLUSTER_TYPE)
27482750 image : quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
27492751 imagePullPolicy : Always
27502752 name : " "
@@ -2933,22 +2935,23 @@ periodics:
29332935 memory: 200Mi
29342936 tests:
29352937 - as: e2e-$(CLUSTER_TYPE)
2936- commands: TEST_SUITE=openshift/conformance/parallel run-tests
2937- openshift_installer:
2938+ steps:
29382939 cluster_profile: "$(CLUSTER_TYPE)"
2940+ workflow: openshift-e2e-$(CLUSTER_TYPE)
29392941 - as: e2e-$(CLUSTER_TYPE)-serial
2940- commands: TEST_SUITE=openshift/conformance/serial run-tests
2941- openshift_installer:
2942+ steps:
29422943 cluster_profile: "$(CLUSTER_TYPE)"
2944+ workflow: openshift-e2e-$(CLUSTER_TYPE)-serial
29432945 - as: e2e-$(CLUSTER_TYPE)-upgrade
2944- commands: TEST_SUITE=all run-upgrade-tests
2945- openshift_installer:
2946+ steps:
29462947 cluster_profile: "$(CLUSTER_TYPE)"
2947- upgrade: true
2948+ workflow: openshift-upgrade-$(CLUSTER_TYPE)
29482949 - as: launch-$(CLUSTER_TYPE)
2949- commands: sleep 9000 & wait
2950- openshift_installer:
2950+ steps:
29512951 cluster_profile: "$(CLUSTER_TYPE)"
2952+ test:
2953+ - ref: clusterbot-wait
2954+ workflow: openshift-e2e-$(CLUSTER_TYPE)
29522955 image : quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
29532956 imagePullPolicy : Always
29542957 name : " "
@@ -3032,22 +3035,23 @@ periodics:
30323035 memory: 200Mi
30333036 tests:
30343037 - as: e2e-$(CLUSTER_TYPE)
3035- commands: TEST_SUITE=openshift/conformance/parallel run-tests
3036- openshift_installer:
3038+ steps:
30373039 cluster_profile: "$(CLUSTER_TYPE)"
3040+ workflow: openshift-e2e-$(CLUSTER_TYPE)
30383041 - as: e2e-$(CLUSTER_TYPE)-serial
3039- commands: TEST_SUITE=openshift/conformance/serial run-tests
3040- openshift_installer:
3042+ steps:
30413043 cluster_profile: "$(CLUSTER_TYPE)"
3044+ workflow: openshift-e2e-$(CLUSTER_TYPE)-serial
30423045 - as: e2e-$(CLUSTER_TYPE)-upgrade
3043- commands: TEST_SUITE=all run-upgrade-tests
3044- openshift_installer:
3046+ steps:
30453047 cluster_profile: "$(CLUSTER_TYPE)"
3046- upgrade: true
3048+ workflow: openshift-upgrade-$(CLUSTER_TYPE)
30473049 - as: launch-$(CLUSTER_TYPE)
3048- commands: sleep 9000 & wait
3049- openshift_installer:
3050+ steps:
30503051 cluster_profile: "$(CLUSTER_TYPE)"
3052+ test:
3053+ - ref: clusterbot-wait
3054+ workflow: openshift-e2e-$(CLUSTER_TYPE)
30513055 image : quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
30523056 imagePullPolicy : Always
30533057 name : " "
0 commit comments