Merge pull request #2577 from cgwalters/mco-tests

machine-config-operator: Add e2e-aws-op job
openshift · Jan 16, 2019 · 2de323a · 2de323a
2 parents 44b81bf + a99c03c
commit 2de323a
Show file tree

Hide file tree

Showing 2 changed files with 62 additions and 0 deletions.
diff --git a/...or/config/openshift/machine-config-operator/openshift-machine-config-operator-master.yaml b/...or/config/openshift/machine-config-operator/openshift-machine-config-operator-master.yaml
@@ -50,3 +50,7 @@ tests:
   commands: TEST_SUITE=openshift/conformance/parallel run-tests
   openshift_installer:
     cluster_profile: aws
+- as: e2e-aws-op
+  commands: make test-e2e
+  openshift_installer_src:
+    cluster_profile: aws
diff --git a/...penshift/machine-config-operator/openshift-machine-config-operator-master-presubmits.yaml b/...penshift/machine-config-operator/openshift-machine-config-operator-master-presubmits.yaml
@@ -58,6 +58,64 @@ presubmits:
           name: prow-job-cluster-launch-installer-e2e
         name: job-definition
     trigger: ((?m)^/test( all| e2e-aws),?(\s+|$))
+  - agent: kubernetes
+    always_run: false
+    branches:
+    - master
+    context: ci/prow/e2e-aws-op
+    decorate: true
+    decoration_config:
+      skip_cloning: true
+    name: pull-ci-openshift-machine-config-operator-master-e2e-aws-op
+    rerun_command: /test e2e-aws-op
+    run_if_changed: ^([^d]|d(d|o(d|cd))*([^do]|o([^cd]|c[^ds])))*(d(d|o(d|cd))*(oc?)?)?$
+    spec:
+      containers:
+      - args:
+        - --artifact-dir=$(ARTIFACTS)
+        - --give-pr-author-access-to-namespace=true
+        - --secret-dir=/usr/local/e2e-aws-op-cluster-profile
+        - --target=e2e-aws-op
+        - --template=/usr/local/e2e-aws-op
+        command:
+        - ci-operator
+        env:
+        - name: CLUSTER_TYPE
+          value: aws
+        - name: CONFIG_SPEC
+          valueFrom:
+            configMapKeyRef:
+              key: openshift-machine-config-operator-master.yaml
+              name: ci-operator-configs
+        - name: JOB_NAME_SAFE
+          value: e2e-aws-op
+        - name: TEST_COMMAND
+          value: make test-e2e
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          limits:
+            cpu: 500m
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /usr/local/e2e-aws-op-cluster-profile
+          name: cluster-profile
+        - mountPath: /usr/local/e2e-aws-op
+          name: job-definition
+          subPath: cluster-launch-installer-src.yaml
+      serviceAccountName: ci-operator
+      volumes:
+      - name: cluster-profile
+        projected:
+          sources:
+          - secret:
+              name: cluster-secrets-aws
+      - configMap:
+          name: prow-job-cluster-launch-installer-src
+        name: job-definition
+    trigger: ((?m)^/test( all| e2e-aws-op),?(\s+|$))
   - agent: kubernetes
     always_run: true
     branches: