From 18aca79b1cbb4eb40422a48ced1713c1823aad8e Mon Sep 17 00:00:00 2001
From: lokeshrangineni <19699092+lokeshrangineni@users.noreply.github.com>
Date: Fri, 15 Nov 2024 11:31:12 -0500
Subject: [PATCH] feat: Adding github action to run the operator end-to-end
 tests. (#4762)

---
 .../workflows/operator-e2e-integration-tests.yml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/.github/workflows/operator-e2e-integration-tests.yml b/.github/workflows/operator-e2e-integration-tests.yml
index a06e793410..41215e4087 100644
--- a/.github/workflows/operator-e2e-integration-tests.yml
+++ b/.github/workflows/operator-e2e-integration-tests.yml
@@ -10,6 +10,7 @@ on:
       - opened
       - synchronize
       - labeled
+<<<<<<< HEAD
     paths-ignore:
       - 'community/**'
       - 'docs/**'
@@ -18,6 +19,11 @@ on:
 jobs:
   operator-e2e-tests:
     timeout-minutes: 40
+=======
+
+jobs:
+  operator-e2e-tests:
+>>>>>>> 92081089e (feat: Adding github action to run the operator end-to-end tests. (#4762))
     if:
       ((github.event.action == 'labeled' && (github.event.label.name == 'approved' || github.event.label.name == 'lgtm' || github.event.label.name == 'ok-to-test')) ||
       (github.event.action != 'labeled' && (contains(github.event.pull_request.labels.*.name, 'ok-to-test') || contains(github.event.pull_request.labels.*.name, 'approved') || contains(github.event.pull_request.labels.*.name, 'lgtm')))) &&
@@ -43,7 +49,11 @@ jobs:
 
       - name: Create KIND cluster
         run: |
+<<<<<<< HEAD
           kind create cluster --name $KIND_CLUSTER --wait 10m
+=======
+          kind create cluster --name $KIND_CLUSTER --wait 5m
+>>>>>>> 92081089e (feat: Adding github action to run the operator end-to-end tests. (#4762))
 
       - name: Set up kubernetes context
         run: |
@@ -56,16 +66,22 @@ jobs:
           cd infra/feast-operator/
           make test-e2e
 
+<<<<<<< HEAD
       - name: Debug KIND Cluster when there is a failure
         if: failure()
         run: |
           kubectl get pods --all-namespaces
           kubectl describe nodes
 
+=======
+>>>>>>> 92081089e (feat: Adding github action to run the operator end-to-end tests. (#4762))
       - name: Clean up
         if: always()
         run: |
           # Delete the KIND cluster after tests
           kind delete cluster --name kind-$KIND_CLUSTER
+<<<<<<< HEAD
 
       
+=======
+>>>>>>> 92081089e (feat: Adding github action to run the operator end-to-end tests. (#4762))