diff --git a/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-master.yaml b/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-master.yaml index a799701544e71..4457fccc1a51c 100644 --- a/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-master.yaml +++ b/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-master.yaml @@ -54,19 +54,29 @@ tests: make test-unit JUNITFILE=/tmp/artifacts/junit_report.xml --warn-undefined-variables container: from: test-bin -- as: e2e-aws +- as: e2e steps: - cluster_profile: aws - workflow: openshift-e2e-aws-loki -- as: e2e-gcp-upgrade + cluster_profile: gcp + workflow: openshift-e2e-gcp-loki +- as: e2e-upgrade commands: TEST_SUITE=all run-upgrade-tests openshift_installer: cluster_profile: gcp upgrade: true -- as: e2e-aws-disruptive +- as: e2e-disruptive commands: setup_ssh_bastion; TEST_SUITE=openshift/disruptive run-tests; TEST_SUITE=openshift/conformance/parallel run-tests openshift_installer: cluster_profile: aws +- artifact_dir: /tmp/artifacts + as: e2e-operator + commands: | + make test-e2e JUNITFILE=/tmp/artifacts/junit_report.xml --warn-undefined-variables + openshift_installer_src: + cluster_profile: aws +- as: e2e-aws + steps: + cluster_profile: aws + workflow: openshift-e2e-aws-loki - as: e2e-azure steps: cluster_profile: azure4 @@ -79,12 +89,6 @@ tests: steps: cluster_profile: packet workflow: baremetalds-e2e -- artifact_dir: /tmp/artifacts - as: e2e-aws-operator - commands: | - make test-e2e JUNITFILE=/tmp/artifacts/junit_report.xml --warn-undefined-variables - openshift_installer_src: - cluster_profile: aws zz_generated_metadata: branch: master org: openshift diff --git a/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.6.yaml b/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.6.yaml index 9b60e81538788..0aa3f3e73067c 100644 --- a/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.6.yaml +++ b/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.6.yaml @@ -55,19 +55,29 @@ tests: make test-unit JUNITFILE=/tmp/artifacts/junit_report.xml --warn-undefined-variables container: from: test-bin -- as: e2e-aws +- as: e2e steps: - cluster_profile: aws - workflow: openshift-e2e-aws-loki -- as: e2e-gcp-upgrade + cluster_profile: gcp + workflow: openshift-e2e-gcp-loki +- as: e2e-upgrade commands: TEST_SUITE=all run-upgrade-tests openshift_installer: cluster_profile: gcp upgrade: true -- as: e2e-aws-disruptive +- as: e2e-disruptive commands: setup_ssh_bastion; TEST_SUITE=openshift/disruptive run-tests; TEST_SUITE=openshift/conformance/parallel run-tests openshift_installer: cluster_profile: aws +- artifact_dir: /tmp/artifacts + as: e2e-operator + commands: | + make test-e2e JUNITFILE=/tmp/artifacts/junit_report.xml --warn-undefined-variables + openshift_installer_src: + cluster_profile: aws +- as: e2e-aws + steps: + cluster_profile: aws + workflow: openshift-e2e-aws-loki - as: e2e-azure steps: cluster_profile: azure4 @@ -80,12 +90,6 @@ tests: steps: cluster_profile: packet workflow: baremetalds-e2e -- artifact_dir: /tmp/artifacts - as: e2e-aws-operator - commands: | - make test-e2e JUNITFILE=/tmp/artifacts/junit_report.xml --warn-undefined-variables - openshift_installer_src: - cluster_profile: aws zz_generated_metadata: branch: release-4.6 org: openshift diff --git a/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.7.yaml b/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.7.yaml index 42be775f2f10c..32d7b0932225d 100644 --- a/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.7.yaml +++ b/ci-operator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.7.yaml @@ -54,19 +54,29 @@ tests: make test-unit JUNITFILE=/tmp/artifacts/junit_report.xml --warn-undefined-variables container: from: test-bin -- as: e2e-aws +- as: e2e steps: - cluster_profile: aws - workflow: openshift-e2e-aws-loki -- as: e2e-gcp-upgrade + cluster_profile: gcp + workflow: openshift-e2e-gcp-loki +- as: e2e-upgrade commands: TEST_SUITE=all run-upgrade-tests openshift_installer: cluster_profile: gcp upgrade: true -- as: e2e-aws-disruptive +- as: e2e-disruptive commands: setup_ssh_bastion; TEST_SUITE=openshift/disruptive run-tests; TEST_SUITE=openshift/conformance/parallel run-tests openshift_installer: cluster_profile: aws +- artifact_dir: /tmp/artifacts + as: e2e-operator + commands: | + make test-e2e JUNITFILE=/tmp/artifacts/junit_report.xml --warn-undefined-variables + openshift_installer_src: + cluster_profile: aws +- as: e2e-aws + steps: + cluster_profile: aws + workflow: openshift-e2e-aws-loki - as: e2e-azure steps: cluster_profile: azure4 @@ -79,12 +89,6 @@ tests: steps: cluster_profile: packet workflow: baremetalds-e2e -- artifact_dir: /tmp/artifacts - as: e2e-aws-operator - commands: | - make test-e2e JUNITFILE=/tmp/artifacts/junit_report.xml --warn-undefined-variables - openshift_installer_src: - cluster_profile: aws zz_generated_metadata: branch: release-4.7 org: openshift diff --git a/ci-operator/jobs/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-master-presubmits.yaml b/ci-operator/jobs/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-master-presubmits.yaml index 301421786a22e..4f67ec98924e0 100644 --- a/ci-operator/jobs/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-master-presubmits.yaml @@ -5,6 +5,71 @@ presubmits: branches: - master cluster: api.ci + context: ci/prow/e2e + 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-etcd-operator-master-e2e + rerun_command: /test e2e + 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-cluster-profile + - --target=e2e + 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-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: regcred + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )e2e,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - master + cluster: api.ci context: ci/prow/e2e-aws decorate: true decoration_config: @@ -13,6 +78,7 @@ presubmits: ci-operator.openshift.io/prowgen-controlled: "true" pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-cluster-etcd-operator-master-e2e-aws + optional: true rerun_command: /test e2e-aws spec: containers: @@ -64,20 +130,20 @@ presubmits: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*) - agent: kubernetes - always_run: true + always_run: false branches: - master cluster: api.ci - context: ci/prow/e2e-aws-disruptive + context: ci/prow/e2e-azure 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-etcd-operator-master-e2e-aws-disruptive + name: pull-ci-openshift-cluster-etcd-operator-master-e2e-azure optional: true - rerun_command: /test e2e-aws-disruptive + rerun_command: /test e2e-azure spec: containers: - args: @@ -85,18 +151,10 @@ presubmits: - --lease-server-password-file=/etc/boskos/password - --report-password-file=/etc/report/password.txt - --report-username=ci - - --secret-dir=/usr/local/e2e-aws-disruptive-cluster-profile - - --target=e2e-aws-disruptive - - --template=/usr/local/e2e-aws-disruptive + - --secret-dir=/usr/local/e2e-azure-cluster-profile + - --target=e2e-azure command: - ci-operator - env: - - name: CLUSTER_TYPE - value: aws - - name: JOB_NAME_SAFE - value: e2e-aws-disruptive - - name: TEST_COMMAND - value: setup_ssh_bastion; TEST_SUITE=openshift/disruptive run-tests; TEST_SUITE=openshift/conformance/parallel run-tests image: ci-operator:latest imagePullPolicy: Always name: "" @@ -107,11 +165,8 @@ presubmits: - mountPath: /etc/boskos name: boskos readOnly: true - - mountPath: /usr/local/e2e-aws-disruptive-cluster-profile + - mountPath: /usr/local/e2e-azure-cluster-profile name: cluster-profile - - mountPath: /usr/local/e2e-aws-disruptive - name: job-definition - subPath: cluster-launch-installer-e2e.yaml - mountPath: /etc/pull-secret name: pull-secret readOnly: true @@ -130,31 +185,29 @@ presubmits: projected: sources: - secret: - name: cluster-secrets-aws - - configMap: - name: prow-job-cluster-launch-installer-e2e - name: job-definition + name: cluster-secrets-azure4 - name: pull-secret secret: secretName: regcred - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-disruptive,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-azure,?($|\s.*) - agent: kubernetes always_run: true branches: - master cluster: api.ci - context: ci/prow/e2e-aws-operator + context: ci/prow/e2e-disruptive 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-etcd-operator-master-e2e-aws-operator - rerun_command: /test e2e-aws-operator + name: pull-ci-openshift-cluster-etcd-operator-master-e2e-disruptive + optional: true + rerun_command: /test e2e-disruptive spec: containers: - args: @@ -162,19 +215,18 @@ presubmits: - --lease-server-password-file=/etc/boskos/password - --report-password-file=/etc/report/password.txt - --report-username=ci - - --secret-dir=/usr/local/e2e-aws-operator-cluster-profile - - --target=e2e-aws-operator - - --template=/usr/local/e2e-aws-operator + - --secret-dir=/usr/local/e2e-disruptive-cluster-profile + - --target=e2e-disruptive + - --template=/usr/local/e2e-disruptive command: - ci-operator env: - name: CLUSTER_TYPE value: aws - name: JOB_NAME_SAFE - value: e2e-aws-operator + value: e2e-disruptive - name: TEST_COMMAND - value: | - make test-e2e JUNITFILE=/tmp/artifacts/junit_report.xml --warn-undefined-variables + value: setup_ssh_bastion; TEST_SUITE=openshift/disruptive run-tests; TEST_SUITE=openshift/conformance/parallel run-tests image: ci-operator:latest imagePullPolicy: Always name: "" @@ -185,11 +237,11 @@ presubmits: - mountPath: /etc/boskos name: boskos readOnly: true - - mountPath: /usr/local/e2e-aws-operator-cluster-profile + - mountPath: /usr/local/e2e-disruptive-cluster-profile name: cluster-profile - - mountPath: /usr/local/e2e-aws-operator + - mountPath: /usr/local/e2e-disruptive name: job-definition - subPath: cluster-launch-installer-src.yaml + subPath: cluster-launch-installer-e2e.yaml - mountPath: /etc/pull-secret name: pull-secret readOnly: true @@ -210,7 +262,7 @@ presubmits: - secret: name: cluster-secrets-aws - configMap: - name: prow-job-cluster-launch-installer-src + name: prow-job-cluster-launch-installer-e2e name: job-definition - name: pull-secret secret: @@ -218,22 +270,22 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-disruptive,?($|\s.*) - agent: kubernetes - always_run: true + always_run: false branches: - master cluster: api.ci - context: ci/prow/e2e-azure + context: ci/prow/e2e-gcp 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-etcd-operator-master-e2e-azure + name: pull-ci-openshift-cluster-etcd-operator-master-e2e-gcp optional: true - rerun_command: /test e2e-azure + rerun_command: /test e2e-gcp spec: containers: - args: @@ -241,8 +293,8 @@ presubmits: - --lease-server-password-file=/etc/boskos/password - --report-password-file=/etc/report/password.txt - --report-username=ci - - --secret-dir=/usr/local/e2e-azure-cluster-profile - - --target=e2e-azure + - --secret-dir=/usr/local/e2e-gcp-cluster-profile + - --target=e2e-gcp command: - ci-operator image: ci-operator:latest @@ -255,7 +307,7 @@ presubmits: - mountPath: /etc/boskos name: boskos readOnly: true - - mountPath: /usr/local/e2e-azure-cluster-profile + - mountPath: /usr/local/e2e-gcp-cluster-profile name: cluster-profile - mountPath: /etc/pull-secret name: pull-secret @@ -275,28 +327,31 @@ presubmits: projected: sources: - secret: - name: cluster-secrets-azure4 + name: cluster-secrets-gcp + - configMap: + name: cluster-profile-gcp - name: pull-secret secret: secretName: regcred - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-azure,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-gcp,?($|\s.*) - agent: kubernetes - always_run: true + always_run: false branches: - master cluster: api.ci - context: ci/prow/e2e-gcp + context: ci/prow/e2e-metal-ipi 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-etcd-operator-master-e2e-gcp - rerun_command: /test e2e-gcp + name: pull-ci-openshift-cluster-etcd-operator-master-e2e-metal-ipi + optional: true + rerun_command: /test e2e-metal-ipi spec: containers: - args: @@ -304,8 +359,8 @@ presubmits: - --lease-server-password-file=/etc/boskos/password - --report-password-file=/etc/report/password.txt - --report-username=ci - - --secret-dir=/usr/local/e2e-gcp-cluster-profile - - --target=e2e-gcp + - --secret-dir=/usr/local/e2e-metal-ipi-cluster-profile + - --target=e2e-metal-ipi command: - ci-operator image: ci-operator:latest @@ -318,7 +373,7 @@ presubmits: - mountPath: /etc/boskos name: boskos readOnly: true - - mountPath: /usr/local/e2e-gcp-cluster-profile + - mountPath: /usr/local/e2e-metal-ipi-cluster-profile name: cluster-profile - mountPath: /etc/pull-secret name: pull-secret @@ -338,30 +393,30 @@ presubmits: projected: sources: - secret: - name: cluster-secrets-gcp + name: cluster-secrets-packet - configMap: - name: cluster-profile-gcp + name: cluster-profile-packet - name: pull-secret secret: secretName: regcred - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-gcp,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-metal-ipi,?($|\s.*) - agent: kubernetes always_run: true branches: - master cluster: api.ci - context: ci/prow/e2e-gcp-upgrade + context: ci/prow/e2e-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-etcd-operator-master-e2e-gcp-upgrade - rerun_command: /test e2e-gcp-upgrade + name: pull-ci-openshift-cluster-etcd-operator-master-e2e-operator + rerun_command: /test e2e-operator spec: containers: - args: @@ -369,10 +424,19 @@ presubmits: - --lease-server-password-file=/etc/boskos/password - --report-password-file=/etc/report/password.txt - --report-username=ci - - --secret-dir=/usr/local/e2e-gcp-upgrade-cluster-profile - - --target=e2e-gcp-upgrade + - --secret-dir=/usr/local/e2e-operator-cluster-profile + - --target=e2e-operator + - --template=/usr/local/e2e-operator command: - ci-operator + env: + - name: CLUSTER_TYPE + value: aws + - name: JOB_NAME_SAFE + value: e2e-operator + - name: TEST_COMMAND + value: | + make test-e2e JUNITFILE=/tmp/artifacts/junit_report.xml --warn-undefined-variables image: ci-operator:latest imagePullPolicy: Always name: "" @@ -383,8 +447,11 @@ presubmits: - mountPath: /etc/boskos name: boskos readOnly: true - - mountPath: /usr/local/e2e-gcp-upgrade-cluster-profile + - mountPath: /usr/local/e2e-operator-cluster-profile name: cluster-profile + - mountPath: /usr/local/e2e-operator + name: job-definition + subPath: cluster-launch-installer-src.yaml - mountPath: /etc/pull-secret name: pull-secret readOnly: true @@ -403,31 +470,31 @@ presubmits: projected: sources: - secret: - name: cluster-secrets-gcp - - configMap: - name: cluster-profile-gcp + name: cluster-secrets-aws + - configMap: + name: prow-job-cluster-launch-installer-src + name: job-definition - name: pull-secret secret: secretName: regcred - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-gcp-upgrade,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-operator,?($|\s.*) - agent: kubernetes always_run: true branches: - master cluster: api.ci - context: ci/prow/e2e-metal-ipi + 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-etcd-operator-master-e2e-metal-ipi - optional: true - rerun_command: /test e2e-metal-ipi + name: pull-ci-openshift-cluster-etcd-operator-master-e2e-upgrade + rerun_command: /test e2e-upgrade spec: containers: - args: @@ -435,8 +502,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-ipi-cluster-profile - - --target=e2e-metal-ipi + - --secret-dir=/usr/local/e2e-upgrade-cluster-profile + - --target=e2e-upgrade command: - ci-operator image: ci-operator:latest @@ -449,7 +516,7 @@ presubmits: - mountPath: /etc/boskos name: boskos readOnly: true - - mountPath: /usr/local/e2e-metal-ipi-cluster-profile + - mountPath: /usr/local/e2e-upgrade-cluster-profile name: cluster-profile - mountPath: /etc/pull-secret name: pull-secret @@ -469,16 +536,16 @@ 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: regcred - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-metal-ipi,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-upgrade,?($|\s.*) - agent: kubernetes always_run: true branches: diff --git a/ci-operator/jobs/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.6-presubmits.yaml b/ci-operator/jobs/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.6-presubmits.yaml index 068daf1103214..15590089b2532 100644 --- a/ci-operator/jobs/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.6-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.6-presubmits.yaml @@ -5,6 +5,71 @@ presubmits: branches: - release-4.6 cluster: api.ci + context: ci/prow/e2e + 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-etcd-operator-release-4.6-e2e + rerun_command: /test e2e + 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-cluster-profile + - --target=e2e + 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-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: regcred + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )e2e,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - release-4.6 + cluster: api.ci context: ci/prow/e2e-aws decorate: true decoration_config: @@ -13,6 +78,7 @@ presubmits: ci-operator.openshift.io/prowgen-controlled: "true" pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-cluster-etcd-operator-release-4.6-e2e-aws + optional: true rerun_command: /test e2e-aws spec: containers: @@ -64,19 +130,20 @@ presubmits: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*) - agent: kubernetes - always_run: true + always_run: false branches: - release-4.6 cluster: api.ci - context: ci/prow/e2e-aws-disruptive + context: ci/prow/e2e-azure 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-etcd-operator-release-4.6-e2e-aws-disruptive - rerun_command: /test e2e-aws-disruptive + name: pull-ci-openshift-cluster-etcd-operator-release-4.6-e2e-azure + optional: true + rerun_command: /test e2e-azure spec: containers: - args: @@ -84,18 +151,10 @@ presubmits: - --lease-server-password-file=/etc/boskos/password - --report-password-file=/etc/report/password.txt - --report-username=ci - - --secret-dir=/usr/local/e2e-aws-disruptive-cluster-profile - - --target=e2e-aws-disruptive - - --template=/usr/local/e2e-aws-disruptive + - --secret-dir=/usr/local/e2e-azure-cluster-profile + - --target=e2e-azure command: - ci-operator - env: - - name: CLUSTER_TYPE - value: aws - - name: JOB_NAME_SAFE - value: e2e-aws-disruptive - - name: TEST_COMMAND - value: setup_ssh_bastion; TEST_SUITE=openshift/disruptive run-tests; TEST_SUITE=openshift/conformance/parallel run-tests image: ci-operator:latest imagePullPolicy: Always name: "" @@ -106,11 +165,8 @@ presubmits: - mountPath: /etc/boskos name: boskos readOnly: true - - mountPath: /usr/local/e2e-aws-disruptive-cluster-profile + - mountPath: /usr/local/e2e-azure-cluster-profile name: cluster-profile - - mountPath: /usr/local/e2e-aws-disruptive - name: job-definition - subPath: cluster-launch-installer-e2e.yaml - mountPath: /etc/pull-secret name: pull-secret readOnly: true @@ -129,31 +185,28 @@ presubmits: projected: sources: - secret: - name: cluster-secrets-aws - - configMap: - name: prow-job-cluster-launch-installer-e2e - name: job-definition + name: cluster-secrets-azure4 - name: pull-secret secret: secretName: regcred - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-disruptive,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-azure,?($|\s.*) - agent: kubernetes always_run: true branches: - release-4.6 cluster: api.ci - context: ci/prow/e2e-aws-operator + context: ci/prow/e2e-disruptive 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-etcd-operator-release-4.6-e2e-aws-operator - rerun_command: /test e2e-aws-operator + name: pull-ci-openshift-cluster-etcd-operator-release-4.6-e2e-disruptive + rerun_command: /test e2e-disruptive spec: containers: - args: @@ -161,19 +214,18 @@ presubmits: - --lease-server-password-file=/etc/boskos/password - --report-password-file=/etc/report/password.txt - --report-username=ci - - --secret-dir=/usr/local/e2e-aws-operator-cluster-profile - - --target=e2e-aws-operator - - --template=/usr/local/e2e-aws-operator + - --secret-dir=/usr/local/e2e-disruptive-cluster-profile + - --target=e2e-disruptive + - --template=/usr/local/e2e-disruptive command: - ci-operator env: - name: CLUSTER_TYPE value: aws - name: JOB_NAME_SAFE - value: e2e-aws-operator + value: e2e-disruptive - name: TEST_COMMAND - value: | - make test-e2e JUNITFILE=/tmp/artifacts/junit_report.xml --warn-undefined-variables + value: setup_ssh_bastion; TEST_SUITE=openshift/disruptive run-tests; TEST_SUITE=openshift/conformance/parallel run-tests image: ci-operator:latest imagePullPolicy: Always name: "" @@ -184,11 +236,11 @@ presubmits: - mountPath: /etc/boskos name: boskos readOnly: true - - mountPath: /usr/local/e2e-aws-operator-cluster-profile + - mountPath: /usr/local/e2e-disruptive-cluster-profile name: cluster-profile - - mountPath: /usr/local/e2e-aws-operator + - mountPath: /usr/local/e2e-disruptive name: job-definition - subPath: cluster-launch-installer-src.yaml + subPath: cluster-launch-installer-e2e.yaml - mountPath: /etc/pull-secret name: pull-secret readOnly: true @@ -209,7 +261,7 @@ presubmits: - secret: name: cluster-secrets-aws - configMap: - name: prow-job-cluster-launch-installer-src + name: prow-job-cluster-launch-installer-e2e name: job-definition - name: pull-secret secret: @@ -217,22 +269,22 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-disruptive,?($|\s.*) - agent: kubernetes - always_run: true + always_run: false branches: - release-4.6 cluster: api.ci - context: ci/prow/e2e-azure + context: ci/prow/e2e-gcp 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-etcd-operator-release-4.6-e2e-azure + name: pull-ci-openshift-cluster-etcd-operator-release-4.6-e2e-gcp optional: true - rerun_command: /test e2e-azure + rerun_command: /test e2e-gcp spec: containers: - args: @@ -240,8 +292,8 @@ presubmits: - --lease-server-password-file=/etc/boskos/password - --report-password-file=/etc/report/password.txt - --report-username=ci - - --secret-dir=/usr/local/e2e-azure-cluster-profile - - --target=e2e-azure + - --secret-dir=/usr/local/e2e-gcp-cluster-profile + - --target=e2e-gcp command: - ci-operator image: ci-operator:latest @@ -254,7 +306,7 @@ presubmits: - mountPath: /etc/boskos name: boskos readOnly: true - - mountPath: /usr/local/e2e-azure-cluster-profile + - mountPath: /usr/local/e2e-gcp-cluster-profile name: cluster-profile - mountPath: /etc/pull-secret name: pull-secret @@ -274,28 +326,31 @@ presubmits: projected: sources: - secret: - name: cluster-secrets-azure4 + name: cluster-secrets-gcp + - configMap: + name: cluster-profile-gcp - name: pull-secret secret: secretName: regcred - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-azure,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-gcp,?($|\s.*) - agent: kubernetes - always_run: true + always_run: false branches: - release-4.6 cluster: api.ci - context: ci/prow/e2e-gcp + context: ci/prow/e2e-metal-ipi 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-etcd-operator-release-4.6-e2e-gcp - rerun_command: /test e2e-gcp + name: pull-ci-openshift-cluster-etcd-operator-release-4.6-e2e-metal-ipi + optional: true + rerun_command: /test e2e-metal-ipi spec: containers: - args: @@ -303,8 +358,8 @@ presubmits: - --lease-server-password-file=/etc/boskos/password - --report-password-file=/etc/report/password.txt - --report-username=ci - - --secret-dir=/usr/local/e2e-gcp-cluster-profile - - --target=e2e-gcp + - --secret-dir=/usr/local/e2e-metal-ipi-cluster-profile + - --target=e2e-metal-ipi command: - ci-operator image: ci-operator:latest @@ -317,7 +372,7 @@ presubmits: - mountPath: /etc/boskos name: boskos readOnly: true - - mountPath: /usr/local/e2e-gcp-cluster-profile + - mountPath: /usr/local/e2e-metal-ipi-cluster-profile name: cluster-profile - mountPath: /etc/pull-secret name: pull-secret @@ -337,30 +392,30 @@ presubmits: projected: sources: - secret: - name: cluster-secrets-gcp + name: cluster-secrets-packet - configMap: - name: cluster-profile-gcp + name: cluster-profile-packet - name: pull-secret secret: secretName: regcred - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-gcp,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-metal-ipi,?($|\s.*) - agent: kubernetes always_run: true branches: - release-4.6 cluster: api.ci - context: ci/prow/e2e-gcp-upgrade + context: ci/prow/e2e-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-etcd-operator-release-4.6-e2e-gcp-upgrade - rerun_command: /test e2e-gcp-upgrade + name: pull-ci-openshift-cluster-etcd-operator-release-4.6-e2e-operator + rerun_command: /test e2e-operator spec: containers: - args: @@ -368,10 +423,19 @@ presubmits: - --lease-server-password-file=/etc/boskos/password - --report-password-file=/etc/report/password.txt - --report-username=ci - - --secret-dir=/usr/local/e2e-gcp-upgrade-cluster-profile - - --target=e2e-gcp-upgrade + - --secret-dir=/usr/local/e2e-operator-cluster-profile + - --target=e2e-operator + - --template=/usr/local/e2e-operator command: - ci-operator + env: + - name: CLUSTER_TYPE + value: aws + - name: JOB_NAME_SAFE + value: e2e-operator + - name: TEST_COMMAND + value: | + make test-e2e JUNITFILE=/tmp/artifacts/junit_report.xml --warn-undefined-variables image: ci-operator:latest imagePullPolicy: Always name: "" @@ -382,8 +446,11 @@ presubmits: - mountPath: /etc/boskos name: boskos readOnly: true - - mountPath: /usr/local/e2e-gcp-upgrade-cluster-profile + - mountPath: /usr/local/e2e-operator-cluster-profile name: cluster-profile + - mountPath: /usr/local/e2e-operator + name: job-definition + subPath: cluster-launch-installer-src.yaml - mountPath: /etc/pull-secret name: pull-secret readOnly: true @@ -402,30 +469,31 @@ presubmits: projected: sources: - secret: - name: cluster-secrets-gcp - - configMap: - name: cluster-profile-gcp + name: cluster-secrets-aws + - configMap: + name: prow-job-cluster-launch-installer-src + name: job-definition - name: pull-secret secret: secretName: regcred - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-gcp-upgrade,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-operator,?($|\s.*) - agent: kubernetes always_run: true branches: - release-4.6 cluster: api.ci - context: ci/prow/e2e-metal-ipi + 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-etcd-operator-release-4.6-e2e-metal-ipi - rerun_command: /test e2e-metal-ipi + name: pull-ci-openshift-cluster-etcd-operator-release-4.6-e2e-upgrade + rerun_command: /test e2e-upgrade spec: containers: - args: @@ -433,8 +501,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-ipi-cluster-profile - - --target=e2e-metal-ipi + - --secret-dir=/usr/local/e2e-upgrade-cluster-profile + - --target=e2e-upgrade command: - ci-operator image: ci-operator:latest @@ -447,7 +515,7 @@ presubmits: - mountPath: /etc/boskos name: boskos readOnly: true - - mountPath: /usr/local/e2e-metal-ipi-cluster-profile + - mountPath: /usr/local/e2e-upgrade-cluster-profile name: cluster-profile - mountPath: /etc/pull-secret name: pull-secret @@ -467,16 +535,16 @@ 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: regcred - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-metal-ipi,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-upgrade,?($|\s.*) - agent: kubernetes always_run: true branches: diff --git a/ci-operator/jobs/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.7-presubmits.yaml b/ci-operator/jobs/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.7-presubmits.yaml index aebee570a4100..6b7222086c7d5 100644 --- a/ci-operator/jobs/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.7-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.7-presubmits.yaml @@ -5,6 +5,71 @@ presubmits: branches: - release-4.7 cluster: api.ci + context: ci/prow/e2e + 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-etcd-operator-release-4.7-e2e + rerun_command: /test e2e + 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-cluster-profile + - --target=e2e + 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-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: regcred + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )e2e,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - release-4.7 + cluster: api.ci context: ci/prow/e2e-aws decorate: true decoration_config: @@ -13,6 +78,7 @@ presubmits: ci-operator.openshift.io/prowgen-controlled: "true" pj-rehearse.openshift.io/can-be-rehearsed: "true" name: pull-ci-openshift-cluster-etcd-operator-release-4.7-e2e-aws + optional: true rerun_command: /test e2e-aws spec: containers: @@ -64,19 +130,20 @@ presubmits: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*) - agent: kubernetes - always_run: true + always_run: false branches: - release-4.7 cluster: api.ci - context: ci/prow/e2e-aws-disruptive + context: ci/prow/e2e-azure 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-etcd-operator-release-4.7-e2e-aws-disruptive - rerun_command: /test e2e-aws-disruptive + name: pull-ci-openshift-cluster-etcd-operator-release-4.7-e2e-azure + optional: true + rerun_command: /test e2e-azure spec: containers: - args: @@ -84,18 +151,10 @@ presubmits: - --lease-server-password-file=/etc/boskos/password - --report-password-file=/etc/report/password.txt - --report-username=ci - - --secret-dir=/usr/local/e2e-aws-disruptive-cluster-profile - - --target=e2e-aws-disruptive - - --template=/usr/local/e2e-aws-disruptive + - --secret-dir=/usr/local/e2e-azure-cluster-profile + - --target=e2e-azure command: - ci-operator - env: - - name: CLUSTER_TYPE - value: aws - - name: JOB_NAME_SAFE - value: e2e-aws-disruptive - - name: TEST_COMMAND - value: setup_ssh_bastion; TEST_SUITE=openshift/disruptive run-tests; TEST_SUITE=openshift/conformance/parallel run-tests image: ci-operator:latest imagePullPolicy: Always name: "" @@ -106,11 +165,8 @@ presubmits: - mountPath: /etc/boskos name: boskos readOnly: true - - mountPath: /usr/local/e2e-aws-disruptive-cluster-profile + - mountPath: /usr/local/e2e-azure-cluster-profile name: cluster-profile - - mountPath: /usr/local/e2e-aws-disruptive - name: job-definition - subPath: cluster-launch-installer-e2e.yaml - mountPath: /etc/pull-secret name: pull-secret readOnly: true @@ -129,31 +185,28 @@ presubmits: projected: sources: - secret: - name: cluster-secrets-aws - - configMap: - name: prow-job-cluster-launch-installer-e2e - name: job-definition + name: cluster-secrets-azure4 - name: pull-secret secret: secretName: regcred - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-disruptive,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-azure,?($|\s.*) - agent: kubernetes always_run: true branches: - release-4.7 cluster: api.ci - context: ci/prow/e2e-aws-operator + context: ci/prow/e2e-disruptive 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-etcd-operator-release-4.7-e2e-aws-operator - rerun_command: /test e2e-aws-operator + name: pull-ci-openshift-cluster-etcd-operator-release-4.7-e2e-disruptive + rerun_command: /test e2e-disruptive spec: containers: - args: @@ -161,19 +214,18 @@ presubmits: - --lease-server-password-file=/etc/boskos/password - --report-password-file=/etc/report/password.txt - --report-username=ci - - --secret-dir=/usr/local/e2e-aws-operator-cluster-profile - - --target=e2e-aws-operator - - --template=/usr/local/e2e-aws-operator + - --secret-dir=/usr/local/e2e-disruptive-cluster-profile + - --target=e2e-disruptive + - --template=/usr/local/e2e-disruptive command: - ci-operator env: - name: CLUSTER_TYPE value: aws - name: JOB_NAME_SAFE - value: e2e-aws-operator + value: e2e-disruptive - name: TEST_COMMAND - value: | - make test-e2e JUNITFILE=/tmp/artifacts/junit_report.xml --warn-undefined-variables + value: setup_ssh_bastion; TEST_SUITE=openshift/disruptive run-tests; TEST_SUITE=openshift/conformance/parallel run-tests image: ci-operator:latest imagePullPolicy: Always name: "" @@ -184,11 +236,11 @@ presubmits: - mountPath: /etc/boskos name: boskos readOnly: true - - mountPath: /usr/local/e2e-aws-operator-cluster-profile + - mountPath: /usr/local/e2e-disruptive-cluster-profile name: cluster-profile - - mountPath: /usr/local/e2e-aws-operator + - mountPath: /usr/local/e2e-disruptive name: job-definition - subPath: cluster-launch-installer-src.yaml + subPath: cluster-launch-installer-e2e.yaml - mountPath: /etc/pull-secret name: pull-secret readOnly: true @@ -209,7 +261,7 @@ presubmits: - secret: name: cluster-secrets-aws - configMap: - name: prow-job-cluster-launch-installer-src + name: prow-job-cluster-launch-installer-e2e name: job-definition - name: pull-secret secret: @@ -217,22 +269,22 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-aws-operator,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-disruptive,?($|\s.*) - agent: kubernetes - always_run: true + always_run: false branches: - release-4.7 cluster: api.ci - context: ci/prow/e2e-azure + context: ci/prow/e2e-gcp 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-etcd-operator-release-4.7-e2e-azure + name: pull-ci-openshift-cluster-etcd-operator-release-4.7-e2e-gcp optional: true - rerun_command: /test e2e-azure + rerun_command: /test e2e-gcp spec: containers: - args: @@ -240,8 +292,8 @@ presubmits: - --lease-server-password-file=/etc/boskos/password - --report-password-file=/etc/report/password.txt - --report-username=ci - - --secret-dir=/usr/local/e2e-azure-cluster-profile - - --target=e2e-azure + - --secret-dir=/usr/local/e2e-gcp-cluster-profile + - --target=e2e-gcp command: - ci-operator image: ci-operator:latest @@ -254,7 +306,7 @@ presubmits: - mountPath: /etc/boskos name: boskos readOnly: true - - mountPath: /usr/local/e2e-azure-cluster-profile + - mountPath: /usr/local/e2e-gcp-cluster-profile name: cluster-profile - mountPath: /etc/pull-secret name: pull-secret @@ -274,28 +326,31 @@ presubmits: projected: sources: - secret: - name: cluster-secrets-azure4 + name: cluster-secrets-gcp + - configMap: + name: cluster-profile-gcp - name: pull-secret secret: secretName: regcred - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-azure,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-gcp,?($|\s.*) - agent: kubernetes - always_run: true + always_run: false branches: - release-4.7 cluster: api.ci - context: ci/prow/e2e-gcp + context: ci/prow/e2e-metal-ipi 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-etcd-operator-release-4.7-e2e-gcp - rerun_command: /test e2e-gcp + name: pull-ci-openshift-cluster-etcd-operator-release-4.7-e2e-metal-ipi + optional: true + rerun_command: /test e2e-metal-ipi spec: containers: - args: @@ -303,8 +358,8 @@ presubmits: - --lease-server-password-file=/etc/boskos/password - --report-password-file=/etc/report/password.txt - --report-username=ci - - --secret-dir=/usr/local/e2e-gcp-cluster-profile - - --target=e2e-gcp + - --secret-dir=/usr/local/e2e-metal-ipi-cluster-profile + - --target=e2e-metal-ipi command: - ci-operator image: ci-operator:latest @@ -317,7 +372,7 @@ presubmits: - mountPath: /etc/boskos name: boskos readOnly: true - - mountPath: /usr/local/e2e-gcp-cluster-profile + - mountPath: /usr/local/e2e-metal-ipi-cluster-profile name: cluster-profile - mountPath: /etc/pull-secret name: pull-secret @@ -337,30 +392,30 @@ presubmits: projected: sources: - secret: - name: cluster-secrets-gcp + name: cluster-secrets-packet - configMap: - name: cluster-profile-gcp + name: cluster-profile-packet - name: pull-secret secret: secretName: regcred - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-gcp,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-metal-ipi,?($|\s.*) - agent: kubernetes always_run: true branches: - release-4.7 cluster: api.ci - context: ci/prow/e2e-gcp-upgrade + context: ci/prow/e2e-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-etcd-operator-release-4.7-e2e-gcp-upgrade - rerun_command: /test e2e-gcp-upgrade + name: pull-ci-openshift-cluster-etcd-operator-release-4.7-e2e-operator + rerun_command: /test e2e-operator spec: containers: - args: @@ -368,10 +423,19 @@ presubmits: - --lease-server-password-file=/etc/boskos/password - --report-password-file=/etc/report/password.txt - --report-username=ci - - --secret-dir=/usr/local/e2e-gcp-upgrade-cluster-profile - - --target=e2e-gcp-upgrade + - --secret-dir=/usr/local/e2e-operator-cluster-profile + - --target=e2e-operator + - --template=/usr/local/e2e-operator command: - ci-operator + env: + - name: CLUSTER_TYPE + value: aws + - name: JOB_NAME_SAFE + value: e2e-operator + - name: TEST_COMMAND + value: | + make test-e2e JUNITFILE=/tmp/artifacts/junit_report.xml --warn-undefined-variables image: ci-operator:latest imagePullPolicy: Always name: "" @@ -382,8 +446,11 @@ presubmits: - mountPath: /etc/boskos name: boskos readOnly: true - - mountPath: /usr/local/e2e-gcp-upgrade-cluster-profile + - mountPath: /usr/local/e2e-operator-cluster-profile name: cluster-profile + - mountPath: /usr/local/e2e-operator + name: job-definition + subPath: cluster-launch-installer-src.yaml - mountPath: /etc/pull-secret name: pull-secret readOnly: true @@ -402,30 +469,31 @@ presubmits: projected: sources: - secret: - name: cluster-secrets-gcp - - configMap: - name: cluster-profile-gcp + name: cluster-secrets-aws + - configMap: + name: prow-job-cluster-launch-installer-src + name: job-definition - name: pull-secret secret: secretName: regcred - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-gcp-upgrade,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-operator,?($|\s.*) - agent: kubernetes always_run: true branches: - release-4.7 cluster: api.ci - context: ci/prow/e2e-metal-ipi + 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-etcd-operator-release-4.7-e2e-metal-ipi - rerun_command: /test e2e-metal-ipi + name: pull-ci-openshift-cluster-etcd-operator-release-4.7-e2e-upgrade + rerun_command: /test e2e-upgrade spec: containers: - args: @@ -433,8 +501,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-ipi-cluster-profile - - --target=e2e-metal-ipi + - --secret-dir=/usr/local/e2e-upgrade-cluster-profile + - --target=e2e-upgrade command: - ci-operator image: ci-operator:latest @@ -447,7 +515,7 @@ presubmits: - mountPath: /etc/boskos name: boskos readOnly: true - - mountPath: /usr/local/e2e-metal-ipi-cluster-profile + - mountPath: /usr/local/e2e-upgrade-cluster-profile name: cluster-profile - mountPath: /etc/pull-secret name: pull-secret @@ -467,16 +535,16 @@ 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: regcred - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-metal-ipi,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-upgrade,?($|\s.*) - agent: kubernetes always_run: true branches: