Skip to content

Commit

Permalink
WINC-921: FF community-4.12 branch and introduce community periodic (#…
Browse files Browse the repository at this point in the history
…36314)

* add missing variable formatting

This commit adds '$' and double quotes to the DESTINATION_BRANCH variable to be
able to read the expanded variable in INFO messages and git commands.

Signed-off-by: Alina Ryan <[email protected]>

* fast-forward community-4.12 branch

This commit fast-forwards the commits on the release-4.12 branch to the
community-4.12 branch using the windows fast-forward workflow. This
prevents us from having to backport release-4.12 PRs to community-4.12 manually.

Updated config and ran:
'sudo make jobs WHAT=openshift/windows-machine-config-operator CONTAINER_ENGINE=podman'

Signed-off-by: Alina Ryan <[email protected]>

* introduce community periodic with slack alerting

This commit changes the community-4.12 and 4.13 okd aws-e2e-operator
test from a presubmit to a periodic test since we will no longer be
backporting to community branches. The job runs daily at midnight
and sends failed job alerts to #forum-winc to warn the team not to
use the test's bundle manifests in the next community WMCO release
to avoid broken community releases.

Also removes skip_if_only_changed regex since the regex and the
scheduled periodic are mutually exclusive.

Updated community-4.12 and community-4.13 configs and ran:
'sudo make jobs WHAT=openshift/windows-machine-config-operator CONTAINER_ENGINE=podman'
Manually added the reporter_config stanza to the job

Signed-off-by: Alina Ryan <[email protected]>

---------

Signed-off-by: Alina Ryan <[email protected]>
  • Loading branch information
alinaryan authored Feb 14, 2023
1 parent ff9e5d2 commit 9032cc0
Show file tree
Hide file tree
Showing 9 changed files with 229 additions and 156 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ tests:
container:
from: src
- as: aws-e2e-operator
skip_if_only_changed: ^(?:docs|\.github)/|\.md$|^(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
cron: 0 0 * * *
steps:
cluster_profile: aws
env:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ tests:
container:
from: src
- as: aws-e2e-operator
skip_if_only_changed: ^(?:docs|\.github)/|\.md$|^(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
cron: 0 0 * * *
steps:
cluster_profile: aws
env:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,13 @@ tests:
- chain: upi-vsphere-windows-pre
test:
- ref: windows-unit-wicd
- as: community-fast-forward
postsubmit: true
steps:
env:
DESTINATION_BRANCH: community-4.12
SOURCE_BRANCH: release-4.12
workflow: windows-ci-fastforward
zz_generated_metadata:
branch: release-4.12
org: openshift
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
periodics:
- agent: kubernetes
cluster: build05
cron: 0 0 * * *
decorate: true
extra_refs:
- base_ref: community-4.12
org: openshift
repo: windows-machine-config-operator
labels:
ci-operator.openshift.io/cloud: aws
ci-operator.openshift.io/cloud-cluster-profile: aws
ci-operator.openshift.io/variant: okd
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: periodic-ci-openshift-windows-machine-config-operator-community-4.12-okd-aws-e2e-operator
reporter_config:
slack:
channel: '#forum-winc'
job_states_to_report:
- failure
- error
report_template: '<!subteam^S025TMX0LF3> :warning: Job *{{.Spec.Job}}* ended
with *{{.Status.State}}*. Commit reference: *{{.Refs.Baselink}}* <{{.Status.URL}}|View
logs>. Please investigate. :warning: Recommended not to use this bundle for
the next community WMCO release.'
spec:
containers:
- args:
- --gcs-upload-secret=/secrets/gcs/service-account.json
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
- --lease-server-credentials-file=/etc/boskos/credentials
- --report-credentials-file=/etc/report/credentials
- --secret-dir=/secrets/ci-pull-credentials
- --secret-dir=/usr/local/aws-e2e-operator-cluster-profile
- --target=aws-e2e-operator
- --variant=okd
command:
- ci-operator
image: ci-operator:latest
imagePullPolicy: Always
name: ""
resources:
requests:
cpu: 10m
volumeMounts:
- mountPath: /etc/boskos
name: boskos
readOnly: true
- mountPath: /secrets/ci-pull-credentials
name: ci-pull-credentials
readOnly: true
- mountPath: /usr/local/aws-e2e-operator-cluster-profile
name: cluster-profile
- mountPath: /secrets/gcs
name: gcs-credentials
readOnly: true
- 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: credentials
path: credentials
secretName: boskos-credentials
- name: ci-pull-credentials
secret:
secretName: ci-pull-credentials
- name: cluster-profile
secret:
secretName: cluster-secrets-aws
- name: pull-secret
secret:
secretName: registry-pull-credentials
- name: result-aggregator
secret:
secretName: result-aggregator
Original file line number Diff line number Diff line change
@@ -1,80 +1,5 @@
presubmits:
openshift/windows-machine-config-operator:
- agent: kubernetes
always_run: false
branches:
- ^community-4\.12$
- ^community-4\.12-
cluster: build01
context: ci/prow/okd-aws-e2e-operator
decorate: true
labels:
ci-operator.openshift.io/cloud: aws
ci-operator.openshift.io/cloud-cluster-profile: aws
ci-operator.openshift.io/variant: okd
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-windows-machine-config-operator-community-4.12-okd-aws-e2e-operator
rerun_command: /test okd-aws-e2e-operator
skip_if_only_changed: ^(?:docs|\.github)/|\.md$|^(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
spec:
containers:
- args:
- --gcs-upload-secret=/secrets/gcs/service-account.json
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
- --lease-server-credentials-file=/etc/boskos/credentials
- --report-credentials-file=/etc/report/credentials
- --secret-dir=/secrets/ci-pull-credentials
- --secret-dir=/usr/local/aws-e2e-operator-cluster-profile
- --target=aws-e2e-operator
- --variant=okd
command:
- ci-operator
image: ci-operator:latest
imagePullPolicy: Always
name: ""
resources:
requests:
cpu: 10m
volumeMounts:
- mountPath: /etc/boskos
name: boskos
readOnly: true
- mountPath: /secrets/ci-pull-credentials
name: ci-pull-credentials
readOnly: true
- mountPath: /usr/local/aws-e2e-operator-cluster-profile
name: cluster-profile
- mountPath: /secrets/gcs
name: gcs-credentials
readOnly: true
- 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: credentials
path: credentials
secretName: boskos-credentials
- name: ci-pull-credentials
secret:
secretName: ci-pull-credentials
- name: cluster-profile
secret:
secretName: cluster-secrets-aws
- name: pull-secret
secret:
secretName: registry-pull-credentials
- name: result-aggregator
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )okd-aws-e2e-operator,?($|\s.*)
- agent: kubernetes
always_run: true
branches:
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
periodics:
- agent: kubernetes
cluster: build05
cron: 0 0 * * *
decorate: true
extra_refs:
- base_ref: community-4.13
org: openshift
repo: windows-machine-config-operator
labels:
ci-operator.openshift.io/cloud: aws
ci-operator.openshift.io/cloud-cluster-profile: aws
ci-operator.openshift.io/variant: okd
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: periodic-ci-openshift-windows-machine-config-operator-community-4.13-okd-aws-e2e-operator
reporter_config:
slack:
channel: '#forum-winc'
job_states_to_report:
- failure
- error
report_template: '<!subteam^S025TMX0LF3> :warning: Job *{{.Spec.Job}}* ended
with *{{.Status.State}}*. Commit reference: *{{.Refs.Baselink}}* <{{.Status.URL}}|View
logs>. Please investigate. :warning: Recommended not to use this bundle for
the next community WMCO release.'
spec:
containers:
- args:
- --gcs-upload-secret=/secrets/gcs/service-account.json
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
- --lease-server-credentials-file=/etc/boskos/credentials
- --report-credentials-file=/etc/report/credentials
- --secret-dir=/secrets/ci-pull-credentials
- --secret-dir=/usr/local/aws-e2e-operator-cluster-profile
- --target=aws-e2e-operator
- --variant=okd
command:
- ci-operator
image: ci-operator:latest
imagePullPolicy: Always
name: ""
resources:
requests:
cpu: 10m
volumeMounts:
- mountPath: /etc/boskos
name: boskos
readOnly: true
- mountPath: /secrets/ci-pull-credentials
name: ci-pull-credentials
readOnly: true
- mountPath: /usr/local/aws-e2e-operator-cluster-profile
name: cluster-profile
- mountPath: /secrets/gcs
name: gcs-credentials
readOnly: true
- 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: credentials
path: credentials
secretName: boskos-credentials
- name: ci-pull-credentials
secret:
secretName: ci-pull-credentials
- name: cluster-profile
secret:
secretName: cluster-secrets-aws
- name: pull-secret
secret:
secretName: registry-pull-credentials
- name: result-aggregator
secret:
secretName: result-aggregator
Original file line number Diff line number Diff line change
@@ -1,80 +1,5 @@
presubmits:
openshift/windows-machine-config-operator:
- agent: kubernetes
always_run: false
branches:
- ^community-4\.13$
- ^community-4\.13-
cluster: build01
context: ci/prow/okd-aws-e2e-operator
decorate: true
labels:
ci-operator.openshift.io/cloud: aws
ci-operator.openshift.io/cloud-cluster-profile: aws
ci-operator.openshift.io/variant: okd
ci.openshift.io/generator: prowgen
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-windows-machine-config-operator-community-4.13-okd-aws-e2e-operator
rerun_command: /test okd-aws-e2e-operator
skip_if_only_changed: ^(?:docs|\.github)/|\.md$|^(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
spec:
containers:
- args:
- --gcs-upload-secret=/secrets/gcs/service-account.json
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
- --lease-server-credentials-file=/etc/boskos/credentials
- --report-credentials-file=/etc/report/credentials
- --secret-dir=/secrets/ci-pull-credentials
- --secret-dir=/usr/local/aws-e2e-operator-cluster-profile
- --target=aws-e2e-operator
- --variant=okd
command:
- ci-operator
image: ci-operator:latest
imagePullPolicy: Always
name: ""
resources:
requests:
cpu: 10m
volumeMounts:
- mountPath: /etc/boskos
name: boskos
readOnly: true
- mountPath: /secrets/ci-pull-credentials
name: ci-pull-credentials
readOnly: true
- mountPath: /usr/local/aws-e2e-operator-cluster-profile
name: cluster-profile
- mountPath: /secrets/gcs
name: gcs-credentials
readOnly: true
- 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: credentials
path: credentials
secretName: boskos-credentials
- name: ci-pull-credentials
secret:
secretName: ci-pull-credentials
- name: cluster-profile
secret:
secretName: cluster-secrets-aws
- name: pull-secret
secret:
secretName: registry-pull-credentials
- name: result-aggregator
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )okd-aws-e2e-operator,?($|\s.*)
- agent: kubernetes
always_run: true
branches:
Expand Down
Loading

0 comments on commit 9032cc0

Please sign in to comment.