From 197a38034a1e81e84fcdfeef2f34c470b9cb832d Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Tue, 15 Mar 2022 17:08:52 -0400 Subject: [PATCH] machine-config-operator: Drop `skip_if_only_changed` for all `optional: true` jobs The machine-config-operator is a key component of OpenShift 4 that touches on many things, from OKD to single node to bare metal magic to networking. We even used to handle etcd. We have accumulated a giant pile of jobs due to this. But not every job needs to run on every PR - it's at best a waste of money, and at worst a huge distraction because every pull request is accompanied by a giant pile of red "X"'s by default. Now, many of these jobs are actually `optional: true` - their failure will not block merges. And in theory, they shouldn't run by default; but many of them got a `skip_if_only_changed` annotation to avoid them only docs changed, but that annotation isn't implemented in the way one would expect. It appears to be a simple *inverse* of `run_if_changed`. Which means that all these optional jobs are still triggered for not-documentation PRs. So by just dropping this, we should return to not running these jobs by default. People touching things that might affect bare metal specifically will need to e.g. invoke `/test e2e-metal-ipi` explicitly now, and similar for the other jobs. --- .../openshift-machine-config-operator-master.yaml | 10 ---------- ...ift-machine-config-operator-master-presubmits.yaml | 11 ----------- 2 files changed, 21 deletions(-) diff --git a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-master.yaml b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-master.yaml index 62d5e692d095b..cf5daf28a403e 100644 --- a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-master.yaml +++ b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-master.yaml @@ -84,7 +84,6 @@ tests: workflow: openshift-upgrade-azure-ovn - as: e2e-aws-serial optional: true - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$ steps: cluster_profile: aws workflow: openshift-e2e-aws-serial @@ -123,7 +122,6 @@ tests: workflow: openshift-upgrade-azure - as: e2e-aws-workers-rhel8 optional: true - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$ steps: cluster_profile: aws env: @@ -131,7 +129,6 @@ tests: workflow: openshift-e2e-aws-workers-rhel - as: e2e-aws-ovn-workers-rhel8 optional: true - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$ steps: cluster_profile: aws env: @@ -139,7 +136,6 @@ tests: workflow: openshift-e2e-aws-ovn-workers-rhel - as: e2e-aws-disruptive optional: true - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$ steps: cluster_profile: aws workflow: openshift-e2e-aws-disruption @@ -162,7 +158,6 @@ tests: workflow: openshift-e2e-vsphere-upi - as: e2e-metal-ipi optional: true - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$ steps: cluster_profile: equinix-ocp-metal workflow: baremetalds-e2e-ipv4 @@ -198,13 +193,11 @@ tests: workflow: openshift-e2e-vsphere - as: e2e-vsphere-upgrade optional: true - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$ steps: cluster_profile: vsphere workflow: openshift-upgrade-vsphere - as: e2e-ovn-step-registry optional: true - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$ steps: cluster_profile: aws workflow: openshift-e2e-aws-ovn @@ -225,7 +218,6 @@ tests: workflow: openshift-upgrade-ovirt - as: e2e-aws-single-node optional: true - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$ steps: cluster_profile: aws workflow: openshift-e2e-aws-single-node @@ -236,7 +228,6 @@ tests: workflow: openshift-e2e-gcp-single-node - as: e2e-gcp-op-single-node optional: true - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$ steps: cluster_profile: gcp test: @@ -250,7 +241,6 @@ tests: workflow: openshift-e2e-gcp-single-node - as: e2e-aws-upgrade-single-node optional: true - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$ steps: cluster_profile: aws workflow: openshift-upgrade-aws-single-node diff --git a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-master-presubmits.yaml b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-master-presubmits.yaml index 97169393636f5..9f082954594ad 100644 --- a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-master-presubmits.yaml @@ -282,7 +282,6 @@ presubmits: name: pull-ci-openshift-machine-config-operator-master-e2e-aws-disruptive optional: true rerun_command: /test e2e-aws-disruptive - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$ spec: containers: - args: @@ -356,7 +355,6 @@ presubmits: name: pull-ci-openshift-machine-config-operator-master-e2e-aws-ovn-workers-rhel8 optional: true rerun_command: /test e2e-aws-ovn-workers-rhel8 - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$ spec: containers: - args: @@ -503,7 +501,6 @@ presubmits: name: pull-ci-openshift-machine-config-operator-master-e2e-aws-serial optional: true rerun_command: /test e2e-aws-serial - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$ spec: containers: - args: @@ -577,7 +574,6 @@ presubmits: name: pull-ci-openshift-machine-config-operator-master-e2e-aws-single-node optional: true rerun_command: /test e2e-aws-single-node - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$ spec: containers: - args: @@ -724,7 +720,6 @@ presubmits: name: pull-ci-openshift-machine-config-operator-master-e2e-aws-upgrade-single-node optional: true rerun_command: /test e2e-aws-upgrade-single-node - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$ spec: containers: - args: @@ -798,7 +793,6 @@ presubmits: name: pull-ci-openshift-machine-config-operator-master-e2e-aws-workers-rhel8 optional: true rerun_command: /test e2e-aws-workers-rhel8 - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$ spec: containers: - args: @@ -1168,7 +1162,6 @@ presubmits: name: pull-ci-openshift-machine-config-operator-master-e2e-gcp-op-single-node optional: true rerun_command: /test e2e-gcp-op-single-node - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$ spec: containers: - args: @@ -1473,7 +1466,6 @@ presubmits: name: pull-ci-openshift-machine-config-operator-master-e2e-metal-ipi optional: true rerun_command: /test e2e-metal-ipi - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$ spec: containers: - args: @@ -1994,7 +1986,6 @@ presubmits: name: pull-ci-openshift-machine-config-operator-master-e2e-ovn-step-registry optional: true rerun_command: /test e2e-ovn-step-registry - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$ spec: containers: - args: @@ -2141,7 +2132,6 @@ presubmits: name: pull-ci-openshift-machine-config-operator-master-e2e-vsphere-upgrade optional: true rerun_command: /test e2e-vsphere-upgrade - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$ spec: containers: - args: @@ -2338,7 +2328,6 @@ presubmits: name: pull-ci-openshift-machine-config-operator-master-okd-e2e-aws optional: true rerun_command: /test okd-e2e-aws - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|OWNERS_ALIASES|LICENSE)$ spec: containers: - args: