diff --git a/ci-operator/config/openshift/openshift-ansible/openshift-openshift-ansible-master.yaml b/ci-operator/config/openshift/openshift-ansible/openshift-openshift-ansible-master.yaml index 9be4fa44929c1..87400e4439880 100644 --- a/ci-operator/config/openshift/openshift-ansible/openshift-openshift-ansible-master.yaml +++ b/ci-operator/config/openshift/openshift-ansible/openshift-openshift-ansible-master.yaml @@ -2,9 +2,8 @@ tag_specification: name: '4.0' namespace: ocp promotion: - cluster: https://api.ci.openshift.org - namespace: ci-byoh - tag: devel-40 + name: '4.0' + namespace: ocp base_rpm_images: os: cluster: https://api.ci.openshift.org @@ -71,3 +70,7 @@ tests: >> /etc/passwd; tox 2>&1 | tee /tmp/artifacts/output.log container: from: test-bin +- 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/openshift-ansible/openshift-openshift-ansible-master-presubmits.yaml b/ci-operator/jobs/openshift/openshift-ansible/openshift-openshift-ansible-master-presubmits.yaml index 83f35d92e10e7..82d19a3c7bfa0 100644 --- a/ci-operator/jobs/openshift/openshift-ansible/openshift-openshift-ansible-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/openshift-ansible/openshift-openshift-ansible-master-presubmits.yaml @@ -1,5 +1,64 @@ presubmits: openshift/openshift-ansible: + - agent: kubernetes + always_run: true + branches: + - master + context: ci/prow/e2e-aws-scaleup-rhel7 + decorate: true + decoration_config: + skip_cloning: true + name: pull-ci-openshift-openshift-ansible-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-openshift-ansible-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.0/ + - 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: @@ -16,6 +75,7 @@ presubmits: - --artifact-dir=$(ARTIFACTS) - --give-pr-author-access-to-namespace=true - --target=[images] + - --target=[release:latest] command: - ci-operator env: