diff --git a/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-master.yaml b/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-master.yaml index ec43fd5335ed7..b2e161aecbf75 100644 --- a/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-master.yaml +++ b/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-master.yaml @@ -52,6 +52,18 @@ tests: steps: cluster_profile: gcp workflow: openshift-e2e-gcp +- as: e2e-agnostic-operator + steps: + cluster_profile: gcp + test: + - as: e2e-test + commands: hack/test-integration.sh + from: src + resources: + requests: + cpu: 100m + memory: 200Mi + workflow: openshift-e2e-gcp - as: e2e-agnostic-upgrade steps: cluster_profile: gcp diff --git a/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.4.yaml b/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.4.yaml index cc60620478ca2..f7d1ee9fecdef 100644 --- a/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.4.yaml +++ b/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.4.yaml @@ -39,6 +39,18 @@ tests: steps: cluster_profile: gcp workflow: openshift-e2e-gcp +- as: e2e-agnostic-operator + steps: + cluster_profile: gcp + test: + - as: e2e-test + commands: hack/test-integration.sh + from: src + resources: + requests: + cpu: 100m + memory: 200Mi + workflow: openshift-e2e-gcp - as: e2e-upgrade commands: TEST_SUITE=all TEST_OPTIONS=abort-at=100 run-upgrade-tests openshift_installer: diff --git a/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.5.yaml b/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.5.yaml index ceeaa5edf2a3c..418ba1a6ba719 100644 --- a/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.5.yaml +++ b/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.5.yaml @@ -39,6 +39,18 @@ tests: steps: cluster_profile: gcp workflow: openshift-e2e-gcp +- as: e2e-agnostic-operator + steps: + cluster_profile: gcp + test: + - as: e2e-test + commands: hack/test-integration.sh + from: src + resources: + requests: + cpu: 100m + memory: 200Mi + workflow: openshift-e2e-gcp - as: e2e-agnostic-upgrade steps: cluster_profile: gcp diff --git a/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.6.yaml b/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.6.yaml index 025e06a2c9ff2..f67bd49ef026b 100644 --- a/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.6.yaml +++ b/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.6.yaml @@ -44,6 +44,18 @@ tests: steps: cluster_profile: gcp workflow: openshift-e2e-gcp +- as: e2e-agnostic-operator + steps: + cluster_profile: gcp + test: + - as: e2e-test + commands: hack/test-integration.sh + from: src + resources: + requests: + cpu: 100m + memory: 200Mi + workflow: openshift-e2e-gcp - as: e2e-agnostic-upgrade steps: cluster_profile: gcp diff --git a/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.7.yaml b/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.7.yaml index 3ade9cbc245b1..83d0407077ccb 100644 --- a/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.7.yaml +++ b/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.7.yaml @@ -53,6 +53,18 @@ tests: steps: cluster_profile: gcp workflow: openshift-e2e-gcp +- as: e2e-agnostic-operator + steps: + cluster_profile: gcp + test: + - as: e2e-test + commands: hack/test-integration.sh + from: src + resources: + requests: + cpu: 100m + memory: 200Mi + workflow: openshift-e2e-gcp - as: e2e-agnostic-upgrade steps: cluster_profile: gcp diff --git a/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.8.yaml b/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.8.yaml index 3bfa13baab6ea..5b305f424b8e4 100644 --- a/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.8.yaml +++ b/ci-operator/config/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.8.yaml @@ -52,6 +52,18 @@ tests: steps: cluster_profile: gcp workflow: openshift-e2e-gcp +- as: e2e-agnostic-operator + steps: + cluster_profile: gcp + test: + - as: e2e-test + commands: hack/test-integration.sh + from: src + resources: + requests: + cpu: 100m + memory: 200Mi + workflow: openshift-e2e-gcp - as: e2e-agnostic-upgrade steps: cluster_profile: gcp diff --git a/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-master-presubmits.yaml b/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-master-presubmits.yaml index 3df85887119b5..3caa022a5b29f 100644 --- a/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-master-presubmits.yaml @@ -65,6 +65,71 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-agnostic,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - master + cluster: build02 + context: ci/prow/e2e-agnostic-operator + 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-cluster-version-operator-master-e2e-agnostic-operator + rerun_command: /test e2e-agnostic-operator + 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-agnostic-operator-cluster-profile + - --target=e2e-agnostic-operator + 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-agnostic-operator-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-gcp + - configMap: + name: cluster-profile-gcp + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )e2e-agnostic-operator,?($|\s.*) - agent: kubernetes always_run: true branches: @@ -287,67 +352,6 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )images,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - master - cluster: build02 - context: ci/prow/integration - decorate: true - labels: - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-cluster-version-operator-master-integration - rerun_command: /test integration - spec: - containers: - - args: - - --artifact-dir=$(ARTIFACTS) - - --give-pr-author-access-to-namespace=true - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --kubeconfig=/etc/apici/kubeconfig - - --repo=cluster-version-operator - - --target=integration - - --template=/usr/local/integration - command: - - ci-operator - env: - - name: COMMAND - value: hack/test-integration.sh - - name: JOB_NAME_SAFE - value: integration - - name: LOCAL_IMAGE_TEST_BIN - value: pipeline:src - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /etc/apici - name: apici-ci-operator-credentials - readOnly: true - - mountPath: /usr/local/integration - name: job-definition - subPath: master-sidecar-4.6.yaml - - mountPath: /etc/pull-secret - name: pull-secret - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: apici-ci-operator-credentials - secret: - items: - - key: sa.ci-operator.apici.config - path: kubeconfig - secretName: apici-ci-operator-credentials - - configMap: - name: prow-job-master-sidecar-4.6 - name: job-definition - - name: pull-secret - secret: - secretName: registry-pull-credentials - trigger: (?m)^/test( | .* )integration,?($|\s.*) - agent: kubernetes always_run: true branches: diff --git a/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.4-presubmits.yaml b/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.4-presubmits.yaml index 09a608a8cd627..1e32c835b9c26 100644 --- a/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.4-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.4-presubmits.yaml @@ -70,15 +70,15 @@ presubmits: branches: - release-4.4 cluster: build02 - context: ci/prow/e2e-upgrade + context: ci/prow/e2e-agnostic-operator 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-cluster-version-operator-release-4.4-e2e-upgrade - rerun_command: /test e2e-upgrade + name: pull-ci-openshift-cluster-version-operator-release-4.4-e2e-agnostic-operator + rerun_command: /test e2e-agnostic-operator spec: containers: - args: @@ -86,8 +86,8 @@ presubmits: - --lease-server-password-file=/etc/boskos/password - --report-password-file=/etc/report/password.txt - --report-username=ci - - --secret-dir=/usr/local/e2e-upgrade-cluster-profile - - --target=e2e-upgrade + - --secret-dir=/usr/local/e2e-agnostic-operator-cluster-profile + - --target=e2e-agnostic-operator command: - ci-operator image: ci-operator:latest @@ -100,7 +100,7 @@ presubmits: - mountPath: /etc/boskos name: boskos readOnly: true - - mountPath: /usr/local/e2e-upgrade-cluster-profile + - mountPath: /usr/local/e2e-agnostic-operator-cluster-profile name: cluster-profile - mountPath: /etc/pull-secret name: pull-secret @@ -129,29 +129,30 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-upgrade,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-agnostic-operator,?($|\s.*) - agent: kubernetes always_run: true branches: - release-4.4 cluster: build02 - context: ci/prow/images + context: ci/prow/e2e-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-cluster-version-operator-release-4.4-images - rerun_command: /test images + name: pull-ci-openshift-cluster-version-operator-release-4.4-e2e-upgrade + rerun_command: /test e2e-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 - - --target=[images] - - --target=[release:latest] + - --secret-dir=/usr/local/e2e-upgrade-cluster-profile + - --target=e2e-upgrade command: - ci-operator image: ci-operator:latest @@ -161,6 +162,11 @@ presubmits: requests: cpu: 10m volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /usr/local/e2e-upgrade-cluster-profile + name: cluster-profile - mountPath: /etc/pull-secret name: pull-secret readOnly: true @@ -169,43 +175,50 @@ presubmits: 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-gcp + - configMap: + name: cluster-profile-gcp - name: pull-secret secret: secretName: registry-pull-credentials - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )images,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-upgrade,?($|\s.*) - agent: kubernetes always_run: true branches: - release-4.4 cluster: build02 - context: ci/prow/integration + context: ci/prow/images 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-cluster-version-operator-release-4.4-integration - rerun_command: /test integration + name: pull-ci-openshift-cluster-version-operator-release-4.4-images + rerun_command: /test images spec: containers: - args: - - --artifact-dir=$(ARTIFACTS) - - --give-pr-author-access-to-namespace=true - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --kubeconfig=/etc/apici/kubeconfig - - --repo=cluster-version-operator - - --target=integration - - --template=/usr/local/integration + - --report-password-file=/etc/report/password.txt + - --report-username=ci + - --target=[images] + - --target=[release:latest] command: - ci-operator - env: - - name: COMMAND - value: hack/test-integration.sh - - name: JOB_NAME_SAFE - value: integration - - name: LOCAL_IMAGE_TEST_BIN - value: pipeline:src image: ci-operator:latest imagePullPolicy: Always name: "" @@ -213,30 +226,21 @@ presubmits: requests: cpu: 10m volumeMounts: - - mountPath: /etc/apici - name: apici-ci-operator-credentials - readOnly: true - - mountPath: /usr/local/integration - name: job-definition - subPath: master-sidecar-4.4.yaml - mountPath: /etc/pull-secret name: pull-secret readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true serviceAccountName: ci-operator volumes: - - name: apici-ci-operator-credentials - secret: - items: - - key: sa.ci-operator.apici.config - path: kubeconfig - secretName: apici-ci-operator-credentials - - configMap: - name: prow-job-master-sidecar-4.4 - name: job-definition - name: pull-secret secret: secretName: registry-pull-credentials - trigger: (?m)^/test( | .* )integration,?($|\s.*) + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )images,?($|\s.*) - agent: kubernetes always_run: true branches: diff --git a/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.5-presubmits.yaml b/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.5-presubmits.yaml index aea7746b6fcb5..edad98369eed0 100644 --- a/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.5-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.5-presubmits.yaml @@ -65,6 +65,71 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-agnostic,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - release-4.5 + cluster: build02 + context: ci/prow/e2e-agnostic-operator + 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-cluster-version-operator-release-4.5-e2e-agnostic-operator + rerun_command: /test e2e-agnostic-operator + 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-agnostic-operator-cluster-profile + - --target=e2e-agnostic-operator + 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-agnostic-operator-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-gcp + - configMap: + name: cluster-profile-gcp + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )e2e-agnostic-operator,?($|\s.*) - agent: kubernetes always_run: true branches: diff --git a/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.6-presubmits.yaml b/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.6-presubmits.yaml index ce46b23384ab8..74ff9d1f9b373 100644 --- a/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.6-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.6-presubmits.yaml @@ -70,15 +70,15 @@ presubmits: branches: - release-4.6 cluster: build02 - context: ci/prow/e2e-agnostic-upgrade + context: ci/prow/e2e-agnostic-operator 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-cluster-version-operator-release-4.6-e2e-agnostic-upgrade - rerun_command: /test e2e-agnostic-upgrade + name: pull-ci-openshift-cluster-version-operator-release-4.6-e2e-agnostic-operator + rerun_command: /test e2e-agnostic-operator spec: containers: - args: @@ -86,8 +86,8 @@ presubmits: - --lease-server-password-file=/etc/boskos/password - --report-password-file=/etc/report/password.txt - --report-username=ci - - --secret-dir=/usr/local/e2e-agnostic-upgrade-cluster-profile - - --target=e2e-agnostic-upgrade + - --secret-dir=/usr/local/e2e-agnostic-operator-cluster-profile + - --target=e2e-agnostic-operator command: - ci-operator image: ci-operator:latest @@ -100,7 +100,7 @@ presubmits: - mountPath: /etc/boskos name: boskos readOnly: true - - mountPath: /usr/local/e2e-agnostic-upgrade-cluster-profile + - mountPath: /usr/local/e2e-agnostic-operator-cluster-profile name: cluster-profile - mountPath: /etc/pull-secret name: pull-secret @@ -129,28 +129,30 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-agnostic-upgrade,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-agnostic-operator,?($|\s.*) - agent: kubernetes always_run: true branches: - release-4.6 cluster: build02 - context: ci/prow/gofmt + context: ci/prow/e2e-agnostic-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-cluster-version-operator-release-4.6-gofmt - rerun_command: /test gofmt + name: pull-ci-openshift-cluster-version-operator-release-4.6-e2e-agnostic-upgrade + rerun_command: /test e2e-agnostic-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 - - --target=gofmt + - --secret-dir=/usr/local/e2e-agnostic-upgrade-cluster-profile + - --target=e2e-agnostic-upgrade command: - ci-operator image: ci-operator:latest @@ -160,6 +162,11 @@ presubmits: requests: cpu: 10m volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /usr/local/e2e-agnostic-upgrade-cluster-profile + name: cluster-profile - mountPath: /etc/pull-secret name: pull-secret readOnly: true @@ -168,35 +175,47 @@ presubmits: 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-gcp + - configMap: + name: cluster-profile-gcp - name: pull-secret secret: secretName: registry-pull-credentials - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )gofmt,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-agnostic-upgrade,?($|\s.*) - agent: kubernetes always_run: true branches: - release-4.6 cluster: build02 - context: ci/prow/images + context: ci/prow/gofmt 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-cluster-version-operator-release-4.6-images - rerun_command: /test images + name: pull-ci-openshift-cluster-version-operator-release-4.6-gofmt + rerun_command: /test gofmt spec: containers: - args: - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - --report-password-file=/etc/report/password.txt - --report-username=ci - - --target=[images] - - --target=[release:latest] + - --target=gofmt command: - ci-operator image: ci-operator:latest @@ -220,37 +239,31 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )images,?($|\s.*) + trigger: (?m)^/test( | .* )gofmt,?($|\s.*) - agent: kubernetes always_run: true branches: - release-4.6 cluster: build02 - context: ci/prow/integration + context: ci/prow/images 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-cluster-version-operator-release-4.6-integration - rerun_command: /test integration + name: pull-ci-openshift-cluster-version-operator-release-4.6-images + rerun_command: /test images spec: containers: - args: - - --artifact-dir=$(ARTIFACTS) - - --give-pr-author-access-to-namespace=true - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --kubeconfig=/etc/apici/kubeconfig - - --repo=cluster-version-operator - - --target=integration - - --template=/usr/local/integration + - --report-password-file=/etc/report/password.txt + - --report-username=ci + - --target=[images] + - --target=[release:latest] command: - ci-operator - env: - - name: COMMAND - value: hack/test-integration.sh - - name: JOB_NAME_SAFE - value: integration - - name: LOCAL_IMAGE_TEST_BIN - value: pipeline:src image: ci-operator:latest imagePullPolicy: Always name: "" @@ -258,30 +271,21 @@ presubmits: requests: cpu: 10m volumeMounts: - - mountPath: /etc/apici - name: apici-ci-operator-credentials - readOnly: true - - mountPath: /usr/local/integration - name: job-definition - subPath: master-sidecar-4.6.yaml - mountPath: /etc/pull-secret name: pull-secret readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true serviceAccountName: ci-operator volumes: - - name: apici-ci-operator-credentials - secret: - items: - - key: sa.ci-operator.apici.config - path: kubeconfig - secretName: apici-ci-operator-credentials - - configMap: - name: prow-job-master-sidecar-4.6 - name: job-definition - name: pull-secret secret: secretName: registry-pull-credentials - trigger: (?m)^/test( | .* )integration,?($|\s.*) + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )images,?($|\s.*) - agent: kubernetes always_run: true branches: diff --git a/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.7-presubmits.yaml b/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.7-presubmits.yaml index 566fe06b88b2a..98cd58b88e545 100644 --- a/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.7-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.7-presubmits.yaml @@ -70,15 +70,15 @@ presubmits: branches: - release-4.7 cluster: build02 - context: ci/prow/e2e-agnostic-upgrade + context: ci/prow/e2e-agnostic-operator 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-cluster-version-operator-release-4.7-e2e-agnostic-upgrade - rerun_command: /test e2e-agnostic-upgrade + name: pull-ci-openshift-cluster-version-operator-release-4.7-e2e-agnostic-operator + rerun_command: /test e2e-agnostic-operator spec: containers: - args: @@ -86,8 +86,8 @@ presubmits: - --lease-server-password-file=/etc/boskos/password - --report-password-file=/etc/report/password.txt - --report-username=ci - - --secret-dir=/usr/local/e2e-agnostic-upgrade-cluster-profile - - --target=e2e-agnostic-upgrade + - --secret-dir=/usr/local/e2e-agnostic-operator-cluster-profile + - --target=e2e-agnostic-operator command: - ci-operator image: ci-operator:latest @@ -100,7 +100,7 @@ presubmits: - mountPath: /etc/boskos name: boskos readOnly: true - - mountPath: /usr/local/e2e-agnostic-upgrade-cluster-profile + - mountPath: /usr/local/e2e-agnostic-operator-cluster-profile name: cluster-profile - mountPath: /etc/pull-secret name: pull-secret @@ -129,21 +129,21 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-agnostic-upgrade,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-agnostic-operator,?($|\s.*) - agent: kubernetes always_run: true branches: - release-4.7 cluster: build02 - context: ci/prow/e2e-metal-assisted + context: ci/prow/e2e-agnostic-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-cluster-version-operator-release-4.7-e2e-metal-assisted - rerun_command: /test e2e-metal-assisted + name: pull-ci-openshift-cluster-version-operator-release-4.7-e2e-agnostic-upgrade + rerun_command: /test e2e-agnostic-upgrade spec: containers: - args: @@ -151,8 +151,8 @@ presubmits: - --lease-server-password-file=/etc/boskos/password - --report-password-file=/etc/report/password.txt - --report-username=ci - - --secret-dir=/usr/local/e2e-metal-assisted-cluster-profile - - --target=e2e-metal-assisted + - --secret-dir=/usr/local/e2e-agnostic-upgrade-cluster-profile + - --target=e2e-agnostic-upgrade command: - ci-operator image: ci-operator:latest @@ -165,7 +165,7 @@ presubmits: - mountPath: /etc/boskos name: boskos readOnly: true - - mountPath: /usr/local/e2e-metal-assisted-cluster-profile + - mountPath: /usr/local/e2e-agnostic-upgrade-cluster-profile name: cluster-profile - mountPath: /etc/pull-secret name: pull-secret @@ -185,37 +185,39 @@ presubmits: projected: sources: - secret: - name: cluster-secrets-packet + name: cluster-secrets-gcp - configMap: - name: cluster-profile-packet + name: cluster-profile-gcp - name: pull-secret secret: secretName: registry-pull-credentials - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-metal-assisted,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-agnostic-upgrade,?($|\s.*) - agent: kubernetes always_run: true branches: - release-4.7 cluster: build02 - context: ci/prow/gofmt + context: ci/prow/e2e-metal-assisted 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-cluster-version-operator-release-4.7-gofmt - rerun_command: /test gofmt + name: pull-ci-openshift-cluster-version-operator-release-4.7-e2e-metal-assisted + rerun_command: /test e2e-metal-assisted 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 - - --target=gofmt + - --secret-dir=/usr/local/e2e-metal-assisted-cluster-profile + - --target=e2e-metal-assisted command: - ci-operator image: ci-operator:latest @@ -225,6 +227,11 @@ presubmits: requests: cpu: 10m volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /usr/local/e2e-metal-assisted-cluster-profile + name: cluster-profile - mountPath: /etc/pull-secret name: pull-secret readOnly: true @@ -233,34 +240,47 @@ presubmits: 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( | .* )gofmt,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-metal-assisted,?($|\s.*) - agent: kubernetes always_run: true branches: - release-4.7 cluster: build02 - context: ci/prow/images + context: ci/prow/gofmt 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-cluster-version-operator-release-4.7-images - rerun_command: /test images + name: pull-ci-openshift-cluster-version-operator-release-4.7-gofmt + rerun_command: /test gofmt spec: containers: - args: - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - --report-password-file=/etc/report/password.txt - --report-username=ci - - --target=[images] + - --target=gofmt command: - ci-operator image: ci-operator:latest @@ -284,37 +304,30 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )images,?($|\s.*) + trigger: (?m)^/test( | .* )gofmt,?($|\s.*) - agent: kubernetes always_run: true branches: - release-4.7 cluster: build02 - context: ci/prow/integration + context: ci/prow/images 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-cluster-version-operator-release-4.7-integration - rerun_command: /test integration + name: pull-ci-openshift-cluster-version-operator-release-4.7-images + rerun_command: /test images spec: containers: - args: - - --artifact-dir=$(ARTIFACTS) - - --give-pr-author-access-to-namespace=true - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --kubeconfig=/etc/apici/kubeconfig - - --repo=cluster-version-operator - - --target=integration - - --template=/usr/local/integration + - --report-password-file=/etc/report/password.txt + - --report-username=ci + - --target=[images] command: - ci-operator - env: - - name: COMMAND - value: hack/test-integration.sh - - name: JOB_NAME_SAFE - value: integration - - name: LOCAL_IMAGE_TEST_BIN - value: pipeline:src image: ci-operator:latest imagePullPolicy: Always name: "" @@ -322,30 +335,21 @@ presubmits: requests: cpu: 10m volumeMounts: - - mountPath: /etc/apici - name: apici-ci-operator-credentials - readOnly: true - - mountPath: /usr/local/integration - name: job-definition - subPath: master-sidecar-4.6.yaml - mountPath: /etc/pull-secret name: pull-secret readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true serviceAccountName: ci-operator volumes: - - name: apici-ci-operator-credentials - secret: - items: - - key: sa.ci-operator.apici.config - path: kubeconfig - secretName: apici-ci-operator-credentials - - configMap: - name: prow-job-master-sidecar-4.6 - name: job-definition - name: pull-secret secret: secretName: registry-pull-credentials - trigger: (?m)^/test( | .* )integration,?($|\s.*) + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )images,?($|\s.*) - agent: kubernetes always_run: true branches: diff --git a/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.8-presubmits.yaml b/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.8-presubmits.yaml index a7e3faf2e32c8..0c6c0c69e11d4 100644 --- a/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.8-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-version-operator/openshift-cluster-version-operator-release-4.8-presubmits.yaml @@ -70,15 +70,15 @@ presubmits: branches: - release-4.8 cluster: build01 - context: ci/prow/e2e-agnostic-upgrade + context: ci/prow/e2e-agnostic-operator 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-cluster-version-operator-release-4.8-e2e-agnostic-upgrade - rerun_command: /test e2e-agnostic-upgrade + name: pull-ci-openshift-cluster-version-operator-release-4.8-e2e-agnostic-operator + rerun_command: /test e2e-agnostic-operator spec: containers: - args: @@ -86,8 +86,8 @@ presubmits: - --lease-server-password-file=/etc/boskos/password - --report-password-file=/etc/report/password.txt - --report-username=ci - - --secret-dir=/usr/local/e2e-agnostic-upgrade-cluster-profile - - --target=e2e-agnostic-upgrade + - --secret-dir=/usr/local/e2e-agnostic-operator-cluster-profile + - --target=e2e-agnostic-operator command: - ci-operator image: ci-operator:latest @@ -100,7 +100,7 @@ presubmits: - mountPath: /etc/boskos name: boskos readOnly: true - - mountPath: /usr/local/e2e-agnostic-upgrade-cluster-profile + - mountPath: /usr/local/e2e-agnostic-operator-cluster-profile name: cluster-profile - mountPath: /etc/pull-secret name: pull-secret @@ -129,21 +129,21 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-agnostic-upgrade,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-agnostic-operator,?($|\s.*) - agent: kubernetes always_run: true branches: - release-4.8 cluster: build01 - context: ci/prow/e2e-metal-assisted + context: ci/prow/e2e-agnostic-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-cluster-version-operator-release-4.8-e2e-metal-assisted - rerun_command: /test e2e-metal-assisted + name: pull-ci-openshift-cluster-version-operator-release-4.8-e2e-agnostic-upgrade + rerun_command: /test e2e-agnostic-upgrade spec: containers: - args: @@ -151,8 +151,8 @@ presubmits: - --lease-server-password-file=/etc/boskos/password - --report-password-file=/etc/report/password.txt - --report-username=ci - - --secret-dir=/usr/local/e2e-metal-assisted-cluster-profile - - --target=e2e-metal-assisted + - --secret-dir=/usr/local/e2e-agnostic-upgrade-cluster-profile + - --target=e2e-agnostic-upgrade command: - ci-operator image: ci-operator:latest @@ -165,7 +165,7 @@ presubmits: - mountPath: /etc/boskos name: boskos readOnly: true - - mountPath: /usr/local/e2e-metal-assisted-cluster-profile + - mountPath: /usr/local/e2e-agnostic-upgrade-cluster-profile name: cluster-profile - mountPath: /etc/pull-secret name: pull-secret @@ -185,37 +185,39 @@ presubmits: projected: sources: - secret: - name: cluster-secrets-packet + name: cluster-secrets-gcp - configMap: - name: cluster-profile-packet + name: cluster-profile-gcp - name: pull-secret secret: secretName: registry-pull-credentials - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-metal-assisted,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-agnostic-upgrade,?($|\s.*) - agent: kubernetes always_run: true branches: - release-4.8 cluster: build01 - context: ci/prow/gofmt + context: ci/prow/e2e-metal-assisted 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-cluster-version-operator-release-4.8-gofmt - rerun_command: /test gofmt + name: pull-ci-openshift-cluster-version-operator-release-4.8-e2e-metal-assisted + rerun_command: /test e2e-metal-assisted 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 - - --target=gofmt + - --secret-dir=/usr/local/e2e-metal-assisted-cluster-profile + - --target=e2e-metal-assisted command: - ci-operator image: ci-operator:latest @@ -225,6 +227,11 @@ presubmits: requests: cpu: 10m volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /usr/local/e2e-metal-assisted-cluster-profile + name: cluster-profile - mountPath: /etc/pull-secret name: pull-secret readOnly: true @@ -233,35 +240,47 @@ presubmits: 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( | .* )gofmt,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-metal-assisted,?($|\s.*) - agent: kubernetes always_run: true branches: - release-4.8 cluster: build01 - context: ci/prow/images + context: ci/prow/gofmt 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-cluster-version-operator-release-4.8-images - rerun_command: /test images + name: pull-ci-openshift-cluster-version-operator-release-4.8-gofmt + rerun_command: /test gofmt spec: containers: - args: - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - --report-password-file=/etc/report/password.txt - --report-username=ci - - --target=[images] - - --target=[release:latest] + - --target=gofmt command: - ci-operator image: ci-operator:latest @@ -285,37 +304,31 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )images,?($|\s.*) + trigger: (?m)^/test( | .* )gofmt,?($|\s.*) - agent: kubernetes always_run: true branches: - release-4.8 cluster: build01 - context: ci/prow/integration + context: ci/prow/images 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-cluster-version-operator-release-4.8-integration - rerun_command: /test integration + name: pull-ci-openshift-cluster-version-operator-release-4.8-images + rerun_command: /test images spec: containers: - args: - - --artifact-dir=$(ARTIFACTS) - - --give-pr-author-access-to-namespace=true - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --kubeconfig=/etc/apici/kubeconfig - - --repo=cluster-version-operator - - --target=integration - - --template=/usr/local/integration + - --report-password-file=/etc/report/password.txt + - --report-username=ci + - --target=[images] + - --target=[release:latest] command: - ci-operator - env: - - name: COMMAND - value: hack/test-integration.sh - - name: JOB_NAME_SAFE - value: integration - - name: LOCAL_IMAGE_TEST_BIN - value: pipeline:src image: ci-operator:latest imagePullPolicy: Always name: "" @@ -323,30 +336,21 @@ presubmits: requests: cpu: 10m volumeMounts: - - mountPath: /etc/apici - name: apici-ci-operator-credentials - readOnly: true - - mountPath: /usr/local/integration - name: job-definition - subPath: master-sidecar-4.6.yaml - mountPath: /etc/pull-secret name: pull-secret readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true serviceAccountName: ci-operator volumes: - - name: apici-ci-operator-credentials - secret: - items: - - key: sa.ci-operator.apici.config - path: kubeconfig - secretName: apici-ci-operator-credentials - - configMap: - name: prow-job-master-sidecar-4.6 - name: job-definition - name: pull-secret secret: secretName: registry-pull-credentials - trigger: (?m)^/test( | .* )integration,?($|\s.*) + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )images,?($|\s.*) - agent: kubernetes always_run: true branches: