Skip to content

openshift-metal3/dev-scripts: consistent job naming for metal-ipi #13769

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 20, 2020
Merged

openshift-metal3/dev-scripts: consistent job naming for metal-ipi #13769

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
35 changes: 28 additions & 7 deletions ci-operator/config/openshift-metal3/dev-scripts/openshift-metal3-dev-scripts-master.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,14 @@ tag_specification:
namespace: ocp
tests:
- as: e2e-metal-ipi
steps:
cluster_profile: packet
workflow: baremetalds-e2e
- as: e2e-metal-ipi-ovn-dualstack
steps:
cluster_profile: packet
env:
DEVSCRIPTS_CONFIG: |
IP_STACK=v4v6
NETWORK_TYPE=OVNKubernetes
IP_STACK=v4
NETWORK_TYPE=OpenShiftSDN
workflow: baremetalds-e2e
- as: e2e-metal-ipi-ocp-sdn-ipv4-upgrade
- as: e2e-metal-ipi-upgrade
steps:
cluster_profile: packet
env:
Expand All @@ -40,6 +36,31 @@ tests:
NETWORK_TYPE=OpenShiftSDN
Copy link
Contributor

@andfasano andfasano Nov 20, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What about adding IP_STACK=v4 here?

Copy link
Member Author

@stbenjam stbenjam Nov 20, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is there, expand the diff - it's line 39.

Copy link
Contributor

@andfasano andfasano Nov 20, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

RUN_UPGRADE_TEST: "true"
workflow: baremetalds-e2e-upgrade
- as: e2e-metal-ipi-ovn-ipv6
steps:
cluster_profile: packet
env:
DEVSCRIPTS_CONFIG: |
IP_STACK=v6
NETWORK_TYPE=OVNKubernetes
workflow: baremetalds-e2e
- as: e2e-metal-ipi-ovn-dualstack
steps:
cluster_profile: packet
env:
DEVSCRIPTS_CONFIG: |
IP_STACK=v4v6
NETWORK_TYPE=OVNKubernetes
workflow: baremetalds-e2e
- as: e2e-metal-ipi-virtualmedia
steps:
cluster_profile: packet
pre:
- ref: baremetalds-packet-setup
- ref: ipi-install-rbac
- ref: baremetalds-devscripts-conf-virtualmedia
- ref: baremetalds-devscripts-setup
workflow: baremetalds-e2e
zz_generated_metadata:
branch: master
org: openshift-metal3
Expand Down
163 changes: 148 additions & 15 deletions ...tor/jobs/openshift-metal3/dev-scripts/openshift-metal3-dev-scripts-master-presubmits.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,28 +66,29 @@ presubmits:
secretName: result-aggregator
trigger: (?m)^/test( | .* )e2e-metal-ipi,?($|\s.*)
- agent: kubernetes
always_run: true
always_run: false
branches:
- master
cluster: build02
context: ci/prow/e2e-metal-ipi-ocp-sdn-ipv4-upgrade
context: ci/prow/e2e-metal-ipi-ovn-dualstack
decorate: true
decoration_config:
skip_cloning: true
labels:
ci-operator.openshift.io/prowgen-controlled: "true"
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-metal3-dev-scripts-master-e2e-metal-ipi-ocp-sdn-ipv4-upgrade
rerun_command: /test e2e-metal-ipi-ocp-sdn-ipv4-upgrade
name: pull-ci-openshift-metal3-dev-scripts-master-e2e-metal-ipi-ovn-dualstack
optional: true
rerun_command: /test e2e-metal-ipi-ovn-dualstack
spec:
containers:
- args:
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
- --lease-server-password-file=/etc/boskos/password
- --report-password-file=/etc/report/password.txt
- --report-username=ci
- --secret-dir=/usr/local/e2e-metal-ipi-ocp-sdn-ipv4-upgrade-cluster-profile
- --target=e2e-metal-ipi-ocp-sdn-ipv4-upgrade
- --secret-dir=/usr/local/e2e-metal-ipi-ovn-dualstack-cluster-profile
- --target=e2e-metal-ipi-ovn-dualstack
command:
- ci-operator
image: ci-operator:latest
Expand All @@ -100,7 +101,7 @@ presubmits:
- mountPath: /etc/boskos
name: boskos
readOnly: true
- mountPath: /usr/local/e2e-metal-ipi-ocp-sdn-ipv4-upgrade-cluster-profile
- mountPath: /usr/local/e2e-metal-ipi-ovn-dualstack-cluster-profile
name: cluster-profile
- mountPath: /etc/pull-secret
name: pull-secret
Expand Down Expand Up @@ -129,30 +130,30 @@ presubmits:
- name: result-aggregator
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )e2e-metal-ipi-ocp-sdn-ipv4-upgrade,?($|\s.*)
trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-dualstack,?($|\s.*)
- agent: kubernetes
always_run: true
branches:
- master
cluster: build02
context: ci/prow/e2e-metal-ipi-ovn-dualstack
context: ci/prow/e2e-metal-ipi-ovn-ipv6
decorate: true
decoration_config:
skip_cloning: true
labels:
ci-operator.openshift.io/prowgen-controlled: "true"
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-metal3-dev-scripts-master-e2e-metal-ipi-ovn-dualstack
rerun_command: /test e2e-metal-ipi-ovn-dualstack
name: pull-ci-openshift-metal3-dev-scripts-master-e2e-metal-ipi-ovn-ipv6
rerun_command: /test e2e-metal-ipi-ovn-ipv6
spec:
containers:
- args:
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
- --lease-server-password-file=/etc/boskos/password
- --report-password-file=/etc/report/password.txt
- --report-username=ci
- --secret-dir=/usr/local/e2e-metal-ipi-ovn-dualstack-cluster-profile
- --target=e2e-metal-ipi-ovn-dualstack
- --secret-dir=/usr/local/e2e-metal-ipi-ovn-ipv6-cluster-profile
- --target=e2e-metal-ipi-ovn-ipv6
command:
- ci-operator
image: ci-operator:latest
Expand All @@ -165,7 +166,7 @@ presubmits:
- mountPath: /etc/boskos
name: boskos
readOnly: true
- mountPath: /usr/local/e2e-metal-ipi-ovn-dualstack-cluster-profile
- mountPath: /usr/local/e2e-metal-ipi-ovn-ipv6-cluster-profile
name: cluster-profile
- mountPath: /etc/pull-secret
name: pull-secret
Expand Down Expand Up @@ -194,7 +195,139 @@ presubmits:
- name: result-aggregator
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-dualstack,?($|\s.*)
trigger: (?m)^/test( | .* )e2e-metal-ipi-ovn-ipv6,?($|\s.*)
- agent: kubernetes
always_run: false
branches:
- master
cluster: build02
context: ci/prow/e2e-metal-ipi-upgrade
decorate: true
decoration_config:
skip_cloning: true
labels:
ci-operator.openshift.io/prowgen-controlled: "true"
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-metal3-dev-scripts-master-e2e-metal-ipi-upgrade
optional: true
rerun_command: /test e2e-metal-ipi-upgrade
spec:
containers:
- args:
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
- --lease-server-password-file=/etc/boskos/password
- --report-password-file=/etc/report/password.txt
- --report-username=ci
- --secret-dir=/usr/local/e2e-metal-ipi-upgrade-cluster-profile
- --target=e2e-metal-ipi-upgrade
command:
- ci-operator
image: ci-operator:latest
imagePullPolicy: Always
name: ""
resources:
requests:
cpu: 10m
volumeMounts:
- mountPath: /etc/boskos
name: boskos
readOnly: true
- mountPath: /usr/local/e2e-metal-ipi-upgrade-cluster-profile
name: cluster-profile
- mountPath: /etc/pull-secret
name: pull-secret
readOnly: true
- mountPath: /etc/report
name: result-aggregator
readOnly: true
serviceAccountName: ci-operator
volumes:
- name: boskos
secret:
items:
- key: password
path: password
secretName: boskos-credentials
- name: cluster-profile
projected:
sources:
- secret:
name: cluster-secrets-packet
- configMap:
name: cluster-profile-packet
- name: pull-secret
secret:
secretName: registry-pull-credentials
- name: result-aggregator
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )e2e-metal-ipi-upgrade,?($|\s.*)
- agent: kubernetes
always_run: false
branches:
- master
cluster: build02
context: ci/prow/e2e-metal-ipi-virtualmedia
decorate: true
decoration_config:
skip_cloning: true
labels:
ci-operator.openshift.io/prowgen-controlled: "true"
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-metal3-dev-scripts-master-e2e-metal-ipi-virtualmedia
optional: true
rerun_command: /test e2e-metal-ipi-virtualmedia
spec:
containers:
- args:
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
- --lease-server-password-file=/etc/boskos/password
- --report-password-file=/etc/report/password.txt
- --report-username=ci
- --secret-dir=/usr/local/e2e-metal-ipi-virtualmedia-cluster-profile
- --target=e2e-metal-ipi-virtualmedia
command:
- ci-operator
image: ci-operator:latest
imagePullPolicy: Always
name: ""
resources:
requests:
cpu: 10m
volumeMounts:
- mountPath: /etc/boskos
name: boskos
readOnly: true
- mountPath: /usr/local/e2e-metal-ipi-virtualmedia-cluster-profile
name: cluster-profile
- mountPath: /etc/pull-secret
name: pull-secret
readOnly: true
- mountPath: /etc/report
name: result-aggregator
readOnly: true
serviceAccountName: ci-operator
volumes:
- name: boskos
secret:
items:
- key: password
path: password
secretName: boskos-credentials
- name: cluster-profile
projected:
sources:
- secret:
name: cluster-secrets-packet
- configMap:
name: cluster-profile-packet
- name: pull-secret
secret:
secretName: registry-pull-credentials
- name: result-aggregator
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )e2e-metal-ipi-virtualmedia,?($|\s.*)
- agent: kubernetes
always_run: true
branches:
Expand Down