diff --git a/ci-operator/config/openshift/kubernetes/openshift-kubernetes-master.yaml b/ci-operator/config/openshift/kubernetes/openshift-kubernetes-master.yaml index 76ec154ea5dc2..5606679d045b8 100644 --- a/ci-operator/config/openshift/kubernetes/openshift-kubernetes-master.yaml +++ b/ci-operator/config/openshift/kubernetes/openshift-kubernetes-master.yaml @@ -238,10 +238,25 @@ tests: steps: cluster_profile: aws workflow: openshift-e2e-aws-jenkins -- as: e2e-upgrade +- as: e2e-gcp-upgrade steps: cluster_profile: gcp workflow: openshift-upgrade-gcp-loki +- as: e2e-aws-upgrade + steps: + cluster_profile: aws + workflow: openshift-upgrade-aws-loki +- as: e2e-azure-upgrade + steps: + cluster_profile: azure4 + workflow: openshift-upgrade-azure-loki +- as: e2e-aws-selfupgrade + steps: + cluster_profile: aws + dependencies: + OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:latest + OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: release:initial + workflow: openshift-upgrade-aws-loki - as: e2e-aws-serial steps: cluster_profile: aws diff --git a/ci-operator/jobs/openshift/kubernetes/openshift-kubernetes-master-presubmits.yaml b/ci-operator/jobs/openshift/kubernetes/openshift-kubernetes-master-presubmits.yaml index 367b656ff19b1..b79f6d7e354fd 100644 --- a/ci-operator/jobs/openshift/kubernetes/openshift-kubernetes-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/kubernetes/openshift-kubernetes-master-presubmits.yaml @@ -579,6 +579,71 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-aws-ovn,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - master + cluster: build01 + context: ci/prow/e2e-aws-selfupgrade + 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-kubernetes-master-e2e-aws-selfupgrade + path_alias: k8s.io/kubernetes + rerun_command: /test e2e-aws-selfupgrade + run_if_changed: ^(openshift-hack/images/hyperkube)$ + 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-aws-selfupgrade-cluster-profile + - --target=e2e-aws-selfupgrade + 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-aws-selfupgrade-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-aws + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )e2e-aws-selfupgrade,?($|\s.*) - agent: kubernetes always_run: true branches: @@ -643,6 +708,71 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-aws-serial,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - master + cluster: build01 + context: ci/prow/e2e-aws-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-kubernetes-master-e2e-aws-upgrade + path_alias: k8s.io/kubernetes + rerun_command: /test e2e-aws-upgrade + run_if_changed: ^(openshift-hack/images/hyperkube)$ + 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-aws-upgrade-cluster-profile + - --target=e2e-aws-upgrade + 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-aws-upgrade-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-aws + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )e2e-aws-upgrade,?($|\s.*) - agent: kubernetes always_run: false branches: @@ -708,6 +838,71 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-azure,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - master + cluster: build01 + context: ci/prow/e2e-azure-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-kubernetes-master-e2e-azure-upgrade + path_alias: k8s.io/kubernetes + rerun_command: /test e2e-azure-upgrade + run_if_changed: ^(openshift-hack/images/hyperkube)$ + 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-azure-upgrade-cluster-profile + - --target=e2e-azure-upgrade + 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-azure-upgrade-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-azure4 + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )e2e-azure-upgrade,?($|\s.*) - agent: kubernetes always_run: true branches: @@ -842,41 +1037,31 @@ presubmits: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-gcp,?($|\s.*) - agent: kubernetes - always_run: false + always_run: true branches: - master cluster: build01 - context: ci/prow/e2e-openstack + context: ci/prow/e2e-gcp-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-kubernetes-master-e2e-openstack - optional: true - rerun_command: /test e2e-openstack + name: pull-ci-openshift-kubernetes-master-e2e-gcp-upgrade + path_alias: k8s.io/kubernetes + rerun_command: /test e2e-gcp-upgrade 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 - --lease-server-password-file=/etc/boskos/password - - --lease-server-username=ci - - --repo=kubernetes - - --secret-dir=/usr/local/e2e-openstack-cluster-profile - - --target=e2e-openstack - - --template=/usr/local/e2e-openstack + - --report-password-file=/etc/report/password.txt + - --report-username=ci + - --secret-dir=/usr/local/e2e-gcp-upgrade-cluster-profile + - --target=e2e-gcp-upgrade command: - ci-operator - env: - - name: CLUSTER_TYPE - value: openstack - - name: JOB_NAME_SAFE - value: e2e-openstack - - name: TEST_COMMAND - value: run-minimal-tests image: ci-operator:latest imagePullPolicy: Always name: "" @@ -884,28 +1069,19 @@ presubmits: requests: cpu: 10m volumeMounts: - - mountPath: /etc/apici - name: apici-ci-operator-credentials - readOnly: true - mountPath: /etc/boskos name: boskos readOnly: true - - mountPath: /usr/local/e2e-openstack-cluster-profile + - mountPath: /usr/local/e2e-gcp-upgrade-cluster-profile name: cluster-profile - - mountPath: /usr/local/e2e-openstack - name: job-definition - subPath: cluster-launch-installer-openstack-e2e.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 - name: boskos secret: items: @@ -916,40 +1092,52 @@ presubmits: projected: sources: - secret: - name: cluster-secrets-openstack - - configMap: - name: prow-job-cluster-launch-installer-openstack-e2e - name: job-definition + name: cluster-secrets-gcp + - configMap: + name: cluster-profile-gcp - name: pull-secret secret: - secretName: regcred - trigger: (?m)^/test( | .* )e2e-openstack,?($|\s.*) + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )e2e-gcp-upgrade,?($|\s.*) - agent: kubernetes - always_run: true + always_run: false branches: - master cluster: build01 - context: ci/prow/e2e-upgrade + context: ci/prow/e2e-openstack 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-kubernetes-master-e2e-upgrade - path_alias: k8s.io/kubernetes - rerun_command: /test e2e-upgrade + name: pull-ci-openshift-kubernetes-master-e2e-openstack + optional: true + rerun_command: /test e2e-openstack 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 - --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 + - --lease-server-username=ci + - --repo=kubernetes + - --secret-dir=/usr/local/e2e-openstack-cluster-profile + - --target=e2e-openstack + - --template=/usr/local/e2e-openstack command: - ci-operator + env: + - name: CLUSTER_TYPE + value: openstack + - name: JOB_NAME_SAFE + value: e2e-openstack + - name: TEST_COMMAND + value: run-minimal-tests image: ci-operator:latest imagePullPolicy: Always name: "" @@ -957,19 +1145,28 @@ presubmits: requests: cpu: 10m volumeMounts: + - mountPath: /etc/apici + name: apici-ci-operator-credentials + readOnly: true - mountPath: /etc/boskos name: boskos readOnly: true - - mountPath: /usr/local/e2e-upgrade-cluster-profile + - mountPath: /usr/local/e2e-openstack-cluster-profile name: cluster-profile + - mountPath: /usr/local/e2e-openstack + name: job-definition + subPath: cluster-launch-installer-openstack-e2e.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 - name: boskos secret: items: @@ -980,16 +1177,14 @@ presubmits: projected: sources: - secret: - name: cluster-secrets-gcp - - configMap: - name: cluster-profile-gcp + name: cluster-secrets-openstack + - configMap: + name: prow-job-cluster-launch-installer-openstack-e2e + name: job-definition - name: pull-secret secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-upgrade,?($|\s.*) + secretName: regcred + trigger: (?m)^/test( | .* )e2e-openstack,?($|\s.*) - agent: kubernetes always_run: false branches: