Merge pull request #4313 from AlexNPavel/osdk-e2e-helm

operator-sdk: add helm e2e tests to ci

ci-operator/config/operator-framework/operator-sdk/operator-framework-operator-sdk-master.yaml

@@ -9,6 +9,10 @@ base_images:
     name: ansible-runner
     namespace: openshift
     tag: latest
+  base:
+    name: ubi-minimal
+    namespace: ocp
+    tag: "7"
 canonical_go_repository: github.com/operator-framework/operator-sdk
 test_binary_build_commands: ./hack/ci/setup-build-dependencies.sh
 resources:
@@ -44,13 +48,39 @@ images:
       as:
       - osdk-builder
   to: osdk-ansible-e2e
+- from: base
+  dockerfile_path: ci/dockerfiles/helm.Dockerfile
+  inputs:
+    osdk-builder:
+      as:
+      - osdk-builder
+      paths: null
+  to: helm-operator
+- from: base
+  dockerfile_path: ci/dockerfiles/helm-e2e-hybrid.Dockerfile
+  inputs:
+    osdk-builder:
+      as:
+      - osdk-builder
+      paths: null
+  to: osdk-helm-e2e-hybrid
+- from: helm-operator
+  dockerfile_path: ci/dockerfiles/helm-e2e.Dockerfile
+  inputs:
+    osdk-builder:
+      as:
+      - osdk-builder
+      paths: null
+  to: osdk-helm-e2e
 promotion:
   name: "4.2"
   namespace: ocp
   excluded_images:
   - osdk-builder
   - osdk-ansible-e2e
   - osdk-ansible-e2e-hybrid
+  - osdk-helm-e2e
+  - osdk-helm-e2e-hybrid
 tag_specification:
   name: "4.2"
   namespace: ocp
@@ -71,3 +101,7 @@ tests:
   commands: make test/e2e/ansible2
   openshift_installer_src:
     cluster_profile: aws
+- as: e2e-aws-helm
+  commands: make test/e2e/helm2
+  openshift_installer_src:
+    cluster_profile: aws

ci-operator/jobs/operator-framework/operator-sdk/operator-framework-operator-sdk-master-presubmits.yaml

@@ -64,6 +64,70 @@ presubmits:
         secret:
           secretName: sentry-dsn
     trigger: (?m)^/test( | .* )e2e-aws-ansible,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - master
+    context: ci/prow/e2e-aws-helm
+    decorate: true
+    decoration_config:
+      skip_cloning: true
+    labels:
+      ci-operator.openshift.io/prowgen-controlled: "true"
+    name: pull-ci-operator-framework-operator-sdk-master-e2e-aws-helm
+    rerun_command: /test e2e-aws-helm
+    spec:
+      containers:
+      - args:
+        - --artifact-dir=$(ARTIFACTS)
+        - --give-pr-author-access-to-namespace=true
+        - --secret-dir=/usr/local/e2e-aws-helm-cluster-profile
+        - --sentry-dsn-path=/etc/sentry-dsn/ci-operator
+        - --target=e2e-aws-helm
+        - --template=/usr/local/e2e-aws-helm
+        command:
+        - ci-operator
+        env:
+        - name: CLUSTER_TYPE
+          value: aws
+        - name: CONFIG_SPEC
+          valueFrom:
+            configMapKeyRef:
+              key: operator-framework-operator-sdk-master.yaml
+              name: ci-operator-master-configs
+        - name: JOB_NAME_SAFE
+          value: e2e-aws-helm
+        - name: TEST_COMMAND
+          value: make test/e2e/helm2
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /usr/local/e2e-aws-helm-cluster-profile
+          name: cluster-profile
+        - mountPath: /usr/local/e2e-aws-helm
+          name: job-definition
+          subPath: cluster-launch-installer-src.yaml
+        - mountPath: /etc/sentry-dsn
+          name: sentry-dsn
+          readOnly: true
+      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
+      - name: sentry-dsn
+        secret:
+          secretName: sentry-dsn
+    trigger: (?m)^/test( | .* )e2e-aws-helm,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches: