From 48c8fba3606aad35032b09e852ce480ab6c614e7 Mon Sep 17 00:00:00 2001 From: timflannagan Date: Mon, 14 Mar 2022 16:37:35 -0400 Subject: [PATCH 1/2] olm: Add dedicated flaky e2e prowjob --- ...enshift-operator-framework-olm-master.yaml | 14 +++- ...t-operator-framework-olm-release-4.12.yaml | 14 +++- ...rator-framework-olm-master-presubmits.yaml | 72 +++++++++++++++++++ ...framework-olm-release-4.12-presubmits.yaml | 72 +++++++++++++++++++ 4 files changed, 170 insertions(+), 2 deletions(-) diff --git a/ci-operator/config/openshift/operator-framework-olm/openshift-operator-framework-olm-master.yaml b/ci-operator/config/openshift/operator-framework-olm/openshift-operator-framework-olm-master.yaml index 03e958b481c72..cce746ee1a4a5 100755 --- a/ci-operator/config/openshift/operator-framework-olm/openshift-operator-framework-olm-master.yaml +++ b/ci-operator/config/openshift/operator-framework-olm/openshift-operator-framework-olm-master.yaml @@ -80,7 +80,19 @@ tests: test: - as: test cli: latest - commands: JUNIT_DIRECTORY=${ARTIFACT_DIR} make e2e/olm + commands: JUNIT_DIRECTORY=${ARTIFACT_DIR} make e2e/olm SKIP='\[FLAKE\]' + from: ci-image + resources: + requests: + cpu: 100m + workflow: ipi-aws +- as: e2e-aws-olm-flaky + steps: + cluster_profile: aws + test: + - as: test + cli: latest + commands: JUNIT_DIRECTORY=${ARTIFACT_DIR} make e2e/olm TEST='\[FLAKE\]' from: ci-image resources: requests: diff --git a/ci-operator/config/openshift/operator-framework-olm/openshift-operator-framework-olm-release-4.12.yaml b/ci-operator/config/openshift/operator-framework-olm/openshift-operator-framework-olm-release-4.12.yaml index 382b1524c027a..2c6059032b20c 100644 --- a/ci-operator/config/openshift/operator-framework-olm/openshift-operator-framework-olm-release-4.12.yaml +++ b/ci-operator/config/openshift/operator-framework-olm/openshift-operator-framework-olm-release-4.12.yaml @@ -80,7 +80,19 @@ tests: test: - as: test cli: latest - commands: JUNIT_DIRECTORY=${ARTIFACT_DIR} make e2e/olm + commands: JUNIT_DIRECTORY=${ARTIFACT_DIR} make e2e/olm SKIP='\[FLAKE\]' + from: ci-image + resources: + requests: + cpu: 100m + workflow: ipi-aws +- as: e2e-aws-olm-flaky + steps: + cluster_profile: aws + test: + - as: test + cli: latest + commands: JUNIT_DIRECTORY=${ARTIFACT_DIR} make e2e/olm TEST='\[FLAKE\]' from: ci-image resources: requests: diff --git a/ci-operator/jobs/openshift/operator-framework-olm/openshift-operator-framework-olm-master-presubmits.yaml b/ci-operator/jobs/openshift/operator-framework-olm/openshift-operator-framework-olm-master-presubmits.yaml index 61b0c0a41e067..3ab0ca54f1717 100644 --- a/ci-operator/jobs/openshift/operator-framework-olm/openshift-operator-framework-olm-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/operator-framework-olm/openshift-operator-framework-olm-master-presubmits.yaml @@ -144,6 +144,78 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-aws-olm,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - ^master$ + - ^master- + cluster: build02 + context: ci/prow/e2e-aws-olm-flaky + decorate: true + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: aws + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-operator-framework-olm-master-e2e-aws-olm-flaky + rerun_command: /test e2e-aws-olm-flaky + 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/e2e-aws-olm-flaky-cluster-profile + - --target=e2e-aws-olm-flaky + 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/e2e-aws-olm-flaky-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( | .* )e2e-aws-olm-flaky,?($|\s.*) - agent: kubernetes always_run: true branches: diff --git a/ci-operator/jobs/openshift/operator-framework-olm/openshift-operator-framework-olm-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift/operator-framework-olm/openshift-operator-framework-olm-release-4.12-presubmits.yaml index d5a5df59bf49b..91421c185e727 100644 --- a/ci-operator/jobs/openshift/operator-framework-olm/openshift-operator-framework-olm-release-4.12-presubmits.yaml +++ b/ci-operator/jobs/openshift/operator-framework-olm/openshift-operator-framework-olm-release-4.12-presubmits.yaml @@ -144,6 +144,78 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-aws-olm,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - ^release-4\.12$ + - ^release-4\.12- + cluster: build02 + context: ci/prow/e2e-aws-olm-flaky + decorate: true + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: aws + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-operator-framework-olm-release-4.12-e2e-aws-olm-flaky + rerun_command: /test e2e-aws-olm-flaky + 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/e2e-aws-olm-flaky-cluster-profile + - --target=e2e-aws-olm-flaky + 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/e2e-aws-olm-flaky-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( | .* )e2e-aws-olm-flaky,?($|\s.*) - agent: kubernetes always_run: true branches: From 5c7a59e0048f9a8ba1af2d5edd18420ea90f689a Mon Sep 17 00:00:00 2001 From: timflannagan Date: Mon, 14 Mar 2022 16:43:46 -0400 Subject: [PATCH 2/2] olm: Ensure the e2e-aws-olm-flaky prowjob is optional --- .../openshift-operator-framework-olm-master.yaml | 1 + .../openshift-operator-framework-olm-release-4.12.yaml | 1 + .../openshift-operator-framework-olm-master-presubmits.yaml | 1 + ...openshift-operator-framework-olm-release-4.12-presubmits.yaml | 1 + 4 files changed, 4 insertions(+) diff --git a/ci-operator/config/openshift/operator-framework-olm/openshift-operator-framework-olm-master.yaml b/ci-operator/config/openshift/operator-framework-olm/openshift-operator-framework-olm-master.yaml index cce746ee1a4a5..0c172d37fe36e 100755 --- a/ci-operator/config/openshift/operator-framework-olm/openshift-operator-framework-olm-master.yaml +++ b/ci-operator/config/openshift/operator-framework-olm/openshift-operator-framework-olm-master.yaml @@ -87,6 +87,7 @@ tests: cpu: 100m workflow: ipi-aws - as: e2e-aws-olm-flaky + optional: true steps: cluster_profile: aws test: diff --git a/ci-operator/config/openshift/operator-framework-olm/openshift-operator-framework-olm-release-4.12.yaml b/ci-operator/config/openshift/operator-framework-olm/openshift-operator-framework-olm-release-4.12.yaml index 2c6059032b20c..72b6313c6578e 100644 --- a/ci-operator/config/openshift/operator-framework-olm/openshift-operator-framework-olm-release-4.12.yaml +++ b/ci-operator/config/openshift/operator-framework-olm/openshift-operator-framework-olm-release-4.12.yaml @@ -87,6 +87,7 @@ tests: cpu: 100m workflow: ipi-aws - as: e2e-aws-olm-flaky + optional: true steps: cluster_profile: aws test: diff --git a/ci-operator/jobs/openshift/operator-framework-olm/openshift-operator-framework-olm-master-presubmits.yaml b/ci-operator/jobs/openshift/operator-framework-olm/openshift-operator-framework-olm-master-presubmits.yaml index 3ab0ca54f1717..0182e53299c9b 100644 --- a/ci-operator/jobs/openshift/operator-framework-olm/openshift-operator-framework-olm-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/operator-framework-olm/openshift-operator-framework-olm-master-presubmits.yaml @@ -158,6 +158,7 @@ presubmits: ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-operator-framework-olm-master-e2e-aws-olm-flaky + optional: true rerun_command: /test e2e-aws-olm-flaky spec: containers: diff --git a/ci-operator/jobs/openshift/operator-framework-olm/openshift-operator-framework-olm-release-4.12-presubmits.yaml b/ci-operator/jobs/openshift/operator-framework-olm/openshift-operator-framework-olm-release-4.12-presubmits.yaml index 91421c185e727..7866245b69fc8 100644 --- a/ci-operator/jobs/openshift/operator-framework-olm/openshift-operator-framework-olm-release-4.12-presubmits.yaml +++ b/ci-operator/jobs/openshift/operator-framework-olm/openshift-operator-framework-olm-release-4.12-presubmits.yaml @@ -158,6 +158,7 @@ presubmits: ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-operator-framework-olm-release-4.12-e2e-aws-olm-flaky + optional: true rerun_command: /test e2e-aws-olm-flaky spec: containers: