Fix e2e test grid by using ginkgo labels (#3451)

* Fix e2e gha num chunks

Signed-off-by: Per Goncalves da Silva <[email protected]>

* Refactor e2e split tool for labels

Signed-off-by: Per Goncalves da Silva <[email protected]>

* Add ginkgo labels to e2e tests

Signed-off-by: Per Goncalves da Silva <[email protected]>

---------

Signed-off-by: Per Goncalves da Silva <[email protected]>
Co-authored-by: Per Goncalves da Silva <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 77ce6ff415bb7bf95b95a5a973e2a66423c01663

Author: 2 people

staging/operator-lifecycle-manager/.github/workflows/e2e-tests.yml

@@ -92,12 +92,12 @@ jobs:
 
       # run non-flakes if matrix-id is not 'flakes'
       - name: Run e2e tests
-        # calculate the number of chunks as the number of parallel jobs minus 1 (flakes job)
+        # calculate the number of chunks as the number of parallel jobs
         # use the split tool to split the test suite into chunks and run the chunk corresponding to the matrix-id
         # focus on those tests and skip tests marked as FLAKE
         run: |
-          E2E_TEST_NUM_CHUNKS=$(( ${{ strategy.job-total }} - 1 )) \
-          GINKGO_OPTS="${GINKGO_OPTS} -focus '$(go run ./test/e2e/split/... -chunks $E2E_TEST_NUM_CHUNKS -print-chunk $E2E_TEST_CHUNK ./test/e2e)' -skip '\[FLAKE\]'" \
+          E2E_TEST_NUM_CHUNKS=$(( ${{ strategy.job-total }} )) \
+          GINKGO_OPTS="${GINKGO_OPTS} -label-filter '$(go run ./test/e2e/split/... -chunks $E2E_TEST_NUM_CHUNKS -print-chunk $E2E_TEST_CHUNK ./test/e2e)' -skip '\[FLAKE\]'" \
           make e2e;
 
       # archive test results

staging/operator-lifecycle-manager/test/e2e/bundle_e2e_test.go

@@ -26,7 +26,7 @@ import (
 //go:embed testdata/vpa/crd.yaml
 var vpaCRDRaw []byte
 
-var _ = Describe("Installing bundles with new object types", func() {
+var _ = Describe("Installing bundles with new object types", Label("ObjectTypes"), func() {
 	var (
 		kubeClient         operatorclient.ClientInterface
 		operatorClient     versioned.Interface

staging/operator-lifecycle-manager/test/e2e/catalog_e2e_test.go

@@ -43,7 +43,7 @@ const (
 	badCSVDir             = "bad-csv"
 )
 
-var _ = Describe("Starting CatalogSource e2e tests", func() {
+var _ = Describe("Starting CatalogSource e2e tests", Label("CatalogSource"), func() {
 	var (
 		generatedNamespace  corev1.Namespace
 		c                   operatorclient.ClientInterface

staging/operator-lifecycle-manager/test/e2e/catalog_exclusion_test.go

@@ -20,7 +20,7 @@ import (
 
 const magicCatalogDir = "magiccatalog"
 
-var _ = Describe("Global Catalog Exclusion", func() {
+var _ = Describe("Global Catalog Exclusion", Label("CatalogExclusion"), func() {
 	var (
 		generatedNamespace  corev1.Namespace
 		determinedE2eClient *util.DeterminedE2EClient

staging/operator-lifecycle-manager/test/e2e/catsrc_pod_config_e2e_test.go

@@ -18,7 +18,7 @@ const catalogSourceLabel = "olm.catalogSource"
 
 var _ = By
 
-var _ = Describe("CatalogSource Grpc Pod Config", func() {
+var _ = Describe("CatalogSource Grpc Pod Config", Label("CatalogSourcePodConfig"), func() {
 
 	var (
 		generatedNamespace corev1.Namespace

staging/operator-lifecycle-manager/test/e2e/crd_e2e_test.go

@@ -22,7 +22,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-var _ = Describe("CRD Versions", func() {
+var _ = Describe("CRD Versions", Label("CRDs"), func() {
 	var (
 		generatedNamespace corev1.Namespace
 		c                  operatorclient.ClientInterface

staging/operator-lifecycle-manager/test/e2e/csv_e2e_test.go

@@ -34,7 +34,7 @@ import (
 	"github.com/operator-framework/operator-lifecycle-manager/test/e2e/ctx"
 )
 
-var _ = Describe("ClusterServiceVersion", func() {
+var _ = Describe("ClusterServiceVersion", Label("ClusterServiceVersion"), func() {
 	var (
 		generatedNamespace corev1.Namespace
 		c                  operatorclient.ClientInterface

staging/operator-lifecycle-manager/test/e2e/deprecated_e2e_test.go

@@ -18,7 +18,7 @@ import (
 
 var missingAPI = `{"apiVersion":"verticalpodautoscalers.autoscaling.k8s.io/v1","kind":"VerticalPodAutoscaler","metadata":{"name":"my.thing","namespace":"foo"}}`
 
-var _ = Describe("Not found APIs", func() {
+var _ = Describe("Not found APIs", Label("APIDeprecation"), func() {
 	var generatedNamespace corev1.Namespace
 
 	BeforeEach(func() {

staging/operator-lifecycle-manager/test/e2e/disabling_copied_csv_e2e_test.go

@@ -26,7 +26,7 @@ const (
 	protectedCopiedCSVNamespacesRuntimeFlag = "--protectedCopiedCSVNamespaces"
 )
 
-var _ = Describe("Disabling copied CSVs", func() {
+var _ = Describe("Disabling copied CSVs", Label("DisablingCopiedCSVs"), func() {
 	var (
 		generatedNamespace              corev1.Namespace
 		csv                             operatorsv1alpha1.ClusterServiceVersion

staging/operator-lifecycle-manager/test/e2e/dynamic_resource_e2e_test.go

@@ -20,7 +20,7 @@ import (
 // This test was disabled because both of its tests are currently being skipped
 // We need to understand why and whether this test is even needed:
 // https://github.com/operator-framework/operator-lifecycle-manager/issues/3402
-var _ = XDescribe("Subscriptions create required objects from Catalogs", func() {
+var _ = XDescribe("Subscriptions create required objects from Catalogs", Label("DynamicResource"), func() {
 	var (
 		crc                versioned.Interface
 		generatedNamespace corev1.Namespace