diff --git a/ci-operator/jobs/openshift/release/openshift-release-release-4.2-periodics.yaml b/ci-operator/jobs/openshift/release/openshift-release-release-4.2-periodics.yaml index 5d4605f9dde11..18187beea2eff 100644 --- a/ci-operator/jobs/openshift/release/openshift-release-release-4.2-periodics.yaml +++ b/ci-operator/jobs/openshift/release/openshift-release-release-4.2-periodics.yaml @@ -123,6 +123,86 @@ periodics: - name: pull-secret secret: secretName: ci-pull-credentials +- agent: kubernetes + cron: "" + decorate: true + interval: 12h + name: release-openshift-origin-installer-e2e-aws-sdn-multitenant-4.2 + spec: + containers: + - args: + - --artifact-dir=$(ARTIFACTS) + - --give-pr-author-access-to-namespace=true + - --secret-dir=/usr/local/pull-secret + - --secret-dir=/usr/local/e2e-aws-cluster-profile + - --target=e2e-aws + - --template=/usr/local/e2e-aws + - --input-hash=$(BUILD_ID) + - --input-hash=$(JOB_NAME) + command: + - ci-operator + env: + - name: RELEASE_IMAGE_LATEST + value: "registry.svc.ci.openshift.org/ocp/release:4.2" + - name: BRANCH + value: "4.2" + - name: CLUSTER_TYPE + value: aws + - name: CLUSTER_NETWORK_MANIFEST + value: | + spec: + defaultNetwork: + type: OpenShiftSDN + openshiftSDNConfig: + mode: Multitenant + - name: CONFIG_SPEC + value: | + tag_specification: + name: "$(BRANCH)" + namespace: ocp + resources: + '*': + limits: + memory: 4Gi + requests: + cpu: 100m + memory: 200Mi + tests: + - as: e2e-$(CLUSTER_TYPE)-multitenant + commands: TEST_SUITE=openshift/multitenant/conformance run-tests + openshift_installer: + cluster_profile: "$(CLUSTER_TYPE)" + - name: JOB_NAME_SAFE + value: e2e-aws-sdn-multitenant + - name: TEST_COMMAND + value: TEST_SUITE=openshift/conformance/parallel run-tests + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /usr/local/e2e-aws-cluster-profile + name: cluster-profile + - mountPath: /usr/local/e2e-aws + name: job-definition + subPath: cluster-launch-installer-e2e.yaml + - mountPath: /usr/local/pull-secret + name: pull-secret + 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: pull-secret + secret: + secretName: ci-pull-credentials - agent: kubernetes cron: '@yearly' decorate: true 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 e3b1ad6220958..1f8f3002231a0 100644 --- a/ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml +++ b/ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml @@ -20,6 +20,7 @@ parameters: - name: RELEASE_IMAGE_LATEST required: true - name: BASE_DOMAIN +- name: CLUSTER_NETWORK_MANIFEST objects: @@ -652,6 +653,12 @@ objects: exit 1 fi + # TODO: Replace with a more concise manifest injection approach + if [[ -n "${CLUSTER_NETWORK_MANIFEST}" ]]; then + openshift-install --dir=/tmp/artifacts/installer/create manifests + echo "${CLUSTER_NETWORK_MANIFEST}" > /tmp/artifacts/installer/manifests/cluster-network-03-config.yml + fi + TF_LOG=debug openshift-install --dir=/tmp/artifacts/installer create cluster & wait "$!"