From 845810b072b9785442936de1fce798310eeb550f Mon Sep 17 00:00:00 2001 From: Al Berez Date: Tue, 21 May 2024 23:53:40 +0000 Subject: [PATCH] Execute CLI SSH Suit togetheer with other non-plugin tests With Ginkgo v2 we have more granular way to configure flake retries. https://onsi.github.io/ginkgo/#repeating-spec-runs-and-managing-flaky-specs --- Makefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index a01575de516..7306e566aae 100644 --- a/Makefile +++ b/Makefile @@ -206,15 +206,13 @@ units-non-plugin: install-test-deps @rm -f $(wildcard fixtures/plugins/*.exe) @ginkgo version CF_HOME=$(CURDIR)/fixtures CF_USERNAME="" CF_PASSWORD="" $(ginkgo_units) \ - -skip-package integration,cf\ssh,plugin,cf\actors\plugin,cf\commands\plugin,cf\actors\plugin,util\randomword - CF_HOME=$(CURDIR)/fixtures $(ginkgo_units) -flake-attempts 3 cf/ssh + -skip-package integration,plugin,cf\actors\plugin,cf\commands\plugin,cf\actors\plugin,util\randomword else units-non-plugin: install-test-deps @rm -f $(wildcard fixtures/plugins/*.exe) @ginkgo version CF_HOME=$(CURDIR)/fixtures CF_USERNAME="" CF_PASSWORD="" $(ginkgo_units) \ - -skip-package integration,cf/ssh,plugin,cf/actors/plugin,cf/commands/plugin,cf/actors/plugin,util/randomword - CF_HOME=$(CURDIR)/fixtures $(ginkgo_units) -flake-attempts 3 cf/ssh + -skip-package integration,plugin,cf/actors/plugin,cf/commands/plugin,cf/actors/plugin,util/randomword endif units-full: build units-plugin units-non-plugin