ci-operator: Drop CLUSTER_NETWORK_TYPE (in favor of CLUSTER_VARIANT)

[wking]

CLUSTER_NETWORK_TYPE is from ade608f (#4295). But we've had ovn in CLUSTER_VARIANT since 8176a42 (#6077). Drop CLUSTER_NETWORK_TYPE (which was only set by e2e-gcp-ovn-upgrade jobs) and use CLUSTER_VARIANT instead.

Spun off from here, CC @dcbw.

[wking]

Hrm, generated-config complains:

diff -Naupr .//ci-operator/jobs/openshift/cluster-network-operator/openshift-cluster-network-operator-master-presubmits.yaml /tmp/tmp.Ys1YRKVEzA/ci-operator/jobs/openshift/cluster-network-operator/openshift-cluster-network-operator-master-presubmits.yaml
--- .//ci-operator/jobs/openshift/cluster-network-operator/openshift-cluster-network-operator-master-presubmits.yaml	2020-03-12 22:36:00.575093993 +0000
+++ /tmp/tmp.Ys1YRKVEzA/ci-operator/jobs/openshift/cluster-network-operator/openshift-cluster-network-operator-master-presubmits.yaml	2020-03-12 22:36:31.702699093 +0000
@@ -429,11 +429,6 @@ presubmits:
         - --target=e2e-gcp-ovn-upgrade
         command:
         - ci-operator
-        env:
-        - name: CLUSTER_TYPE
-          value: gcp
-        - name: CLUSTER_VARIANT
-          value: ovn
         image: ci-operator:latest
         imagePullPolicy: Always
         name: ""

and similar. I was modeling on this; what did I do wrong?

[openshift-ci-robot]

@wking: The following tests failed, say /retest to rerun all failed tests:

Test name	Commit	Details	Rerun command
ci/prow/generated-config	2f442c8	link	/test generated-config
ci/rehearse/openshift/cluster-network-operator/release-4.6/e2e-gcp-ovn-upgrade	2f442c8	link	/test pj-rehearse
ci/rehearse/openshift/cluster-network-operator/release-4.5/e2e-gcp-ovn-upgrade	2f442c8	link	/test pj-rehearse
ci/rehearse/openshift/cluster-network-operator/master/e2e-gcp-ovn-upgrade	2f442c8	link	/test pj-rehearse
ci/rehearse/openshift/cluster-network-operator/release-4.3/e2e-gcp-ovn-upgrade	2f442c8	link	/test pj-rehearse
ci/prow/pj-rehearse	2f442c8	link	/test pj-rehearse
ci/rehearse/openshift/cluster-api-actuator-pkg/master/e2e-azure-operator	2f442c8	link	/test pj-rehearse
ci/rehearse/kubevirt/kubevirt/master/e2e	2f442c8	link	/test pj-rehearse

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

[dcbw]

/lgtm

but I couldn't figure out why the validation is complaining after looking for 5m

[openshift-ci-robot]

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: dcbw, wking
To complete the pull request process, please assign sdodson
You can assign the PR to them by writing /assign @sdodson in a comment when ready.

The full list of commands accepted by this bot can be found here.

Details

Needs approval from an approver in each of these files:

• ci-operator/config/OWNERS
• ci-operator/jobs/OWNERS
• ci-operator/templates/openshift/installer/OWNERS [wking]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[wking]

/close

CLUSTER_NETWORK_TYPE is probably going to be deprecated, but probably not by replacing it with CLUSTER_VARIANT. Instead, it will be replaced by OVN-specific multi-step workflows that include OVN steps to perform any OVN-specific activity (e.g. appending to the install config, setting up custom networking, whatever). More on that pivot here.

[openshift-ci-robot]

@wking: Closed this PR.

Details

In response to this:

/close

CLUSTER_NETWORK_TYPE is probably going to be deprecated, but probably not by replacing it with CLUSTER_VARIANT. Instead, it will be replaced by OVN-specific multi-step workflows that include OVN steps to perform any OVN-specific activity (e.g. appending to the install config, setting up custom networking, whatever). More on that pivot here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.