Skip to content

jobs: Unify all options under CLUSTER_VARIANT #6077

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

Merged
openshift-merge-robot merged 1 commit into from
Nov 25, 2019
Merged

jobs: Unify all options under CLUSTER_VARIANT #6077

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
4 changes: 2 additions & 2 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 @@ -100,10 +100,10 @@ presubmits:
command:
- ci-operator
env:
- name: CLUSTER_NETWORK_TYPE
value: OVNKubernetes
- name: CLUSTER_TYPE
value: aws
- name: CLUSTER_VARIANT
value: ovn
- name: CONFIG_SPEC
valueFrom:
configMapKeyRef:
Expand Down
8 changes: 4 additions & 4 deletions ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,13 +277,13 @@ presubmits:
env:
- name: CLUSTER_TYPE
value: aws
- name: CLUSTER_VARIANT
value: fips
- name: CONFIG_SPEC
valueFrom:
configMapKeyRef:
key: openshift-installer-master.yaml
name: ci-operator-master-configs
- name: ENABLE_FIPS
value: "true"
- name: JOB_NAME_SAFE
value: e2e-aws-fips
- name: TEST_COMMAND
Expand Down Expand Up @@ -346,13 +346,13 @@ presubmits:
env:
- name: CLUSTER_TYPE
value: aws
- name: CLUSTER_VARIANT
value: proxy
- name: CONFIG_SPEC
valueFrom:
configMapKeyRef:
key: openshift-installer-master.yaml
name: ci-operator-master-configs
- name: ENABLE_PROXY
value: "true"
- name: JOB_NAME_SAFE
value: e2e-aws-proxy
- name: TEST_COMMAND
Expand Down
8 changes: 4 additions & 4 deletions ci-operator/jobs/openshift/origin/openshift-origin-master-presubmits.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,13 +202,13 @@ presubmits:
env:
- name: CLUSTER_TYPE
value: aws
- name: CLUSTER_VARIANT
value: fips
- name: CONFIG_SPEC
valueFrom:
configMapKeyRef:
key: openshift-origin-master.yaml
name: ci-operator-master-configs
- name: ENABLE_FIPS
value: "true"
- name: JOB_NAME_SAFE
value: e2e-aws-fips
- name: TEST_COMMAND
Expand Down Expand Up @@ -484,10 +484,10 @@ presubmits:
command:
- ci-operator
env:
- name: CLUSTER_NETWORK_TYPE
value: OVNKubernetes
- name: CLUSTER_TYPE
value: aws
- name: CLUSTER_VARIANT
value: ovn
- name: CONFIG_SPEC
valueFrom:
configMapKeyRef:
Expand Down
4 changes: 2 additions & 2 deletions ci-operator/jobs/openshift/ovn-kubernetes/openshift-ovn-kubernetes-master-presubmits.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ presubmits:
command:
- ci-operator
env:
- name: CLUSTER_NETWORK_TYPE
value: OVNKubernetes
- name: CLUSTER_TYPE
value: aws
- name: CLUSTER_VARIANT
value: ovn
- name: CONFIG_SPEC
valueFrom:
configMapKeyRef:
Expand Down
7 changes: 7 additions & 0 deletions ci-operator/jobs/openshift/release/openshift-release-infra-periodics.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ periodics:
- ci-operator
env:
- name: RELEASE_IMAGE_LATEST
- name: CLUSTER_VARIANT
- name: CLUSTER_DURATION
value: "9000"
- name: BRANCH
Expand Down Expand Up @@ -115,6 +116,7 @@ periodics:
- ci-operator
env:
- name: RELEASE_IMAGE_LATEST
- name: CLUSTER_VARIANT
- name: CLUSTER_DURATION
value: "9000"
- name: BRANCH
Expand Down Expand Up @@ -209,6 +211,7 @@ periodics:
- ci-operator
env:
- name: RELEASE_IMAGE_LATEST
- name: CLUSTER_VARIANT
- name: CLUSTER_DURATION
value: "9000"
- name: BRANCH
Expand Down Expand Up @@ -301,6 +304,7 @@ periodics:
- ci-operator
env:
- name: RELEASE_IMAGE_LATEST
- name: CLUSTER_VARIANT
- name: CLUSTER_DURATION
value: "9000"
- name: BRANCH
Expand Down Expand Up @@ -393,6 +397,7 @@ periodics:
- ci-operator
env:
- name: RELEASE_IMAGE_LATEST
- name: CLUSTER_VARIANT
- name: CLUSTER_DURATION
value: "9000"
- name: BRANCH
Expand Down Expand Up @@ -484,6 +489,7 @@ periodics:
env:
- name: RELEASE_IMAGE_INITIAL
- name: RELEASE_IMAGE_LATEST
- name: CLUSTER_VARIANT
- name: BRANCH
value: "4.1"
- name: CLUSTER_TYPE
Expand Down Expand Up @@ -562,6 +568,7 @@ periodics:
env:
- name: RELEASE_IMAGE_INITIAL
- name: RELEASE_IMAGE_LATEST
- name: CLUSTER_VARIANT
- name: BRANCH
value: "4.1"
- name: CLUSTER_TYPE
Expand Down
32 changes: 16 additions & 16 deletions ci-operator/jobs/openshift/release/openshift-release-release-4.2-periodics.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,8 +422,8 @@ periodics:
value: "4.2"
- name: CLUSTER_TYPE
value: azure4
- name: ENABLE_FIPS
value: "true"
- name: CLUSTER_VARIANT
value: fips
- name: CONFIG_SPEC
value: |
tag_specification:
Expand Down Expand Up @@ -504,8 +504,8 @@ periodics:
value: "4.2"
- name: CLUSTER_TYPE
value: aws
- name: ENABLE_FIPS
value: "true"
- name: CLUSTER_VARIANT
value: fips
- name: CONFIG_SPEC
value: |
tag_specification:
Expand Down Expand Up @@ -586,8 +586,8 @@ periodics:
value: "4.2"
- name: CLUSTER_TYPE
value: aws
- name: ENABLE_PROXY
value: "true"
- name: CLUSTER_VARIANT
value: proxy
- name: CONFIG_SPEC
value: |
tag_specification:
Expand Down Expand Up @@ -1064,8 +1064,8 @@ periodics:
value: "4.2"
- name: CLUSTER_TYPE
value: gcp
- name: ENABLE_FIPS
value: "true"
- name: CLUSTER_VARIANT
value: fips
- name: CONFIG_SPEC
value: |
tag_specification:
Expand Down Expand Up @@ -1148,8 +1148,8 @@ periodics:
value: "4.2"
- name: CLUSTER_TYPE
value: azure4
- name: ENABLE_FIPS
value: "true"
- name: CLUSTER_VARIANT
value: fips
- name: CONFIG_SPEC
value: |
tag_specification:
Expand Down Expand Up @@ -1230,8 +1230,8 @@ periodics:
value: "4.2"
- name: CLUSTER_TYPE
value: aws
- name: ENABLE_FIPS
value: "true"
- name: CLUSTER_VARIANT
value: fips
- name: CONFIG_SPEC
value: |
tag_specification:
Expand Down Expand Up @@ -1476,8 +1476,8 @@ periodics:
value: "4.2"
- name: CLUSTER_TYPE
value: gcp
- name: ENABLE_FIPS
value: "true"
- name: CLUSTER_VARIANT
value: fips
- name: CONFIG_SPEC
value: |
tag_specification:
Expand Down Expand Up @@ -3380,6 +3380,8 @@ periodics:
value: "4.2"
- name: CLUSTER_TYPE
value: aws
- name: CLUSTER_VARIANT
value: mirror
- name: CONFIG_SPEC
value: |
tag_specification:
Expand All @@ -3399,8 +3401,6 @@ periodics:
cluster_profile: aws
- name: JOB_NAME_SAFE
value: e2e-aws
- name: ENABLE_MIRROR
value: "true"
- name: TEST_COMMAND
value: |
patch_image_specs
Expand Down
48 changes: 24 additions & 24 deletions ci-operator/jobs/openshift/release/openshift-release-release-4.3-periodics.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -783,8 +783,8 @@ periodics:
value: "4.3"
- name: CLUSTER_TYPE
value: aws
- name: CLUSTER_NETWORK_TYPE
value: OVNKubernetes
- name: CLUSTER_VARIANT
value: ovn
- name: CONFIG_SPEC
value: |
tag_specification:
Expand Down Expand Up @@ -861,8 +861,8 @@ periodics:
value: "4.3"
- name: CLUSTER_TYPE
value: aws
- name: CLUSTER_NETWORK_TYPE
value: OVNKubernetes
- name: CLUSTER_VARIANT
value: ovn
- name: CONFIG_SPEC
value: |
tag_specification:
Expand Down Expand Up @@ -939,8 +939,8 @@ periodics:
value: "4.3"
- name: CLUSTER_TYPE
value: gcp
- name: CLUSTER_NETWORK_TYPE
value: OVNKubernetes
- name: CLUSTER_VARIANT
value: ovn
- name: CONFIG_SPEC
value: |
tag_specification:
Expand Down Expand Up @@ -1017,8 +1017,8 @@ periodics:
value: "4.3"
- name: CLUSTER_TYPE
value: azure4
- name: CLUSTER_NETWORK_TYPE
value: OVNKubernetes
- name: CLUSTER_VARIANT
value: ovn
- name: CONFIG_SPEC
value: |
tag_specification:
Expand Down Expand Up @@ -1175,8 +1175,8 @@ periodics:
value: "4.3"
- name: CLUSTER_TYPE
value: azure4
- name: ENABLE_FIPS
value: "true"
- name: CLUSTER_VARIANT
value: fips
- name: CONFIG_SPEC
value: |
tag_specification:
Expand Down Expand Up @@ -1257,8 +1257,8 @@ periodics:
value: "4.3"
- name: CLUSTER_TYPE
value: aws
- name: ENABLE_FIPS
value: "true"
- name: CLUSTER_VARIANT
value: fips
- name: CONFIG_SPEC
value: |
tag_specification:
Expand Down Expand Up @@ -1339,8 +1339,8 @@ periodics:
value: "4.3"
- name: CLUSTER_TYPE
value: aws
- name: ENABLE_PROXY
value: "true"
- name: CLUSTER_VARIANT
value: proxy
- name: CONFIG_SPEC
value: |
tag_specification:
Expand Down Expand Up @@ -1817,8 +1817,8 @@ periodics:
value: "4.3"
- name: CLUSTER_TYPE
value: gcp
- name: ENABLE_FIPS
value: "true"
- name: CLUSTER_VARIANT
value: fips
- name: CONFIG_SPEC
value: |
tag_specification:
Expand Down Expand Up @@ -1901,8 +1901,8 @@ periodics:
value: "4.3"
- name: CLUSTER_TYPE
value: azure4
- name: ENABLE_FIPS
value: "true"
- name: CLUSTER_VARIANT
value: fips
- name: CONFIG_SPEC
value: |
tag_specification:
Expand Down Expand Up @@ -1983,8 +1983,8 @@ periodics:
value: "4.3"
- name: CLUSTER_TYPE
value: aws
- name: ENABLE_FIPS
value: "true"
- name: CLUSTER_VARIANT
value: fips
- name: CONFIG_SPEC
value: |
tag_specification:
Expand Down Expand Up @@ -2147,8 +2147,8 @@ periodics:
value: "4.3"
- name: CLUSTER_TYPE
value: gcp
- name: ENABLE_FIPS
value: "true"
- name: CLUSTER_VARIANT
value: fips
- name: CONFIG_SPEC
value: |
tag_specification:
Expand Down Expand Up @@ -4559,6 +4559,8 @@ periodics:
value: "4.3"
- name: CLUSTER_TYPE
value: aws
- name: CLUSTER_VARIANT
value: mirror
- name: CONFIG_SPEC
value: |
tag_specification:
Expand All @@ -4578,8 +4580,6 @@ periodics:
cluster_profile: aws
- name: JOB_NAME_SAFE
value: e2e-aws
- name: ENABLE_MIRROR
value: "true"
- name: TEST_COMMAND
value: |
patch_image_specs
Expand Down
Loading