Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wking wants to merge 1 commit into from
Closed

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...enshift-priv/cluster-network-operator/openshift-priv-cluster-network-operator-master.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ tests:
openshift_installer:
cluster_profile: gcp
- as: e2e-gcp-ovn-upgrade
commands: CLUSTER_NETWORK_TYPE=OVNKubernetes TEST_SUITE=all run-upgrade-tests
commands: TEST_SUITE=all run-upgrade-tests
openshift_installer:
cluster_profile: gcp
upgrade: true
Expand Down
2 changes: 1 addition & 1 deletion ...ft-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.3.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ tests:
openshift_installer:
cluster_profile: gcp
- as: e2e-gcp-ovn-upgrade
commands: CLUSTER_NETWORK_TYPE=OVNKubernetes TEST_SUITE=all run-upgrade-tests
commands: TEST_SUITE=all run-upgrade-tests
openshift_installer:
cluster_profile: gcp
upgrade: true
Expand Down
2 changes: 1 addition & 1 deletion ...ft-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.4.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ tests:
openshift_installer:
cluster_profile: gcp
- as: e2e-gcp-ovn-upgrade
commands: CLUSTER_NETWORK_TYPE=OVNKubernetes TEST_SUITE=all run-upgrade-tests
commands: TEST_SUITE=all run-upgrade-tests
openshift_installer:
cluster_profile: gcp
upgrade: true
Expand Down
2 changes: 1 addition & 1 deletion ...ft-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.5.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ tests:
openshift_installer:
cluster_profile: gcp
- as: e2e-gcp-ovn-upgrade
commands: CLUSTER_NETWORK_TYPE=OVNKubernetes TEST_SUITE=all run-upgrade-tests
commands: TEST_SUITE=all run-upgrade-tests
openshift_installer:
cluster_profile: gcp
upgrade: true
Expand Down
2 changes: 1 addition & 1 deletion ...ft-priv/cluster-network-operator/openshift-priv-cluster-network-operator-release-4.6.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ tests:
openshift_installer:
cluster_profile: gcp
- as: e2e-gcp-ovn-upgrade
commands: CLUSTER_NETWORK_TYPE=OVNKubernetes TEST_SUITE=all run-upgrade-tests
commands: TEST_SUITE=all run-upgrade-tests
openshift_installer:
cluster_profile: gcp
upgrade: true
Expand Down
2 changes: 1 addition & 1 deletion .../config/openshift/cluster-network-operator/openshift-cluster-network-operator-master.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ tests:
openshift_installer:
cluster_profile: gcp
- as: e2e-gcp-ovn-upgrade
commands: CLUSTER_NETWORK_TYPE=OVNKubernetes TEST_SUITE=all run-upgrade-tests
commands: TEST_SUITE=all run-upgrade-tests
openshift_installer:
cluster_profile: gcp
upgrade: true
Expand Down
2 changes: 1 addition & 1 deletion ...ig/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.3.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ tests:
openshift_installer:
cluster_profile: gcp
- as: e2e-gcp-ovn-upgrade
commands: CLUSTER_NETWORK_TYPE=OVNKubernetes TEST_SUITE=all run-upgrade-tests
commands: TEST_SUITE=all run-upgrade-tests
openshift_installer:
cluster_profile: gcp
upgrade: true
Expand Down
2 changes: 1 addition & 1 deletion ...ig/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.4.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ tests:
openshift_installer:
cluster_profile: gcp
- as: e2e-gcp-ovn-upgrade
commands: CLUSTER_NETWORK_TYPE=OVNKubernetes TEST_SUITE=all run-upgrade-tests
commands: TEST_SUITE=all run-upgrade-tests
openshift_installer:
cluster_profile: gcp
upgrade: true
Expand Down
2 changes: 1 addition & 1 deletion ...ig/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.5.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ tests:
openshift_installer:
cluster_profile: gcp
- as: e2e-gcp-ovn-upgrade
commands: CLUSTER_NETWORK_TYPE=OVNKubernetes TEST_SUITE=all run-upgrade-tests
commands: TEST_SUITE=all run-upgrade-tests
openshift_installer:
cluster_profile: gcp
upgrade: true
Expand Down
2 changes: 1 addition & 1 deletion ...ig/openshift/cluster-network-operator/openshift-cluster-network-operator-release-4.6.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ tests:
openshift_installer:
cluster_profile: gcp
- as: e2e-gcp-ovn-upgrade
commands: CLUSTER_NETWORK_TYPE=OVNKubernetes TEST_SUITE=all run-upgrade-tests
commands: TEST_SUITE=all run-upgrade-tests
openshift_installer:
cluster_profile: gcp
upgrade: true
Expand Down
5 changes: 5 additions & 0 deletions ...v/cluster-network-operator/openshift-priv-cluster-network-operator-master-presubmits.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,11 @@ 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: ""
Expand Down
5 changes: 5 additions & 0 deletions ...ster-network-operator/openshift-priv-cluster-network-operator-release-4.3-presubmits.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,11 @@ 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: ""
Expand Down
5 changes: 5 additions & 0 deletions ...ster-network-operator/openshift-priv-cluster-network-operator-release-4.4-presubmits.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,11 @@ 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: ""
Expand Down
5 changes: 5 additions & 0 deletions ...ster-network-operator/openshift-priv-cluster-network-operator-release-4.5-presubmits.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,11 @@ 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: ""
Expand Down
5 changes: 5 additions & 0 deletions ...ster-network-operator/openshift-priv-cluster-network-operator-release-4.6-presubmits.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,11 @@ 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: ""
Expand Down
5 changes: 5 additions & 0 deletions ...nshift/cluster-network-operator/openshift-cluster-network-operator-master-presubmits.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,6 +429,11 @@ 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: ""
Expand Down
5 changes: 5 additions & 0 deletions ...t/cluster-network-operator/openshift-cluster-network-operator-release-4.3-presubmits.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,11 @@ 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: ""
Expand Down
5 changes: 5 additions & 0 deletions ...t/cluster-network-operator/openshift-cluster-network-operator-release-4.4-presubmits.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,6 +429,11 @@ 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: ""
Expand Down
5 changes: 5 additions & 0 deletions ...t/cluster-network-operator/openshift-cluster-network-operator-release-4.5-presubmits.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,11 @@ 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: ""
Expand Down
5 changes: 5 additions & 0 deletions ...t/cluster-network-operator/openshift-cluster-network-operator-release-4.6-presubmits.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,6 +327,11 @@ 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: ""
Expand Down
3 changes: 1 addition & 2 deletions ci-operator/templates/openshift/installer/cluster-launch-installer-custom-test-image.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ parameters:
required: true
- name: BASE_DOMAIN
- name: CLUSTER_NETWORK_MANIFEST
- name: CLUSTER_NETWORK_TYPE
- name: CLUSTER_VARIANT
- name: BUILD_ID
required: false
Expand Down Expand Up @@ -597,7 +596,7 @@ objects:
EOF
fi

network_type="${CLUSTER_NETWORK_TYPE-}"
network_type=
if [[ "${CLUSTER_VARIANT}" =~ "ovn" ]]; then
network_type=OVNKubernetes
fi
Expand Down
3 changes: 1 addition & 2 deletions ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ parameters:
required: true
- name: BASE_DOMAIN
- name: CLUSTER_NETWORK_MANIFEST
- name: CLUSTER_NETWORK_TYPE
- name: BUILD_ID
required: false
- name: CLUSTER_VARIANT
Expand Down Expand Up @@ -691,7 +690,7 @@ objects:
EOF
fi

network_type="${CLUSTER_NETWORK_TYPE-}"
network_type=
if has_variant "ovn"; then
network_type=OVNKubernetes
fi
Expand Down
3 changes: 1 addition & 2 deletions ci-operator/templates/openshift/installer/cluster-launch-installer-metal-e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ parameters:
- name: BASE_DOMAIN
value: origin-ci-int-aws.dev.rhcloud.com
- name: CLUSTER_NETWORK_MANIFEST
- name: CLUSTER_NETWORK_TYPE
- name: BUILD_ID
required: false
- name: CLUSTER_VARIANT
Expand Down Expand Up @@ -371,7 +370,7 @@ objects:
EOF
fi

network_type="${CLUSTER_NETWORK_TYPE-}"
network_type=
if [[ "${CLUSTER_VARIANT}" =~ "ovn" ]]; then
network_type=OVNKubernetes
fi
Expand Down
3 changes: 1 addition & 2 deletions ci-operator/templates/openshift/installer/cluster-launch-installer-src.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ parameters:
- name: RELEASE_IMAGE_LATEST
required: true
- name: BASE_DOMAIN
- name: CLUSTER_NETWORK_TYPE
- name: CLUSTER_VARIANT
- name: BUILD_ID
required: false
Expand Down Expand Up @@ -528,7 +527,7 @@ objects:
EOF
fi

network_type="${CLUSTER_NETWORK_TYPE-}"
network_type=
if [[ "${CLUSTER_VARIANT}" =~ "ovn" ]]; then
network_type=OVNKubernetes
fi
Expand Down