diff --git a/ci-operator/config/openshift/origin/openshift-origin-release-4.1.yaml b/ci-operator/config/openshift/origin/openshift-origin-release-4.1.yaml index cea990a22cd5f..d1dc0644cb377 100644 --- a/ci-operator/config/openshift/origin/openshift-origin-release-4.1.yaml +++ b/ci-operator/config/openshift/origin/openshift-origin-release-4.1.yaml @@ -292,3 +292,9 @@ tests: commands: sleep 7200 & wait openshift_installer_upi: cluster_profile: vsphere +- as: e2e-restore-cluster-state + commands: | + restore-cluster-state + TEST_SUITE=openshift/conformance/parallel run-tests + openshift_installer: + cluster_profile: aws diff --git a/ci-operator/config/openshift/origin/openshift-origin-release-4.2.yaml b/ci-operator/config/openshift/origin/openshift-origin-release-4.2.yaml index 604e4b3658ebf..d709297cb7864 100644 --- a/ci-operator/config/openshift/origin/openshift-origin-release-4.2.yaml +++ b/ci-operator/config/openshift/origin/openshift-origin-release-4.2.yaml @@ -293,3 +293,9 @@ tests: commands: sleep 7200 & wait openshift_installer_upi: cluster_profile: vsphere +- as: e2e-restore-cluster-state + commands: | + restore-cluster-state + TEST_SUITE=openshift/conformance/parallel run-tests + openshift_installer: + cluster_profile: aws diff --git a/ci-operator/config/openshift/origin/openshift-origin-release-4.3.yaml b/ci-operator/config/openshift/origin/openshift-origin-release-4.3.yaml index b31c1606f4970..7ee90d2b0cdc0 100644 --- a/ci-operator/config/openshift/origin/openshift-origin-release-4.3.yaml +++ b/ci-operator/config/openshift/origin/openshift-origin-release-4.3.yaml @@ -292,3 +292,9 @@ tests: commands: sleep 7200 & wait openshift_installer_upi: cluster_profile: vsphere +- as: e2e-restore-cluster-state + commands: | + restore-cluster-state + TEST_SUITE=openshift/conformance/parallel run-tests + openshift_installer: + cluster_profile: aws diff --git a/ci-operator/jobs/openshift/origin/openshift-origin-release-4.1-presubmits.yaml b/ci-operator/jobs/openshift/origin/openshift-origin-release-4.1-presubmits.yaml index 9c909610eb684..fc09d5dceb512 100644 --- a/ci-operator/jobs/openshift/origin/openshift-origin-release-4.1-presubmits.yaml +++ b/ci-operator/jobs/openshift/origin/openshift-origin-release-4.1-presubmits.yaml @@ -482,6 +482,73 @@ presubmits: secret: secretName: sentry-dsn trigger: '(?m)^/test (?:.*? )?e2e-aws-upgrade(?: .*?)?$' + - agent: kubernetes + always_run: false + branches: + - release-4.1 + context: ci/prow/e2e-restore-cluster-state + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/prowgen-controlled: "true" + name: pull-ci-openshift-origin-release-4.1-e2e-restore-cluster-state + optional: true + rerun_command: /test e2e-restore-cluster-state + spec: + containers: + - args: + - --artifact-dir=$(ARTIFACTS) + - --give-pr-author-access-to-namespace=true + - --secret-dir=/usr/local/e2e-restore-cluster-state-cluster-profile + - --sentry-dsn-path=/etc/sentry-dsn/ci-operator + - --target=e2e-restore-cluster-state + - --template=/usr/local/e2e-restore-cluster-state + command: + - ci-operator + env: + - name: CLUSTER_TYPE + value: aws + - name: CONFIG_SPEC + valueFrom: + configMapKeyRef: + key: openshift-origin-release-4.1.yaml + name: ci-operator-4.1-configs + - name: JOB_NAME_SAFE + value: e2e-restore-cluster-state + - name: TEST_COMMAND + value: | + restore-cluster-state + TEST_SUITE=openshift/conformance/parallel run-tests + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /usr/local/e2e-restore-cluster-state-cluster-profile + name: cluster-profile + - mountPath: /usr/local/e2e-restore-cluster-state + name: job-definition + subPath: cluster-launch-installer-e2e.yaml + - mountPath: /etc/sentry-dsn + name: sentry-dsn + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: cluster-profile + projected: + sources: + - secret: + name: cluster-secrets-aws + - configMap: + name: prow-job-cluster-launch-installer-e2e + name: job-definition + - name: sentry-dsn + secret: + secretName: sentry-dsn + trigger: '(?m)^/test (?:.*? )?e2e-restore-cluster-state(?: .*?)?$' - agent: kubernetes always_run: false branches: diff --git a/ci-operator/jobs/openshift/origin/openshift-origin-release-4.2-presubmits.yaml b/ci-operator/jobs/openshift/origin/openshift-origin-release-4.2-presubmits.yaml index 3e07bfaaa8ba9..5428eb8b93b8c 100644 --- a/ci-operator/jobs/openshift/origin/openshift-origin-release-4.2-presubmits.yaml +++ b/ci-operator/jobs/openshift/origin/openshift-origin-release-4.2-presubmits.yaml @@ -482,6 +482,73 @@ presubmits: secret: secretName: sentry-dsn trigger: '(?m)^/test (?:.*? )?e2e-aws-upgrade(?: .*?)?$' + - agent: kubernetes + always_run: false + branches: + - release-4.2 + context: ci/prow/e2e-restore-cluster-state + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/prowgen-controlled: "true" + name: pull-ci-openshift-origin-release-4.2-e2e-restore-cluster-state + optional: true + rerun_command: /test e2e-restore-cluster-state + spec: + containers: + - args: + - --artifact-dir=$(ARTIFACTS) + - --give-pr-author-access-to-namespace=true + - --secret-dir=/usr/local/e2e-restore-cluster-state-cluster-profile + - --sentry-dsn-path=/etc/sentry-dsn/ci-operator + - --target=e2e-restore-cluster-state + - --template=/usr/local/e2e-restore-cluster-state + command: + - ci-operator + env: + - name: CLUSTER_TYPE + value: aws + - name: CONFIG_SPEC + valueFrom: + configMapKeyRef: + key: openshift-origin-release-4.2.yaml + name: ci-operator-4.2-configs + - name: JOB_NAME_SAFE + value: e2e-restore-cluster-state + - name: TEST_COMMAND + value: | + restore-cluster-state + TEST_SUITE=openshift/conformance/parallel run-tests + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /usr/local/e2e-restore-cluster-state-cluster-profile + name: cluster-profile + - mountPath: /usr/local/e2e-restore-cluster-state + name: job-definition + subPath: cluster-launch-installer-e2e.yaml + - mountPath: /etc/sentry-dsn + name: sentry-dsn + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: cluster-profile + projected: + sources: + - secret: + name: cluster-secrets-aws + - configMap: + name: prow-job-cluster-launch-installer-e2e + name: job-definition + - name: sentry-dsn + secret: + secretName: sentry-dsn + trigger: '(?m)^/test (?:.*? )?e2e-restore-cluster-state(?: .*?)?$' - agent: kubernetes always_run: false branches: diff --git a/ci-operator/jobs/openshift/origin/openshift-origin-release-4.3-presubmits.yaml b/ci-operator/jobs/openshift/origin/openshift-origin-release-4.3-presubmits.yaml index 45c0b3422a1dd..6e30468b2605c 100644 --- a/ci-operator/jobs/openshift/origin/openshift-origin-release-4.3-presubmits.yaml +++ b/ci-operator/jobs/openshift/origin/openshift-origin-release-4.3-presubmits.yaml @@ -482,6 +482,73 @@ presubmits: secret: secretName: sentry-dsn trigger: '(?m)^/test (?:.*? )?e2e-aws-upgrade(?: .*?)?$' + - agent: kubernetes + always_run: false + branches: + - release-4.3 + context: ci/prow/e2e-restore-cluster-state + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/prowgen-controlled: "true" + name: pull-ci-openshift-origin-release-4.3-e2e-restore-cluster-state + optional: true + rerun_command: /test e2e-restore-cluster-state + spec: + containers: + - args: + - --artifact-dir=$(ARTIFACTS) + - --give-pr-author-access-to-namespace=true + - --secret-dir=/usr/local/e2e-restore-cluster-state-cluster-profile + - --sentry-dsn-path=/etc/sentry-dsn/ci-operator + - --target=e2e-restore-cluster-state + - --template=/usr/local/e2e-restore-cluster-state + command: + - ci-operator + env: + - name: CLUSTER_TYPE + value: aws + - name: CONFIG_SPEC + valueFrom: + configMapKeyRef: + key: openshift-origin-release-4.3.yaml + name: ci-operator-4.3-configs + - name: JOB_NAME_SAFE + value: e2e-restore-cluster-state + - name: TEST_COMMAND + value: | + restore-cluster-state + TEST_SUITE=openshift/conformance/parallel run-tests + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /usr/local/e2e-restore-cluster-state-cluster-profile + name: cluster-profile + - mountPath: /usr/local/e2e-restore-cluster-state + name: job-definition + subPath: cluster-launch-installer-e2e.yaml + - mountPath: /etc/sentry-dsn + name: sentry-dsn + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: cluster-profile + projected: + sources: + - secret: + name: cluster-secrets-aws + - configMap: + name: prow-job-cluster-launch-installer-e2e + name: job-definition + - name: sentry-dsn + secret: + secretName: sentry-dsn + trigger: '(?m)^/test (?:.*? )?e2e-restore-cluster-state(?: .*?)?$' - agent: kubernetes always_run: false branches: