diff --git a/ci-operator/config/openshift/installer/openshift-installer-master.yaml b/ci-operator/config/openshift/installer/openshift-installer-master.yaml index 154b06063b070..ab8b05ce0f85a 100644 --- a/ci-operator/config/openshift/installer/openshift-installer-master.yaml +++ b/ci-operator/config/openshift/installer/openshift-installer-master.yaml @@ -100,7 +100,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.0.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-4.0.yaml index 5568366de1cf9..0eff380d79056 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 @@ -95,7 +95,7 @@ tests: openshift_installer: cluster_profile: aws upgrade: false -- 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 86ae423503fbc..00d3b64f52f29 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 @@ -96,7 +96,7 @@ tests: openshift_installer: cluster_profile: aws upgrade: false -- 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/machine-api-operator/openshift-machine-api-operator-master.yaml b/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-master.yaml index 945feedc5f887..3e0b4ce4847fc 100644 --- a/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-master.yaml +++ b/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-master.yaml @@ -62,7 +62,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/machine-api-operator/openshift-machine-api-operator-release-4.0.yaml b/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-4.0.yaml index d504e46c6369f..2d953291b1ffb 100644 --- a/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-4.0.yaml +++ b/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-4.0.yaml @@ -57,7 +57,7 @@ tests: commands: make test-e2e openshift_installer_src: 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/machine-api-operator/openshift-machine-api-operator-release-4.1.yaml b/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-4.1.yaml index 6d77ed53f5b85..5c7b8d1f000a7 100644 --- a/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-4.1.yaml +++ b/ci-operator/config/openshift/machine-api-operator/openshift-machine-api-operator-release-4.1.yaml @@ -58,7 +58,7 @@ tests: commands: make test-e2e openshift_installer_src: 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/machine-config-operator/openshift-machine-config-operator-master.yaml b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-master.yaml index c7195f072c5ef..15a2aecb19318 100644 --- a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-master.yaml +++ b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-master.yaml @@ -65,7 +65,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/machine-config-operator/openshift-machine-config-operator-release-4.0.yaml b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.0.yaml index 8920d2e97a832..c33f1a3af1908 100644 --- a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.0.yaml +++ b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.0.yaml @@ -60,7 +60,7 @@ tests: commands: make test-e2e openshift_installer_src: 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/machine-config-operator/openshift-machine-config-operator-release-4.1.yaml b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.1.yaml index 1c691f2dc895c..286930b31a3c3 100644 --- a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.1.yaml +++ b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.1.yaml @@ -61,7 +61,7 @@ tests: commands: make test-e2e openshift_installer_src: 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 3d2695ca1c05e..798900a153248 100644 --- a/ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml @@ -156,6 +156,67 @@ 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 + 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 + - --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.1/ + - 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 + 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 + trigger: '(?m)^/test (?:.*? )?e2e-aws-scaleup-rhel7(?: .*?)?$' - agent: kubernetes always_run: true branches: @@ -500,68 +561,6 @@ presubmits: name: prow-job-cluster-launch-installer-openstack-e2e name: job-definition trigger: '(?m)^/test (?:.*? )?e2e-openstack(?: .*?)?$' - - 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 - - --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.1/ - - 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 - 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 - 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 8851a7225f532..0cdb8fa477256 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 @@ -61,22 +61,22 @@ presubmits: always_run: true branches: - release-4.0 - context: ci/prow/e2e-rhel-scaleup + 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-rhel-scaleup - rerun_command: /test e2e-rhel-scaleup + name: pull-ci-openshift-installer-release-4.0-e2e-aws-scaleup-rhel7 + 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-rhel-scaleup-cluster-profile - - --target=e2e-rhel-scaleup - - --template=/usr/local/e2e-rhel-scaleup + - --secret-dir=/usr/local/e2e-aws-scaleup-rhel7-cluster-profile + - --target=e2e-aws-scaleup-rhel7 + - --template=/usr/local/e2e-aws-scaleup-rhel7 command: - ci-operator env: @@ -88,7 +88,7 @@ presubmits: key: openshift-installer-release-4.0.yaml name: ci-operator-4.0-configs - name: JOB_NAME_SAFE - value: e2e-rhel-scaleup + value: e2e-aws-scaleup-rhel7 - name: RPM_REPO_OPENSHIFT_ORIGIN value: https://rpms.svc.ci.openshift.org/openshift-origin-v4.0/ - name: TEST_COMMAND @@ -100,9 +100,9 @@ presubmits: requests: cpu: 10m volumeMounts: - - mountPath: /usr/local/e2e-rhel-scaleup-cluster-profile + - mountPath: /usr/local/e2e-aws-scaleup-rhel7-cluster-profile name: cluster-profile - - mountPath: /usr/local/e2e-rhel-scaleup + - mountPath: /usr/local/e2e-aws-scaleup-rhel7 name: job-definition subPath: cluster-scaleup-e2e-40.yaml serviceAccountName: ci-operator @@ -117,7 +117,7 @@ presubmits: - configMap: name: prow-job-cluster-scaleup-e2e-40 name: job-definition - trigger: '(?m)^/test (?:.*? )?e2e-rhel-scaleup(?: .*?)?$' + trigger: '(?m)^/test (?:.*? )?e2e-aws-scaleup-rhel7(?: .*?)?$' - agent: kubernetes always_run: true 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 1bdb9e4f75df4..78111a4afeb2f 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 @@ -61,22 +61,22 @@ presubmits: always_run: true branches: - release-4.1 - context: ci/prow/e2e-rhel-scaleup + 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-rhel-scaleup - rerun_command: /test e2e-rhel-scaleup + name: pull-ci-openshift-installer-release-4.1-e2e-aws-scaleup-rhel7 + 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-rhel-scaleup-cluster-profile - - --target=e2e-rhel-scaleup - - --template=/usr/local/e2e-rhel-scaleup + - --secret-dir=/usr/local/e2e-aws-scaleup-rhel7-cluster-profile + - --target=e2e-aws-scaleup-rhel7 + - --template=/usr/local/e2e-aws-scaleup-rhel7 command: - ci-operator env: @@ -88,7 +88,7 @@ presubmits: key: openshift-installer-release-4.1.yaml name: ci-operator-4.1-configs - name: JOB_NAME_SAFE - value: e2e-rhel-scaleup + value: e2e-aws-scaleup-rhel7 - name: RPM_REPO_OPENSHIFT_ORIGIN value: https://rpms.svc.ci.openshift.org/openshift-origin-v4.1/ - name: TEST_COMMAND @@ -100,9 +100,9 @@ presubmits: requests: cpu: 10m volumeMounts: - - mountPath: /usr/local/e2e-rhel-scaleup-cluster-profile + - mountPath: /usr/local/e2e-aws-scaleup-rhel7-cluster-profile name: cluster-profile - - mountPath: /usr/local/e2e-rhel-scaleup + - mountPath: /usr/local/e2e-aws-scaleup-rhel7 name: job-definition subPath: cluster-scaleup-e2e-40.yaml serviceAccountName: ci-operator @@ -117,7 +117,7 @@ presubmits: - configMap: name: prow-job-cluster-scaleup-e2e-40 name: job-definition - trigger: '(?m)^/test (?:.*? )?e2e-rhel-scaleup(?: .*?)?$' + trigger: '(?m)^/test (?:.*? )?e2e-aws-scaleup-rhel7(?: .*?)?$' - agent: kubernetes always_run: true branches: diff --git a/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-master-presubmits.yaml b/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-master-presubmits.yaml index 63c2a8c9934ed..2e9b7ea9030b8 100644 --- a/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-master-presubmits.yaml @@ -161,29 +161,38 @@ presubmits: always_run: true branches: - master - 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-machine-api-operator-master-e2e-aws-upgrade - rerun_command: /test e2e-aws-upgrade + name: pull-ci-openshift-machine-api-operator-master-e2e-aws-scaleup-rhel7 + 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 - - --target=e2e-aws-upgrade + - --secret-dir=/usr/local/e2e-aws-scaleup-rhel7-cluster-profile + - --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-machine-api-operator-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.1/ + - name: TEST_COMMAND + value: TEST_SUITE=openshift/conformance run-tests image: ci-operator:latest imagePullPolicy: Always name: "" @@ -191,8 +200,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 serviceAccountName: ci-operator volumes: - name: cluster-profile @@ -200,44 +212,39 @@ presubmits: sources: - secret: name: cluster-secrets-aws - trigger: '(?m)^/test (?:.*? )?e2e-aws-upgrade(?: .*?)?$' + - configMap: + name: cluster-profile-aws-centos-40 + - configMap: + name: prow-job-cluster-scaleup-e2e-40 + name: job-definition + trigger: '(?m)^/test (?:.*? )?e2e-aws-scaleup-rhel7(?: .*?)?$' - agent: kubernetes - always_run: false + always_run: true branches: - master - 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-machine-api-operator-master-e2e-rhel-scaleup - optional: true - rerun_command: /test e2e-rhel-scaleup + name: pull-ci-openshift-machine-api-operator-master-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 - - --target=e2e-rhel-scaleup - - --template=/usr/local/e2e-rhel-scaleup + - --secret-dir=/usr/local/e2e-aws-upgrade-cluster-profile + - --target=e2e-aws-upgrade command: - ci-operator env: - - name: CLUSTER_TYPE - value: aws - name: CONFIG_SPEC valueFrom: configMapKeyRef: key: openshift-machine-api-operator-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.1/ - - name: TEST_COMMAND - value: TEST_SUITE=openshift/conformance run-tests image: ci-operator:latest imagePullPolicy: Always name: "" @@ -245,11 +252,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 serviceAccountName: ci-operator volumes: - name: cluster-profile @@ -257,12 +261,7 @@ 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 - trigger: '(?m)^/test (?:.*? )?e2e-rhel-scaleup(?: .*?)?$' + trigger: '(?m)^/test (?:.*? )?e2e-aws-upgrade(?: .*?)?$' - agent: kubernetes always_run: true branches: diff --git a/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-release-4.0-presubmits.yaml b/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-release-4.0-presubmits.yaml index 43d1db457e83c..ce5b3d3a893d0 100644 --- a/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-release-4.0-presubmits.yaml +++ b/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-release-4.0-presubmits.yaml @@ -152,22 +152,22 @@ presubmits: always_run: true branches: - release-4.0 - context: ci/prow/e2e-rhel-scaleup + 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-machine-api-operator-release-4.0-e2e-rhel-scaleup - rerun_command: /test e2e-rhel-scaleup + name: pull-ci-openshift-machine-api-operator-release-4.0-e2e-aws-scaleup-rhel7 + 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-rhel-scaleup-cluster-profile - - --target=e2e-rhel-scaleup - - --template=/usr/local/e2e-rhel-scaleup + - --secret-dir=/usr/local/e2e-aws-scaleup-rhel7-cluster-profile + - --target=e2e-aws-scaleup-rhel7 + - --template=/usr/local/e2e-aws-scaleup-rhel7 command: - ci-operator env: @@ -179,7 +179,7 @@ presubmits: key: openshift-machine-api-operator-release-4.0.yaml name: ci-operator-4.0-configs - name: JOB_NAME_SAFE - value: e2e-rhel-scaleup + value: e2e-aws-scaleup-rhel7 - name: RPM_REPO_OPENSHIFT_ORIGIN value: https://rpms.svc.ci.openshift.org/openshift-origin-v4.0/ - name: TEST_COMMAND @@ -191,9 +191,9 @@ presubmits: requests: cpu: 10m volumeMounts: - - mountPath: /usr/local/e2e-rhel-scaleup-cluster-profile + - mountPath: /usr/local/e2e-aws-scaleup-rhel7-cluster-profile name: cluster-profile - - mountPath: /usr/local/e2e-rhel-scaleup + - mountPath: /usr/local/e2e-aws-scaleup-rhel7 name: job-definition subPath: cluster-scaleup-e2e-40.yaml serviceAccountName: ci-operator @@ -208,7 +208,7 @@ presubmits: - configMap: name: prow-job-cluster-scaleup-e2e-40 name: job-definition - trigger: '(?m)^/test (?:.*? )?e2e-rhel-scaleup(?: .*?)?$' + trigger: '(?m)^/test (?:.*? )?e2e-aws-scaleup-rhel7(?: .*?)?$' - agent: kubernetes always_run: true branches: diff --git a/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-release-4.1-presubmits.yaml b/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-release-4.1-presubmits.yaml index ca12e008f7113..4fe3a0763e87a 100644 --- a/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-release-4.1-presubmits.yaml +++ b/ci-operator/jobs/openshift/machine-api-operator/openshift-machine-api-operator-release-4.1-presubmits.yaml @@ -152,22 +152,22 @@ presubmits: always_run: true branches: - release-4.1 - context: ci/prow/e2e-rhel-scaleup + 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-machine-api-operator-release-4.1-e2e-rhel-scaleup - rerun_command: /test e2e-rhel-scaleup + name: pull-ci-openshift-machine-api-operator-release-4.1-e2e-aws-scaleup-rhel7 + 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-rhel-scaleup-cluster-profile - - --target=e2e-rhel-scaleup - - --template=/usr/local/e2e-rhel-scaleup + - --secret-dir=/usr/local/e2e-aws-scaleup-rhel7-cluster-profile + - --target=e2e-aws-scaleup-rhel7 + - --template=/usr/local/e2e-aws-scaleup-rhel7 command: - ci-operator env: @@ -179,7 +179,7 @@ presubmits: key: openshift-machine-api-operator-release-4.1.yaml name: ci-operator-4.1-configs - name: JOB_NAME_SAFE - value: e2e-rhel-scaleup + value: e2e-aws-scaleup-rhel7 - name: RPM_REPO_OPENSHIFT_ORIGIN value: https://rpms.svc.ci.openshift.org/openshift-origin-v4.1/ - name: TEST_COMMAND @@ -191,9 +191,9 @@ presubmits: requests: cpu: 10m volumeMounts: - - mountPath: /usr/local/e2e-rhel-scaleup-cluster-profile + - mountPath: /usr/local/e2e-aws-scaleup-rhel7-cluster-profile name: cluster-profile - - mountPath: /usr/local/e2e-rhel-scaleup + - mountPath: /usr/local/e2e-aws-scaleup-rhel7 name: job-definition subPath: cluster-scaleup-e2e-40.yaml serviceAccountName: ci-operator @@ -208,7 +208,7 @@ presubmits: - configMap: name: prow-job-cluster-scaleup-e2e-40 name: job-definition - trigger: '(?m)^/test (?:.*? )?e2e-rhel-scaleup(?: .*?)?$' + trigger: '(?m)^/test (?:.*? )?e2e-aws-scaleup-rhel7(?: .*?)?$' - agent: kubernetes always_run: true branches: diff --git a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-master-presubmits.yaml b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-master-presubmits.yaml index f475eea289554..3e3316680b51f 100644 --- a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-master-presubmits.yaml @@ -120,29 +120,38 @@ presubmits: always_run: true branches: - master - 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-machine-config-operator-master-e2e-aws-upgrade - rerun_command: /test e2e-aws-upgrade + name: pull-ci-openshift-machine-config-operator-master-e2e-aws-scaleup-rhel7 + 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 - - --target=e2e-aws-upgrade + - --secret-dir=/usr/local/e2e-aws-scaleup-rhel7-cluster-profile + - --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-machine-config-operator-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.1/ + - name: TEST_COMMAND + value: TEST_SUITE=openshift/conformance run-tests image: ci-operator:latest imagePullPolicy: Always name: "" @@ -150,8 +159,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 serviceAccountName: ci-operator volumes: - name: cluster-profile @@ -159,44 +171,39 @@ presubmits: sources: - secret: name: cluster-secrets-aws - trigger: '(?m)^/test (?:.*? )?e2e-aws-upgrade(?: .*?)?$' + - configMap: + name: cluster-profile-aws-centos-40 + - configMap: + name: prow-job-cluster-scaleup-e2e-40 + name: job-definition + trigger: '(?m)^/test (?:.*? )?e2e-aws-scaleup-rhel7(?: .*?)?$' - agent: kubernetes - always_run: false + always_run: true branches: - master - 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-machine-config-operator-master-e2e-rhel-scaleup - optional: true - rerun_command: /test e2e-rhel-scaleup + name: pull-ci-openshift-machine-config-operator-master-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 - - --target=e2e-rhel-scaleup - - --template=/usr/local/e2e-rhel-scaleup + - --secret-dir=/usr/local/e2e-aws-upgrade-cluster-profile + - --target=e2e-aws-upgrade command: - ci-operator env: - - name: CLUSTER_TYPE - value: aws - name: CONFIG_SPEC valueFrom: configMapKeyRef: key: openshift-machine-config-operator-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.1/ - - name: TEST_COMMAND - value: TEST_SUITE=openshift/conformance run-tests image: ci-operator:latest imagePullPolicy: Always name: "" @@ -204,11 +211,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 serviceAccountName: ci-operator volumes: - name: cluster-profile @@ -216,12 +220,7 @@ 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 - trigger: '(?m)^/test (?:.*? )?e2e-rhel-scaleup(?: .*?)?$' + trigger: '(?m)^/test (?:.*? )?e2e-aws-upgrade(?: .*?)?$' - agent: kubernetes always_run: true branches: diff --git a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.0-presubmits.yaml b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.0-presubmits.yaml index 946a36052b31e..3c908831415d2 100644 --- a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.0-presubmits.yaml +++ b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.0-presubmits.yaml @@ -118,22 +118,22 @@ presubmits: always_run: true branches: - release-4.0 - context: ci/prow/e2e-rhel-scaleup + 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-machine-config-operator-release-4.0-e2e-rhel-scaleup - rerun_command: /test e2e-rhel-scaleup + name: pull-ci-openshift-machine-config-operator-release-4.0-e2e-aws-scaleup-rhel7 + 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-rhel-scaleup-cluster-profile - - --target=e2e-rhel-scaleup - - --template=/usr/local/e2e-rhel-scaleup + - --secret-dir=/usr/local/e2e-aws-scaleup-rhel7-cluster-profile + - --target=e2e-aws-scaleup-rhel7 + - --template=/usr/local/e2e-aws-scaleup-rhel7 command: - ci-operator env: @@ -145,7 +145,7 @@ presubmits: key: openshift-machine-config-operator-release-4.0.yaml name: ci-operator-4.0-configs - name: JOB_NAME_SAFE - value: e2e-rhel-scaleup + value: e2e-aws-scaleup-rhel7 - name: RPM_REPO_OPENSHIFT_ORIGIN value: https://rpms.svc.ci.openshift.org/openshift-origin-v4.0/ - name: TEST_COMMAND @@ -157,9 +157,9 @@ presubmits: requests: cpu: 10m volumeMounts: - - mountPath: /usr/local/e2e-rhel-scaleup-cluster-profile + - mountPath: /usr/local/e2e-aws-scaleup-rhel7-cluster-profile name: cluster-profile - - mountPath: /usr/local/e2e-rhel-scaleup + - mountPath: /usr/local/e2e-aws-scaleup-rhel7 name: job-definition subPath: cluster-scaleup-e2e-40.yaml serviceAccountName: ci-operator @@ -174,7 +174,7 @@ presubmits: - configMap: name: prow-job-cluster-scaleup-e2e-40 name: job-definition - trigger: '(?m)^/test (?:.*? )?e2e-rhel-scaleup(?: .*?)?$' + trigger: '(?m)^/test (?:.*? )?e2e-aws-scaleup-rhel7(?: .*?)?$' - agent: kubernetes always_run: true branches: diff --git a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.1-presubmits.yaml b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.1-presubmits.yaml index 1d89c3f2ad754..8add299f540ec 100644 --- a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.1-presubmits.yaml +++ b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.1-presubmits.yaml @@ -118,22 +118,22 @@ presubmits: always_run: true branches: - release-4.1 - context: ci/prow/e2e-rhel-scaleup + 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-machine-config-operator-release-4.1-e2e-rhel-scaleup - rerun_command: /test e2e-rhel-scaleup + name: pull-ci-openshift-machine-config-operator-release-4.1-e2e-aws-scaleup-rhel7 + 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-rhel-scaleup-cluster-profile - - --target=e2e-rhel-scaleup - - --template=/usr/local/e2e-rhel-scaleup + - --secret-dir=/usr/local/e2e-aws-scaleup-rhel7-cluster-profile + - --target=e2e-aws-scaleup-rhel7 + - --template=/usr/local/e2e-aws-scaleup-rhel7 command: - ci-operator env: @@ -145,7 +145,7 @@ presubmits: key: openshift-machine-config-operator-release-4.1.yaml name: ci-operator-4.1-configs - name: JOB_NAME_SAFE - value: e2e-rhel-scaleup + value: e2e-aws-scaleup-rhel7 - name: RPM_REPO_OPENSHIFT_ORIGIN value: https://rpms.svc.ci.openshift.org/openshift-origin-v4.1/ - name: TEST_COMMAND @@ -157,9 +157,9 @@ presubmits: requests: cpu: 10m volumeMounts: - - mountPath: /usr/local/e2e-rhel-scaleup-cluster-profile + - mountPath: /usr/local/e2e-aws-scaleup-rhel7-cluster-profile name: cluster-profile - - mountPath: /usr/local/e2e-rhel-scaleup + - mountPath: /usr/local/e2e-aws-scaleup-rhel7 name: job-definition subPath: cluster-scaleup-e2e-40.yaml serviceAccountName: ci-operator @@ -174,7 +174,7 @@ presubmits: - configMap: name: prow-job-cluster-scaleup-e2e-40 name: job-definition - trigger: '(?m)^/test (?:.*? )?e2e-rhel-scaleup(?: .*?)?$' + trigger: '(?m)^/test (?:.*? )?e2e-aws-scaleup-rhel7(?: .*?)?$' - agent: kubernetes always_run: true branches: