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 d2e17c7a7a9b6..6496abd67b487 100644 --- a/ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml @@ -507,6 +507,89 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-aws-shared-vpc,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - master + cluster: build02 + context: ci/prow/e2e-aws-single-node + decorate: true + decoration_config: + skip_cloning: true + labels: + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-installer-master-e2e-aws-single-node + optional: true + rerun_command: /test e2e-aws-single-node + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --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-single-node-cluster-profile + - --target=e2e-aws-single-node + - --template=/usr/local/e2e-aws-single-node + command: + - ci-operator + env: + - name: CLUSTER_TYPE + value: aws + - name: CLUSTER_VARIANT + value: single-node + - name: JOB_NAME_SAFE + value: e2e-aws-single-node + - name: TEST_COMMAND + value: TEST_SUITE=openshift/conformance/parallel run-tests + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /usr/local/e2e-aws-single-node-cluster-profile + name: cluster-profile + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /usr/local/e2e-aws-single-node + name: job-definition + subPath: cluster-launch-installer-e2e.yaml + - 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 + - configMap: + name: prow-job-cluster-launch-installer-e2e + name: job-definition + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )e2e-aws-single-node,?($|\s.*) - agent: kubernetes always_run: false branches: diff --git a/ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml b/ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml index 696dc712e74ca..cbd6219e1a092 100644 --- a/ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml +++ b/ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml @@ -453,10 +453,16 @@ objects: mkdir -p ~/.ssh cp "${SSH_PRIV_KEY_PATH}" ~/.ssh/ + masters=3 + if has_variant "single-node" ;then + masters=1 + fi + workers=3 - if has_variant "compact" || has_variant "multisocket"; then + if has_variant "compact" || has_variant "multisocket" || has_variant "single-node"; then workers=0 fi + if [[ "${CLUSTER_TYPE}" == "aws" ]]; then master_type=null if has_variant "multisocket"; then @@ -508,7 +514,7 @@ objects: name: ${CLUSTER_NAME} controlPlane: name: master - replicas: 3 + replicas: ${masters} platform: aws: type: ${master_type} diff --git a/core-services/template-deprecation/_allowlist.yaml b/core-services/template-deprecation/_allowlist.yaml index e237978f3c97e..214cb12139215 100644 --- a/core-services/template-deprecation/_allowlist.yaml +++ b/core-services/template-deprecation/_allowlist.yaml @@ -736,6 +736,9 @@ templates: pull-ci-openshift-installer-master-e2e-aws-rhel8: generated: false kind: presubmit + pull-ci-openshift-installer-master-e2e-aws-single-node: + generated: false + kind: presubmit pull-ci-openshift-installer-release-4.4-e2e-aws-rhel8: generated: false kind: presubmit