Skip to content

Fix e2e test grid by using ginkgo labels #3451

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 26, 2024
Merged

Fix e2e test grid by using ginkgo labels #3451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
50c6c4d
Fix e2e gha num chunks
Nov 20, 2024
0db7883
Refactor e2e split tool for labels
Nov 20, 2024
5c0e1ea
Add ginkgo labels to e2e tests
Nov 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/e2e-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/bundle_e2e_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/catalog_e2e_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/catalog_exclusion_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,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
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/catsrc_pod_config_e2e_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/crd_e2e_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/csv_e2e_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/deprecated_e2e_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/disabling_copied_csv_e2e_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/dynamic_resource_e2e_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/fail_forward_e2e_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ func updateCatalogSource(namespace, name string, packages ...string) (func(), er
return deployCatalogSource(namespace, name, packages...)
}

var _ = Describe("Fail Forward Upgrades", func() {
var _ = Describe("Fail Forward Upgrades", Label("FailForward"), func() {

var (
generatedNamespace corev1.Namespace
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/gc_e2e_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"github.com/operator-framework/operator-lifecycle-manager/test/e2e/ctx"
)

var _ = Describe("Garbage collection for dependent resources", func() {
var _ = Describe("Garbage collection for dependent resources", Label("GarbageCollection"), func() {
var (
kubeClient operatorclient.ClientInterface
operatorClient versioned.Interface
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/installplan_e2e_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ const (
deprecatedCRDDir = "deprecated-crd"
)

var _ = Describe("Install Plan", func() {
var _ = Describe("Install Plan", Label("InstallPlan"), func() {
var (
c operatorclient.ClientInterface
crc versioned.Interface
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/magic_catalog_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
)

var _ = Describe("MagicCatalog", func() {
var _ = Describe("MagicCatalog", Label("MagicCatalog"), func() {
var (
generatedNamespace corev1.Namespace
c client.Client
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/metrics_e2e_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"github.com/operator-framework/operator-lifecycle-manager/test/e2e/ctx"
)

var _ = Describe("Metrics are generated for OLM managed resources", func() {
var _ = Describe("Metrics are generated for OLM managed resources", Label("Metrics"), func() {
var (
c operatorclient.ClientInterface
crc versioned.Interface
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/operator_condition_e2e_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"github.com/operator-framework/operator-lifecycle-manager/test/e2e/ctx"
)

var _ = Describe("Operator Condition", func() {
var _ = Describe("Operator Condition", Label("OperatorCondition"), func() {
var (
generatedNamespace corev1.Namespace
)
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/operator_groups_e2e_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import (
"github.com/operator-framework/operator-lifecycle-manager/test/e2e/ctx"
)

var _ = Describe("Operator Group", func() {
var _ = Describe("Operator Group", Label("OperatorGroup"), func() {
var (
c operatorclient.ClientInterface
crc versioned.Interface
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/operator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import (
)

// Describes test specs for the Operator resource.
var _ = Describe("Operator API", func() {
var _ = Describe("Operator API", Label("Operator"), func() {
var (
clientCtx context.Context
scheme *runtime.Scheme
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/packagemanifest_e2e_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"github.com/operator-framework/operator-lifecycle-manager/test/e2e/ctx"
)

var _ = Describe("Package Manifest API lists available Operators from Catalog Sources", func() {
var _ = Describe("Package Manifest API lists available Operators from Catalog Sources", Label("PackageManifest"), func() {
var (
crc versioned.Interface
pmc pmversioned.Interface
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/resource_manager_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"github.com/operator-framework/operator-lifecycle-manager/test/e2e/ctx"
)

var _ = Describe("ResourceManager", func() {
var _ = Describe("ResourceManager", Label("ResourceManager"), func() {
var generatedNamespace corev1.Namespace

BeforeEach(func() {
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/scoped_client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"github.com/operator-framework/operator-lifecycle-manager/test/e2e/ctx"
)

var _ = Describe("Scoped Client bound to a service account can be used to make API calls", func() {
var _ = Describe("Scoped Client bound to a service account can be used to make API calls", Label("ScopedClient"), func() {
// TestScopedClient ensures that we can create a scoped client bound to a
// service account and then we can use the scoped client to make API calls.
var (
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/split/integration_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ function get_total_specs() {
}

unfocused_specs=$(get_total_specs)
regexp=$(go run ./test/e2e/split/... -chunks 1 -print-chunk 0 ./test/e2e)
focused_specs=$(get_total_specs -focus "$regexp")
label_filter=$(go run ./test/e2e/split/... -chunks 1 -print-chunk 0 ./test/e2e)
focused_specs=$(get_total_specs -label-filter "$label_filter")

if ! [ $unfocused_specs -eq $focused_specs ]; then
echo "expected number of unfocused specs $unfocused_specs to equal focus specs $focused_specs"
Expand Down
Loading
Loading