refactor: tests e2e config (#1963)

* refactor: tests e2e config

Signed-off-by: chenk <hen.keinan@gmail.com>

* refactor: tests e2e config

Signed-off-by: chenk <hen.keinan@gmail.com>

---------

Signed-off-by: chenk <hen.keinan@gmail.com>

.github/workflows/build.yaml

@@ -212,58 +212,58 @@ jobs:
         run: >
           kubectl create namespace e2e-test
 
-          ./bin/kuttl test --start-kind=false --namespace e2e-test --config tests/config/image-mode.yaml
+          ./bin/kuttl test --start-kind=false --namespace e2e-test --config tests/e2e/config/image-mode.yaml
 
           ./tests/resources-cleanup.sh > /dev/null 2>&1
       - name: Files System scan mode producing vulnerability,misconfig and exposedsecrets reports tests
         run: |
           kubectl create namespace e2e-test
 
-          ./bin/kuttl test --start-kind=false --namespace e2e-test --config tests/config/fs-mode.yaml
+          ./bin/kuttl test --start-kind=false --namespace e2e-test --config tests/e2e/config/fs-mode.yaml
 
           ./tests/resources-cleanup.sh > /dev/null 2>&1
       - name: Client/server mode producing vulnerability,misconfig and exposedsecrets
           reports tests
         run: >
           kubectl create namespace e2e-test
 
-          ./bin/kuttl test --start-kind=false --namespace e2e-test --config tests/config/client-server.yaml
+          ./bin/kuttl test --start-kind=false --namespace e2e-test --config tests/e2e/config/client-server.yaml
 
           ./tests/resources-cleanup.sh > /dev/null 2>&1
       - name: Standalon mode with Sbom scanning
           reports tests
         run: >
           kubectl create namespace e2e-test
 
-          ./bin/kuttl test --start-kind=false --namespace e2e-test --config tests/config/sbom-standalone.yaml
+          ./bin/kuttl test --start-kind=false --namespace e2e-test --config tests/e2e/config/sbom-standalone.yaml
 
           ./tests/resources-cleanup.sh > /dev/null 2>&1
       - name: Client/Server with Sbom scanning
           reports tests
         run: >
           kubectl create namespace e2e-test
 
-          ./bin/kuttl test --start-kind=false --namespace e2e-test --config tests/config/client-server-sbom.yaml
+          ./bin/kuttl test --start-kind=false --namespace e2e-test --config tests/e2e/config/client-server-sbom.yaml
 
           ./tests/resources-cleanup.sh > /dev/null 2>&1
       - name: file system with Sbom scanning
           reports tests
         run: >
           kubectl create namespace e2e-test
 
-          ./bin/kuttl test --start-kind=false --namespace e2e-test --config tests/config/fs-sbom.yaml
+          ./bin/kuttl test --start-kind=false --namespace e2e-test --config tests/e2e/config/fs-sbom.yaml
 
           ./tests/resources-cleanup.sh > /dev/null 2>&1
       - name: Node scan producing cluster infraassessment report
         run: >
           kubectl create namespace e2e-test
 
-          ./bin/kuttl test --start-kind=false --namespace e2e-test --config tests/config/node-collector.yaml
+          ./bin/kuttl test --start-kind=false --namespace e2e-test --config tests/e2e/config/node-collector.yaml
 
           ./tests/resources-cleanup.sh > /dev/null 2>&1
       - name: Cluster vulnerabilities report
         run: >
-          ./bin/kuttl test --start-kind=false --config tests/config/cluster-scan.yaml
+          ./bin/kuttl test --start-kind=false --config tests/e2e/config/cluster-scan.yaml
 
       - name: Delete kind cluster
         run: |

.github/workflows/private-registries.yaml

@@ -104,12 +104,12 @@ jobs:
           ./get_helm.sh
       - name: image private registries via pod image pull secret tests
         run: >
-          ./bin/kuttl test --start-kind=false --config tests/config/image-private-registries.yaml
+          ./bin/kuttl test --start-kind=false --config tests/e2e/config/image-private-registries.yaml
 
           ./tests/resources-cleanup-private.sh > /dev/null 2>&1
       - name: image private registries via service account image pull secret tests
         run: >
-          ./bin/kuttl test --start-kind=false --config tests/config/image-private-registries-sa.yaml
+          ./bin/kuttl test --start-kind=false --config tests/e2e/config/image-private-registries-sa.yaml
 
           ./tests/resources-cleanup-private.sh > /dev/null 2>&1
       - name: Delete kind cluster

tests/itest/matcher/matcher_test.go

@@ -5,9 +5,9 @@ import (
 
 	"testing"
 
-	"github.com/aquasecurity/trivy-operator/tests/itest/matcher"
 	"github.com/aquasecurity/trivy-operator/pkg/apis/aquasecurity/v1alpha1"
 	"github.com/aquasecurity/trivy-operator/pkg/trivyoperator"
+	"github.com/aquasecurity/trivy-operator/tests/itest/matcher"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

tests/itest/trivy-operator/suite_test.go

@@ -5,11 +5,11 @@ import (
 	"testing"
 	"time"
 
-	"github.com/aquasecurity/trivy-operator/tests/itest/helper"
-	"github.com/aquasecurity/trivy-operator/tests/itest/trivy-operator/behavior"
 	"github.com/aquasecurity/trivy-operator/pkg/operator"
 	"github.com/aquasecurity/trivy-operator/pkg/operator/etc"
 	"github.com/aquasecurity/trivy-operator/pkg/trivyoperator"
+	"github.com/aquasecurity/trivy-operator/tests/itest/helper"
+	"github.com/aquasecurity/trivy-operator/tests/itest/trivy-operator/behavior"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	corev1 "k8s.io/api/core/v1"