From cb4547016502ecf5bee0ebb31cfee342713ea72d Mon Sep 17 00:00:00 2001 From: Patrick Dillon Date: Thu, 16 May 2019 11:38:35 -0400 Subject: [PATCH] Always run RHEL scaleup in installer repo. --- .../installer/openshift-installer-master.yaml | 2 +- .../openshift-installer-release-4.0.yaml | 2 +- .../openshift-installer-release-4.1.yaml | 2 +- .../openshift-installer-release-4.2.yaml | 2 +- .../openshift-installer-release-4.3.yaml | 2 +- ...openshift-installer-master-presubmits.yaml | 138 +++++++++--------- ...hift-installer-release-4.0-presubmits.yaml | 66 ++++----- ...hift-installer-release-4.1-presubmits.yaml | 92 ++++++------ ...hift-installer-release-4.2-presubmits.yaml | 92 ++++++------ ...hift-installer-release-4.3-presubmits.yaml | 92 ++++++------ 10 files changed, 245 insertions(+), 245 deletions(-) diff --git a/ci-operator/config/openshift/installer/openshift-installer-master.yaml b/ci-operator/config/openshift/installer/openshift-installer-master.yaml index ddacd80e84d2f..a15ec4d04e366 100644 --- a/ci-operator/config/openshift/installer/openshift-installer-master.yaml +++ b/ci-operator/config/openshift/installer/openshift-installer-master.yaml @@ -138,7 +138,7 @@ tests: commands: TEST_SUITE=openshift/conformance/parallel run-tests openshift_installer_upi: cluster_profile: aws -- as: e2e-rhel-scaleup +- as: e2e-aws-scaleup-rhel7 commands: TEST_SUITE=openshift/conformance run-tests openshift_ansible_40: cluster_profile: aws-centos-40 diff --git a/ci-operator/config/openshift/installer/openshift-installer-release-4.0.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-4.0.yaml index 041d567fe0d96..da1163fdf9284 100644 --- a/ci-operator/config/openshift/installer/openshift-installer-release-4.0.yaml +++ b/ci-operator/config/openshift/installer/openshift-installer-release-4.0.yaml @@ -130,7 +130,7 @@ tests: openshift_installer: cluster_profile: aws upgrade: true -- as: e2e-rhel-scaleup +- as: e2e-aws-scaleup-rhel7 commands: TEST_SUITE=openshift/conformance run-tests openshift_ansible_40: cluster_profile: aws-centos-40 diff --git a/ci-operator/config/openshift/installer/openshift-installer-release-4.1.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-4.1.yaml index 1048dc90be6bf..09bc032c37132 100644 --- a/ci-operator/config/openshift/installer/openshift-installer-release-4.1.yaml +++ b/ci-operator/config/openshift/installer/openshift-installer-release-4.1.yaml @@ -138,7 +138,7 @@ tests: commands: TEST_SUITE=openshift/conformance/parallel run-tests openshift_installer_upi: cluster_profile: aws -- as: e2e-rhel-scaleup +- as: e2e-aws-scaleup-rhel7 commands: TEST_SUITE=openshift/conformance run-tests openshift_ansible_40: cluster_profile: aws-centos-40 diff --git a/ci-operator/config/openshift/installer/openshift-installer-release-4.2.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-4.2.yaml index e71cca9e5aabe..50fd86fd9c0fd 100644 --- a/ci-operator/config/openshift/installer/openshift-installer-release-4.2.yaml +++ b/ci-operator/config/openshift/installer/openshift-installer-release-4.2.yaml @@ -139,7 +139,7 @@ tests: commands: TEST_SUITE=openshift/conformance/parallel run-tests openshift_installer_upi: cluster_profile: aws -- as: e2e-rhel-scaleup +- as: e2e-aws-scaleup-rhel7 commands: TEST_SUITE=openshift/conformance run-tests openshift_ansible_40: cluster_profile: aws-centos-40 diff --git a/ci-operator/config/openshift/installer/openshift-installer-release-4.3.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-4.3.yaml index 3a0bbc6ed80e9..62f42ae28a358 100644 --- a/ci-operator/config/openshift/installer/openshift-installer-release-4.3.yaml +++ b/ci-operator/config/openshift/installer/openshift-installer-release-4.3.yaml @@ -138,7 +138,7 @@ tests: commands: TEST_SUITE=openshift/conformance/parallel run-tests openshift_installer_upi: cluster_profile: aws -- as: e2e-rhel-scaleup +- as: e2e-aws-scaleup-rhel7 commands: TEST_SUITE=openshift/conformance run-tests openshift_ansible_40: cluster_profile: aws-centos-40 diff --git a/ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml b/ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml index 136218a526b58..33a6fad7e4f49 100644 --- a/ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml @@ -163,6 +163,75 @@ presubmits: name: prow-job-cluster-launch-installer-e2e name: job-definition trigger: '(?m)^/test (?:.*? )?e2e-aws-rhel8(?: .*?)?$' + - agent: kubernetes + always_run: true + branches: + - master + context: ci/prow/e2e-aws-scaleup-rhel7 + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/prowgen-controlled: "true" + name: pull-ci-openshift-installer-master-e2e-aws-scaleup-rhel7 + optional: true + rerun_command: /test e2e-aws-scaleup-rhel7 + spec: + containers: + - args: + - --artifact-dir=$(ARTIFACTS) + - --give-pr-author-access-to-namespace=true + - --secret-dir=/usr/local/e2e-aws-scaleup-rhel7-cluster-profile + - --sentry-dsn-path=/etc/sentry-dsn/ci-operator + - --target=e2e-aws-scaleup-rhel7 + - --template=/usr/local/e2e-aws-scaleup-rhel7 + command: + - ci-operator + env: + - name: CLUSTER_TYPE + value: aws + - name: CONFIG_SPEC + valueFrom: + configMapKeyRef: + key: openshift-installer-master.yaml + name: ci-operator-master-configs + - name: JOB_NAME_SAFE + value: e2e-aws-scaleup-rhel7 + - name: RPM_REPO_OPENSHIFT_ORIGIN + value: https://rpms.svc.ci.openshift.org/openshift-origin-v4.2/ + - name: TEST_COMMAND + value: TEST_SUITE=openshift/conformance run-tests + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /usr/local/e2e-aws-scaleup-rhel7-cluster-profile + name: cluster-profile + - mountPath: /usr/local/e2e-aws-scaleup-rhel7 + name: job-definition + subPath: cluster-scaleup-e2e-40.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: cluster-profile-aws-centos-40 + - configMap: + name: prow-job-cluster-scaleup-e2e-40 + name: job-definition + - name: sentry-dsn + secret: + secretName: sentry-dsn + trigger: '(?m)^/test (?:.*? )?e2e-aws-scaleup-rhel7(?: .*?)?$' - agent: kubernetes always_run: true branches: @@ -647,75 +716,6 @@ presubmits: secret: secretName: sentry-dsn trigger: '(?m)^/test (?:.*? )?e2e-restore-cluster-state(?: .*?)?$' - - agent: kubernetes - always_run: false - branches: - - master - context: ci/prow/e2e-rhel-scaleup - decorate: true - decoration_config: - skip_cloning: true - labels: - ci-operator.openshift.io/prowgen-controlled: "true" - name: pull-ci-openshift-installer-master-e2e-rhel-scaleup - optional: true - rerun_command: /test e2e-rhel-scaleup - spec: - containers: - - args: - - --artifact-dir=$(ARTIFACTS) - - --give-pr-author-access-to-namespace=true - - --secret-dir=/usr/local/e2e-rhel-scaleup-cluster-profile - - --sentry-dsn-path=/etc/sentry-dsn/ci-operator - - --target=e2e-rhel-scaleup - - --template=/usr/local/e2e-rhel-scaleup - command: - - ci-operator - env: - - name: CLUSTER_TYPE - value: aws - - name: CONFIG_SPEC - valueFrom: - configMapKeyRef: - key: openshift-installer-master.yaml - name: ci-operator-master-configs - - name: JOB_NAME_SAFE - value: e2e-rhel-scaleup - - name: RPM_REPO_OPENSHIFT_ORIGIN - value: https://rpms.svc.ci.openshift.org/openshift-origin-v4.2/ - - name: TEST_COMMAND - value: TEST_SUITE=openshift/conformance run-tests - image: ci-operator:latest - imagePullPolicy: Always - name: "" - resources: - requests: - cpu: 10m - volumeMounts: - - mountPath: /usr/local/e2e-rhel-scaleup-cluster-profile - name: cluster-profile - - mountPath: /usr/local/e2e-rhel-scaleup - name: job-definition - subPath: cluster-scaleup-e2e-40.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: cluster-profile-aws-centos-40 - - configMap: - name: prow-job-cluster-scaleup-e2e-40 - name: job-definition - - name: sentry-dsn - secret: - secretName: sentry-dsn - trigger: '(?m)^/test (?:.*? )?e2e-rhel-scaleup(?: .*?)?$' - agent: kubernetes always_run: false branches: diff --git a/ci-operator/jobs/openshift/installer/openshift-installer-release-4.0-presubmits.yaml b/ci-operator/jobs/openshift/installer/openshift-installer-release-4.0-presubmits.yaml index 656de2f8a3f97..7b4c7a31887bd 100644 --- a/ci-operator/jobs/openshift/installer/openshift-installer-release-4.0-presubmits.yaml +++ b/ci-operator/jobs/openshift/installer/openshift-installer-release-4.0-presubmits.yaml @@ -69,30 +69,40 @@ presubmits: always_run: true branches: - release-4.0 - context: ci/prow/e2e-aws-upgrade + context: ci/prow/e2e-aws-scaleup-rhel7 decorate: true decoration_config: skip_cloning: true labels: ci-operator.openshift.io/prowgen-controlled: "true" - name: pull-ci-openshift-installer-release-4.0-e2e-aws-upgrade - rerun_command: /test e2e-aws-upgrade + name: pull-ci-openshift-installer-release-4.0-e2e-aws-scaleup-rhel7 + optional: true + rerun_command: /test e2e-aws-scaleup-rhel7 spec: containers: - args: - --artifact-dir=$(ARTIFACTS) - --give-pr-author-access-to-namespace=true - - --secret-dir=/usr/local/e2e-aws-upgrade-cluster-profile + - --secret-dir=/usr/local/e2e-aws-scaleup-rhel7-cluster-profile - --sentry-dsn-path=/etc/sentry-dsn/ci-operator - - --target=e2e-aws-upgrade + - --target=e2e-aws-scaleup-rhel7 + - --template=/usr/local/e2e-aws-scaleup-rhel7 command: - ci-operator env: + - name: CLUSTER_TYPE + value: aws - name: CONFIG_SPEC valueFrom: configMapKeyRef: key: openshift-installer-release-4.0.yaml name: ci-operator-4.0-configs + - name: JOB_NAME_SAFE + value: e2e-aws-scaleup-rhel7 + - name: RPM_REPO_OPENSHIFT_ORIGIN + value: https://rpms.svc.ci.openshift.org/openshift-origin-v4.0/ + - name: TEST_COMMAND + value: TEST_SUITE=openshift/conformance run-tests image: ci-operator:latest imagePullPolicy: Always name: "" @@ -100,8 +110,11 @@ presubmits: requests: cpu: 10m volumeMounts: - - mountPath: /usr/local/e2e-aws-upgrade-cluster-profile + - mountPath: /usr/local/e2e-aws-scaleup-rhel7-cluster-profile name: cluster-profile + - mountPath: /usr/local/e2e-aws-scaleup-rhel7 + name: job-definition + subPath: cluster-scaleup-e2e-40.yaml - mountPath: /etc/sentry-dsn name: sentry-dsn readOnly: true @@ -112,48 +125,43 @@ presubmits: sources: - secret: name: cluster-secrets-aws + - configMap: + name: cluster-profile-aws-centos-40 + - configMap: + name: prow-job-cluster-scaleup-e2e-40 + name: job-definition - name: sentry-dsn secret: secretName: sentry-dsn - trigger: '(?m)^/test (?:.*? )?e2e-aws-upgrade(?: .*?)?$' + trigger: '(?m)^/test (?:.*? )?e2e-aws-scaleup-rhel7(?: .*?)?$' - agent: kubernetes - always_run: false + always_run: true branches: - release-4.0 - context: ci/prow/e2e-rhel-scaleup + context: ci/prow/e2e-aws-upgrade decorate: true decoration_config: skip_cloning: true labels: ci-operator.openshift.io/prowgen-controlled: "true" - name: pull-ci-openshift-installer-release-4.0-e2e-rhel-scaleup - optional: true - rerun_command: /test e2e-rhel-scaleup + name: pull-ci-openshift-installer-release-4.0-e2e-aws-upgrade + rerun_command: /test e2e-aws-upgrade spec: containers: - args: - --artifact-dir=$(ARTIFACTS) - --give-pr-author-access-to-namespace=true - - --secret-dir=/usr/local/e2e-rhel-scaleup-cluster-profile + - --secret-dir=/usr/local/e2e-aws-upgrade-cluster-profile - --sentry-dsn-path=/etc/sentry-dsn/ci-operator - - --target=e2e-rhel-scaleup - - --template=/usr/local/e2e-rhel-scaleup + - --target=e2e-aws-upgrade command: - ci-operator env: - - name: CLUSTER_TYPE - value: aws - name: CONFIG_SPEC valueFrom: configMapKeyRef: key: openshift-installer-release-4.0.yaml name: ci-operator-4.0-configs - - name: JOB_NAME_SAFE - value: e2e-rhel-scaleup - - name: RPM_REPO_OPENSHIFT_ORIGIN - value: https://rpms.svc.ci.openshift.org/openshift-origin-v4.0/ - - name: TEST_COMMAND - value: TEST_SUITE=openshift/conformance run-tests image: ci-operator:latest imagePullPolicy: Always name: "" @@ -161,11 +169,8 @@ presubmits: requests: cpu: 10m volumeMounts: - - mountPath: /usr/local/e2e-rhel-scaleup-cluster-profile + - mountPath: /usr/local/e2e-aws-upgrade-cluster-profile name: cluster-profile - - mountPath: /usr/local/e2e-rhel-scaleup - name: job-definition - subPath: cluster-scaleup-e2e-40.yaml - mountPath: /etc/sentry-dsn name: sentry-dsn readOnly: true @@ -176,15 +181,10 @@ presubmits: sources: - secret: name: cluster-secrets-aws - - configMap: - name: cluster-profile-aws-centos-40 - - configMap: - name: prow-job-cluster-scaleup-e2e-40 - name: job-definition - name: sentry-dsn secret: secretName: sentry-dsn - trigger: '(?m)^/test (?:.*? )?e2e-rhel-scaleup(?: .*?)?$' + trigger: '(?m)^/test (?:.*? )?e2e-aws-upgrade(?: .*?)?$' - agent: kubernetes always_run: false branches: diff --git a/ci-operator/jobs/openshift/installer/openshift-installer-release-4.1-presubmits.yaml b/ci-operator/jobs/openshift/installer/openshift-installer-release-4.1-presubmits.yaml index 178a136f59db9..09971cae292d0 100644 --- a/ci-operator/jobs/openshift/installer/openshift-installer-release-4.1-presubmits.yaml +++ b/ci-operator/jobs/openshift/installer/openshift-installer-release-4.1-presubmits.yaml @@ -69,30 +69,40 @@ presubmits: always_run: true branches: - release-4.1 - context: ci/prow/e2e-aws-upgrade + context: ci/prow/e2e-aws-scaleup-rhel7 decorate: true decoration_config: skip_cloning: true labels: ci-operator.openshift.io/prowgen-controlled: "true" - name: pull-ci-openshift-installer-release-4.1-e2e-aws-upgrade - rerun_command: /test e2e-aws-upgrade + name: pull-ci-openshift-installer-release-4.1-e2e-aws-scaleup-rhel7 + optional: true + rerun_command: /test e2e-aws-scaleup-rhel7 spec: containers: - args: - --artifact-dir=$(ARTIFACTS) - --give-pr-author-access-to-namespace=true - - --secret-dir=/usr/local/e2e-aws-upgrade-cluster-profile + - --secret-dir=/usr/local/e2e-aws-scaleup-rhel7-cluster-profile - --sentry-dsn-path=/etc/sentry-dsn/ci-operator - - --target=e2e-aws-upgrade + - --target=e2e-aws-scaleup-rhel7 + - --template=/usr/local/e2e-aws-scaleup-rhel7 command: - ci-operator env: + - name: CLUSTER_TYPE + value: aws - name: CONFIG_SPEC valueFrom: configMapKeyRef: key: openshift-installer-release-4.1.yaml name: ci-operator-4.1-configs + - name: JOB_NAME_SAFE + value: e2e-aws-scaleup-rhel7 + - name: RPM_REPO_OPENSHIFT_ORIGIN + value: https://rpms.svc.ci.openshift.org/openshift-origin-v4.1/ + - name: TEST_COMMAND + value: TEST_SUITE=openshift/conformance run-tests image: ci-operator:latest imagePullPolicy: Always name: "" @@ -100,8 +110,11 @@ presubmits: requests: cpu: 10m volumeMounts: - - mountPath: /usr/local/e2e-aws-upgrade-cluster-profile + - mountPath: /usr/local/e2e-aws-scaleup-rhel7-cluster-profile name: cluster-profile + - mountPath: /usr/local/e2e-aws-scaleup-rhel7 + name: job-definition + subPath: cluster-scaleup-e2e-40.yaml - mountPath: /etc/sentry-dsn name: sentry-dsn readOnly: true @@ -112,46 +125,43 @@ presubmits: sources: - secret: name: cluster-secrets-aws + - configMap: + name: cluster-profile-aws-centos-40 + - configMap: + name: prow-job-cluster-scaleup-e2e-40 + name: job-definition - name: sentry-dsn secret: secretName: sentry-dsn - trigger: '(?m)^/test (?:.*? )?e2e-aws-upgrade(?: .*?)?$' + trigger: '(?m)^/test (?:.*? )?e2e-aws-scaleup-rhel7(?: .*?)?$' - agent: kubernetes - always_run: false + always_run: true branches: - release-4.1 - context: ci/prow/e2e-aws-upi + context: ci/prow/e2e-aws-upgrade decorate: true decoration_config: skip_cloning: true labels: ci-operator.openshift.io/prowgen-controlled: "true" - name: pull-ci-openshift-installer-release-4.1-e2e-aws-upi - optional: true - rerun_command: /test e2e-aws-upi + name: pull-ci-openshift-installer-release-4.1-e2e-aws-upgrade + rerun_command: /test e2e-aws-upgrade spec: containers: - args: - --artifact-dir=$(ARTIFACTS) - --give-pr-author-access-to-namespace=true - - --secret-dir=/usr/local/e2e-aws-upi-cluster-profile + - --secret-dir=/usr/local/e2e-aws-upgrade-cluster-profile - --sentry-dsn-path=/etc/sentry-dsn/ci-operator - - --target=e2e-aws-upi - - --template=/usr/local/e2e-aws-upi + - --target=e2e-aws-upgrade command: - ci-operator env: - - name: CLUSTER_TYPE - value: aws - name: CONFIG_SPEC valueFrom: configMapKeyRef: key: openshift-installer-release-4.1.yaml name: ci-operator-4.1-configs - - name: JOB_NAME_SAFE - value: e2e-aws-upi - - name: TEST_COMMAND - value: TEST_SUITE=openshift/conformance/parallel run-tests image: ci-operator:latest imagePullPolicy: Always name: "" @@ -159,11 +169,8 @@ presubmits: requests: cpu: 10m volumeMounts: - - mountPath: /usr/local/e2e-aws-upi-cluster-profile + - mountPath: /usr/local/e2e-aws-upgrade-cluster-profile name: cluster-profile - - mountPath: /usr/local/e2e-aws-upi - name: job-definition - subPath: cluster-launch-installer-upi-e2e.yaml - mountPath: /etc/sentry-dsn name: sentry-dsn readOnly: true @@ -174,35 +181,32 @@ presubmits: sources: - secret: name: cluster-secrets-aws - - configMap: - name: prow-job-cluster-launch-installer-upi-e2e - name: job-definition - name: sentry-dsn secret: secretName: sentry-dsn - trigger: '(?m)^/test (?:.*? )?e2e-aws-upi(?: .*?)?$' + trigger: '(?m)^/test (?:.*? )?e2e-aws-upgrade(?: .*?)?$' - agent: kubernetes always_run: false branches: - release-4.1 - context: ci/prow/e2e-rhel-scaleup + context: ci/prow/e2e-aws-upi decorate: true decoration_config: skip_cloning: true labels: ci-operator.openshift.io/prowgen-controlled: "true" - name: pull-ci-openshift-installer-release-4.1-e2e-rhel-scaleup + name: pull-ci-openshift-installer-release-4.1-e2e-aws-upi optional: true - rerun_command: /test e2e-rhel-scaleup + rerun_command: /test e2e-aws-upi spec: containers: - args: - --artifact-dir=$(ARTIFACTS) - --give-pr-author-access-to-namespace=true - - --secret-dir=/usr/local/e2e-rhel-scaleup-cluster-profile + - --secret-dir=/usr/local/e2e-aws-upi-cluster-profile - --sentry-dsn-path=/etc/sentry-dsn/ci-operator - - --target=e2e-rhel-scaleup - - --template=/usr/local/e2e-rhel-scaleup + - --target=e2e-aws-upi + - --template=/usr/local/e2e-aws-upi command: - ci-operator env: @@ -214,11 +218,9 @@ presubmits: key: openshift-installer-release-4.1.yaml name: ci-operator-4.1-configs - name: JOB_NAME_SAFE - value: e2e-rhel-scaleup - - name: RPM_REPO_OPENSHIFT_ORIGIN - value: https://rpms.svc.ci.openshift.org/openshift-origin-v4.1/ + value: e2e-aws-upi - name: TEST_COMMAND - value: TEST_SUITE=openshift/conformance run-tests + value: TEST_SUITE=openshift/conformance/parallel run-tests image: ci-operator:latest imagePullPolicy: Always name: "" @@ -226,11 +228,11 @@ presubmits: requests: cpu: 10m volumeMounts: - - mountPath: /usr/local/e2e-rhel-scaleup-cluster-profile + - mountPath: /usr/local/e2e-aws-upi-cluster-profile name: cluster-profile - - mountPath: /usr/local/e2e-rhel-scaleup + - mountPath: /usr/local/e2e-aws-upi name: job-definition - subPath: cluster-scaleup-e2e-40.yaml + subPath: cluster-launch-installer-upi-e2e.yaml - mountPath: /etc/sentry-dsn name: sentry-dsn readOnly: true @@ -241,15 +243,13 @@ presubmits: sources: - secret: name: cluster-secrets-aws - - configMap: - name: cluster-profile-aws-centos-40 - configMap: - name: prow-job-cluster-scaleup-e2e-40 + name: prow-job-cluster-launch-installer-upi-e2e name: job-definition - name: sentry-dsn secret: secretName: sentry-dsn - trigger: '(?m)^/test (?:.*? )?e2e-rhel-scaleup(?: .*?)?$' + trigger: '(?m)^/test (?:.*? )?e2e-aws-upi(?: .*?)?$' - agent: kubernetes always_run: false branches: diff --git a/ci-operator/jobs/openshift/installer/openshift-installer-release-4.2-presubmits.yaml b/ci-operator/jobs/openshift/installer/openshift-installer-release-4.2-presubmits.yaml index cf755757f9665..53fd1dd5b35d1 100644 --- a/ci-operator/jobs/openshift/installer/openshift-installer-release-4.2-presubmits.yaml +++ b/ci-operator/jobs/openshift/installer/openshift-installer-release-4.2-presubmits.yaml @@ -69,30 +69,40 @@ presubmits: always_run: true branches: - release-4.2 - context: ci/prow/e2e-aws-upgrade + context: ci/prow/e2e-aws-scaleup-rhel7 decorate: true decoration_config: skip_cloning: true labels: ci-operator.openshift.io/prowgen-controlled: "true" - name: pull-ci-openshift-installer-release-4.2-e2e-aws-upgrade - rerun_command: /test e2e-aws-upgrade + name: pull-ci-openshift-installer-release-4.2-e2e-aws-scaleup-rhel7 + optional: true + rerun_command: /test e2e-aws-scaleup-rhel7 spec: containers: - args: - --artifact-dir=$(ARTIFACTS) - --give-pr-author-access-to-namespace=true - - --secret-dir=/usr/local/e2e-aws-upgrade-cluster-profile + - --secret-dir=/usr/local/e2e-aws-scaleup-rhel7-cluster-profile - --sentry-dsn-path=/etc/sentry-dsn/ci-operator - - --target=e2e-aws-upgrade + - --target=e2e-aws-scaleup-rhel7 + - --template=/usr/local/e2e-aws-scaleup-rhel7 command: - ci-operator env: + - name: CLUSTER_TYPE + value: aws - name: CONFIG_SPEC valueFrom: configMapKeyRef: key: openshift-installer-release-4.2.yaml name: ci-operator-4.2-configs + - name: JOB_NAME_SAFE + value: e2e-aws-scaleup-rhel7 + - name: RPM_REPO_OPENSHIFT_ORIGIN + value: https://rpms.svc.ci.openshift.org/openshift-origin-v4.2/ + - name: TEST_COMMAND + value: TEST_SUITE=openshift/conformance run-tests image: ci-operator:latest imagePullPolicy: Always name: "" @@ -100,8 +110,11 @@ presubmits: requests: cpu: 10m volumeMounts: - - mountPath: /usr/local/e2e-aws-upgrade-cluster-profile + - mountPath: /usr/local/e2e-aws-scaleup-rhel7-cluster-profile name: cluster-profile + - mountPath: /usr/local/e2e-aws-scaleup-rhel7 + name: job-definition + subPath: cluster-scaleup-e2e-40.yaml - mountPath: /etc/sentry-dsn name: sentry-dsn readOnly: true @@ -112,46 +125,43 @@ presubmits: sources: - secret: name: cluster-secrets-aws + - configMap: + name: cluster-profile-aws-centos-40 + - configMap: + name: prow-job-cluster-scaleup-e2e-40 + name: job-definition - name: sentry-dsn secret: secretName: sentry-dsn - trigger: '(?m)^/test (?:.*? )?e2e-aws-upgrade(?: .*?)?$' + trigger: '(?m)^/test (?:.*? )?e2e-aws-scaleup-rhel7(?: .*?)?$' - agent: kubernetes - always_run: false + always_run: true branches: - release-4.2 - context: ci/prow/e2e-aws-upi + context: ci/prow/e2e-aws-upgrade decorate: true decoration_config: skip_cloning: true labels: ci-operator.openshift.io/prowgen-controlled: "true" - name: pull-ci-openshift-installer-release-4.2-e2e-aws-upi - optional: true - rerun_command: /test e2e-aws-upi + name: pull-ci-openshift-installer-release-4.2-e2e-aws-upgrade + rerun_command: /test e2e-aws-upgrade spec: containers: - args: - --artifact-dir=$(ARTIFACTS) - --give-pr-author-access-to-namespace=true - - --secret-dir=/usr/local/e2e-aws-upi-cluster-profile + - --secret-dir=/usr/local/e2e-aws-upgrade-cluster-profile - --sentry-dsn-path=/etc/sentry-dsn/ci-operator - - --target=e2e-aws-upi - - --template=/usr/local/e2e-aws-upi + - --target=e2e-aws-upgrade command: - ci-operator env: - - name: CLUSTER_TYPE - value: aws - name: CONFIG_SPEC valueFrom: configMapKeyRef: key: openshift-installer-release-4.2.yaml name: ci-operator-4.2-configs - - name: JOB_NAME_SAFE - value: e2e-aws-upi - - name: TEST_COMMAND - value: TEST_SUITE=openshift/conformance/parallel run-tests image: ci-operator:latest imagePullPolicy: Always name: "" @@ -159,11 +169,8 @@ presubmits: requests: cpu: 10m volumeMounts: - - mountPath: /usr/local/e2e-aws-upi-cluster-profile + - mountPath: /usr/local/e2e-aws-upgrade-cluster-profile name: cluster-profile - - mountPath: /usr/local/e2e-aws-upi - name: job-definition - subPath: cluster-launch-installer-upi-e2e.yaml - mountPath: /etc/sentry-dsn name: sentry-dsn readOnly: true @@ -174,35 +181,32 @@ presubmits: sources: - secret: name: cluster-secrets-aws - - configMap: - name: prow-job-cluster-launch-installer-upi-e2e - name: job-definition - name: sentry-dsn secret: secretName: sentry-dsn - trigger: '(?m)^/test (?:.*? )?e2e-aws-upi(?: .*?)?$' + trigger: '(?m)^/test (?:.*? )?e2e-aws-upgrade(?: .*?)?$' - agent: kubernetes always_run: false branches: - release-4.2 - context: ci/prow/e2e-rhel-scaleup + context: ci/prow/e2e-aws-upi decorate: true decoration_config: skip_cloning: true labels: ci-operator.openshift.io/prowgen-controlled: "true" - name: pull-ci-openshift-installer-release-4.2-e2e-rhel-scaleup + name: pull-ci-openshift-installer-release-4.2-e2e-aws-upi optional: true - rerun_command: /test e2e-rhel-scaleup + rerun_command: /test e2e-aws-upi spec: containers: - args: - --artifact-dir=$(ARTIFACTS) - --give-pr-author-access-to-namespace=true - - --secret-dir=/usr/local/e2e-rhel-scaleup-cluster-profile + - --secret-dir=/usr/local/e2e-aws-upi-cluster-profile - --sentry-dsn-path=/etc/sentry-dsn/ci-operator - - --target=e2e-rhel-scaleup - - --template=/usr/local/e2e-rhel-scaleup + - --target=e2e-aws-upi + - --template=/usr/local/e2e-aws-upi command: - ci-operator env: @@ -214,11 +218,9 @@ presubmits: key: openshift-installer-release-4.2.yaml name: ci-operator-4.2-configs - name: JOB_NAME_SAFE - value: e2e-rhel-scaleup - - name: RPM_REPO_OPENSHIFT_ORIGIN - value: https://rpms.svc.ci.openshift.org/openshift-origin-v4.2/ + value: e2e-aws-upi - name: TEST_COMMAND - value: TEST_SUITE=openshift/conformance run-tests + value: TEST_SUITE=openshift/conformance/parallel run-tests image: ci-operator:latest imagePullPolicy: Always name: "" @@ -226,11 +228,11 @@ presubmits: requests: cpu: 10m volumeMounts: - - mountPath: /usr/local/e2e-rhel-scaleup-cluster-profile + - mountPath: /usr/local/e2e-aws-upi-cluster-profile name: cluster-profile - - mountPath: /usr/local/e2e-rhel-scaleup + - mountPath: /usr/local/e2e-aws-upi name: job-definition - subPath: cluster-scaleup-e2e-40.yaml + subPath: cluster-launch-installer-upi-e2e.yaml - mountPath: /etc/sentry-dsn name: sentry-dsn readOnly: true @@ -241,15 +243,13 @@ presubmits: sources: - secret: name: cluster-secrets-aws - - configMap: - name: cluster-profile-aws-centos-40 - configMap: - name: prow-job-cluster-scaleup-e2e-40 + name: prow-job-cluster-launch-installer-upi-e2e name: job-definition - name: sentry-dsn secret: secretName: sentry-dsn - trigger: '(?m)^/test (?:.*? )?e2e-rhel-scaleup(?: .*?)?$' + trigger: '(?m)^/test (?:.*? )?e2e-aws-upi(?: .*?)?$' - agent: kubernetes always_run: false branches: diff --git a/ci-operator/jobs/openshift/installer/openshift-installer-release-4.3-presubmits.yaml b/ci-operator/jobs/openshift/installer/openshift-installer-release-4.3-presubmits.yaml index 858fae8502d64..9e4106a00672d 100644 --- a/ci-operator/jobs/openshift/installer/openshift-installer-release-4.3-presubmits.yaml +++ b/ci-operator/jobs/openshift/installer/openshift-installer-release-4.3-presubmits.yaml @@ -69,30 +69,40 @@ presubmits: always_run: true branches: - release-4.3 - context: ci/prow/e2e-aws-upgrade + context: ci/prow/e2e-aws-scaleup-rhel7 decorate: true decoration_config: skip_cloning: true labels: ci-operator.openshift.io/prowgen-controlled: "true" - name: pull-ci-openshift-installer-release-4.3-e2e-aws-upgrade - rerun_command: /test e2e-aws-upgrade + name: pull-ci-openshift-installer-release-4.3-e2e-aws-scaleup-rhel7 + optional: true + rerun_command: /test e2e-aws-scaleup-rhel7 spec: containers: - args: - --artifact-dir=$(ARTIFACTS) - --give-pr-author-access-to-namespace=true - - --secret-dir=/usr/local/e2e-aws-upgrade-cluster-profile + - --secret-dir=/usr/local/e2e-aws-scaleup-rhel7-cluster-profile - --sentry-dsn-path=/etc/sentry-dsn/ci-operator - - --target=e2e-aws-upgrade + - --target=e2e-aws-scaleup-rhel7 + - --template=/usr/local/e2e-aws-scaleup-rhel7 command: - ci-operator env: + - name: CLUSTER_TYPE + value: aws - name: CONFIG_SPEC valueFrom: configMapKeyRef: key: openshift-installer-release-4.3.yaml name: ci-operator-4.3-configs + - name: JOB_NAME_SAFE + value: e2e-aws-scaleup-rhel7 + - name: RPM_REPO_OPENSHIFT_ORIGIN + value: https://rpms.svc.ci.openshift.org/openshift-origin-v4.3/ + - name: TEST_COMMAND + value: TEST_SUITE=openshift/conformance run-tests image: ci-operator:latest imagePullPolicy: Always name: "" @@ -100,8 +110,11 @@ presubmits: requests: cpu: 10m volumeMounts: - - mountPath: /usr/local/e2e-aws-upgrade-cluster-profile + - mountPath: /usr/local/e2e-aws-scaleup-rhel7-cluster-profile name: cluster-profile + - mountPath: /usr/local/e2e-aws-scaleup-rhel7 + name: job-definition + subPath: cluster-scaleup-e2e-40.yaml - mountPath: /etc/sentry-dsn name: sentry-dsn readOnly: true @@ -112,46 +125,43 @@ presubmits: sources: - secret: name: cluster-secrets-aws + - configMap: + name: cluster-profile-aws-centos-40 + - configMap: + name: prow-job-cluster-scaleup-e2e-40 + name: job-definition - name: sentry-dsn secret: secretName: sentry-dsn - trigger: '(?m)^/test (?:.*? )?e2e-aws-upgrade(?: .*?)?$' + trigger: '(?m)^/test (?:.*? )?e2e-aws-scaleup-rhel7(?: .*?)?$' - agent: kubernetes - always_run: false + always_run: true branches: - release-4.3 - context: ci/prow/e2e-aws-upi + context: ci/prow/e2e-aws-upgrade decorate: true decoration_config: skip_cloning: true labels: ci-operator.openshift.io/prowgen-controlled: "true" - name: pull-ci-openshift-installer-release-4.3-e2e-aws-upi - optional: true - rerun_command: /test e2e-aws-upi + name: pull-ci-openshift-installer-release-4.3-e2e-aws-upgrade + rerun_command: /test e2e-aws-upgrade spec: containers: - args: - --artifact-dir=$(ARTIFACTS) - --give-pr-author-access-to-namespace=true - - --secret-dir=/usr/local/e2e-aws-upi-cluster-profile + - --secret-dir=/usr/local/e2e-aws-upgrade-cluster-profile - --sentry-dsn-path=/etc/sentry-dsn/ci-operator - - --target=e2e-aws-upi - - --template=/usr/local/e2e-aws-upi + - --target=e2e-aws-upgrade command: - ci-operator env: - - name: CLUSTER_TYPE - value: aws - name: CONFIG_SPEC valueFrom: configMapKeyRef: key: openshift-installer-release-4.3.yaml name: ci-operator-4.3-configs - - name: JOB_NAME_SAFE - value: e2e-aws-upi - - name: TEST_COMMAND - value: TEST_SUITE=openshift/conformance/parallel run-tests image: ci-operator:latest imagePullPolicy: Always name: "" @@ -159,11 +169,8 @@ presubmits: requests: cpu: 10m volumeMounts: - - mountPath: /usr/local/e2e-aws-upi-cluster-profile + - mountPath: /usr/local/e2e-aws-upgrade-cluster-profile name: cluster-profile - - mountPath: /usr/local/e2e-aws-upi - name: job-definition - subPath: cluster-launch-installer-upi-e2e.yaml - mountPath: /etc/sentry-dsn name: sentry-dsn readOnly: true @@ -174,35 +181,32 @@ presubmits: sources: - secret: name: cluster-secrets-aws - - configMap: - name: prow-job-cluster-launch-installer-upi-e2e - name: job-definition - name: sentry-dsn secret: secretName: sentry-dsn - trigger: '(?m)^/test (?:.*? )?e2e-aws-upi(?: .*?)?$' + trigger: '(?m)^/test (?:.*? )?e2e-aws-upgrade(?: .*?)?$' - agent: kubernetes always_run: false branches: - release-4.3 - context: ci/prow/e2e-rhel-scaleup + context: ci/prow/e2e-aws-upi decorate: true decoration_config: skip_cloning: true labels: ci-operator.openshift.io/prowgen-controlled: "true" - name: pull-ci-openshift-installer-release-4.3-e2e-rhel-scaleup + name: pull-ci-openshift-installer-release-4.3-e2e-aws-upi optional: true - rerun_command: /test e2e-rhel-scaleup + rerun_command: /test e2e-aws-upi spec: containers: - args: - --artifact-dir=$(ARTIFACTS) - --give-pr-author-access-to-namespace=true - - --secret-dir=/usr/local/e2e-rhel-scaleup-cluster-profile + - --secret-dir=/usr/local/e2e-aws-upi-cluster-profile - --sentry-dsn-path=/etc/sentry-dsn/ci-operator - - --target=e2e-rhel-scaleup - - --template=/usr/local/e2e-rhel-scaleup + - --target=e2e-aws-upi + - --template=/usr/local/e2e-aws-upi command: - ci-operator env: @@ -214,11 +218,9 @@ presubmits: key: openshift-installer-release-4.3.yaml name: ci-operator-4.3-configs - name: JOB_NAME_SAFE - value: e2e-rhel-scaleup - - name: RPM_REPO_OPENSHIFT_ORIGIN - value: https://rpms.svc.ci.openshift.org/openshift-origin-v4.3/ + value: e2e-aws-upi - name: TEST_COMMAND - value: TEST_SUITE=openshift/conformance run-tests + value: TEST_SUITE=openshift/conformance/parallel run-tests image: ci-operator:latest imagePullPolicy: Always name: "" @@ -226,11 +228,11 @@ presubmits: requests: cpu: 10m volumeMounts: - - mountPath: /usr/local/e2e-rhel-scaleup-cluster-profile + - mountPath: /usr/local/e2e-aws-upi-cluster-profile name: cluster-profile - - mountPath: /usr/local/e2e-rhel-scaleup + - mountPath: /usr/local/e2e-aws-upi name: job-definition - subPath: cluster-scaleup-e2e-40.yaml + subPath: cluster-launch-installer-upi-e2e.yaml - mountPath: /etc/sentry-dsn name: sentry-dsn readOnly: true @@ -241,15 +243,13 @@ presubmits: sources: - secret: name: cluster-secrets-aws - - configMap: - name: cluster-profile-aws-centos-40 - configMap: - name: prow-job-cluster-scaleup-e2e-40 + name: prow-job-cluster-launch-installer-upi-e2e name: job-definition - name: sentry-dsn secret: secretName: sentry-dsn - trigger: '(?m)^/test (?:.*? )?e2e-rhel-scaleup(?: .*?)?$' + trigger: '(?m)^/test (?:.*? )?e2e-aws-upi(?: .*?)?$' - agent: kubernetes always_run: false branches: