diff --git a/Makefile b/Makefile index 882f80b413610..79e964aeb7a24 100644 --- a/Makefile +++ b/Makefile @@ -124,6 +124,7 @@ prow-cluster-jobs: oc create configmap prow-job-cluster-launch-e2e-openshift-jenkins --from-file=ci-operator/templates/cluster-launch-e2e-openshift-jenkins.yaml -o yaml --dry-run | oc apply -f - oc create configmap prow-job-cluster-launch-src --from-file=ci-operator/templates/cluster-launch-src.yaml -o yaml --dry-run | oc apply -f - oc create configmap prow-job-cluster-launch-installer-e2e --from-file=ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml -o yaml --dry-run | oc apply -f - + oc create configmap prow-job-cluster-launch-installer-libvirt-e2e --from-file=ci-operator/templates/openshift/installer/cluster-launch-installer-libvirt-e2e.yaml -o yaml --dry-run | oc apply -f - oc create configmap prow-job-cluster-launch-installer-src --from-file=ci-operator/templates/openshift/installer/cluster-launch-installer-src.yaml -o yaml --dry-run | oc apply -f - oc create configmap prow-job-master-sidecar --from-file=ci-operator/templates/master-sidecar.yaml -o yaml --dry-run | oc apply -f - .PHONY: prow-cluster-jobs diff --git a/ci-operator/config/openshift/installer/openshift-installer-master.yaml b/ci-operator/config/openshift/installer/openshift-installer-master.yaml index 68dc147ddbfed..46d253f9b0f68 100644 --- a/ci-operator/config/openshift/installer/openshift-installer-master.yaml +++ b/ci-operator/config/openshift/installer/openshift-installer-master.yaml @@ -13,6 +13,14 @@ images: as: - build to: installer +- dockerfile_path: images/nested-libvirt/Dockerfile + optional: true + from: base + inputs: + root: + as: + - build + to: libvirt-installer resources: '*': limits: 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 0ff60e01ca947..a42bfa0a5bc13 100644 --- a/ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml @@ -115,6 +115,66 @@ presubmits: name: prow-job-cluster-launch-installer-e2e name: job-definition trigger: ((?m)^/test( all| e2e-aws-all),?(\s+|$)) + - agent: kubernetes + always_run: false + branches: + - master + context: ci/prow/e2e-libvirt + decorate: true + name: pull-ci-openshift-installer-master-e2e-libvirt + optional: true + rerun_command: /test e2e-libvirt + run_if_changed: ^([^d]|d(d|o(d|cd))*([^do]|o([^cd]|c[^ds])))*(d(d|o(d|cd))*(oc?)?)?$ + skip_cloning: true + spec: + containers: + - args: + - --artifact-dir=$(ARTIFACTS) + - --give-pr-author-access-to-namespace=true + - --secret-dir=/usr/local/e2e-libvirt-cluster-profile + - --target=e2e-libvirt + - --template=/usr/local/e2e-libvirt + command: + - ci-operator + env: + - name: CLUSTER_TYPE + value: gcp + - name: CONFIG_SPEC + valueFrom: + configMapKeyRef: + key: openshift-installer-master.yaml + name: ci-operator-configs + - name: JOB_NAME_SAFE + value: e2e-libvirt + - name: TEST_COMMAND + value: TEST_SUITE=openshift/smoke-4 run-tests run-tests + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + limits: + cpu: 500m + requests: + cpu: 10m + volumeMounts: + - mountPath: /usr/local/e2e-libvirt-cluster-profile + name: cluster-profile + - mountPath: /usr/local/e2e-libvirt + name: job-definition + subPath: cluster-launch-installer-libvirt-e2e.yaml + serviceAccountName: ci-operator + volumes: + - name: cluster-profile + projected: + sources: + - secret: + name: cluster-secrets-gcp + - configMap: + name: cluster-profile-gcp + - configMap: + name: prow-job-cluster-launch-installer-libvirt-e2e + name: job-definition + trigger: ((?m)^/test( all| e2e-libvirt),?(\s+|$)) - agent: kubernetes always_run: false branches: