Cleanup

Author: aledbf

test/go.mod

@@ -20,7 +20,7 @@ require (
 	github.com/prometheus/procfs v0.10.1
 	github.com/vishvananda/netns v0.0.4
 	golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e
-	golang.org/x/oauth2 v0.6.0
+	golang.org/x/oauth2 v0.8.0
 	golang.org/x/sync v0.2.0
 	golang.org/x/sys v0.11.0
 	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2
@@ -32,7 +32,7 @@ require (
 	k8s.io/client-go v0.27.3
 	k8s.io/klog/v2 v2.90.1
 	k8s.io/kubectl v0.27.3
-	sigs.k8s.io/e2e-framework v0.0.7
+	sigs.k8s.io/e2e-framework v0.2.0
 )
 
 require (
@@ -156,7 +156,7 @@ require (
 	go.opencensus.io v0.24.0 // indirect
 	go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
 	go.uber.org/atomic v1.8.0 // indirect
-	golang.org/x/crypto v0.1.0 // indirect
+	golang.org/x/crypto v0.7.0 // indirect
 	golang.org/x/mod v0.10.0 // indirect
 	golang.org/x/net v0.10.0 // indirect
 	golang.org/x/term v0.8.0 // indirect

test/go.sum

@@ -114,14 +114,17 @@ if [ "$TEST_SUITE" == "workspace" ]; then
 
   set +e
   # shellcheck disable=SC2086
-  go test -p 6 -v $TEST_LIST "${args[@]}" -parallel-features=true 2>&1  | go-junit-report -subtest-mode=exclude-parents -set-exit-code -out "${RESULTS_DIR}/TEST-${TEST_NAME}.xml" -iocopy
+  go test -p 6 -v $TEST_LIST "${args[@]}" -parallel-features=true -skip-labels="type=maintenance" 2>&1  | go-junit-report -subtest-mode=exclude-parents -set-exit-code -out "${RESULTS_DIR}/TEST-${TEST_NAME}.xml" -iocopy
   RC=${PIPESTATUS[0]}
   set -e
 
   if [ "${RC}" -ne "0" ]; then
     FAILURE_COUNT=$((FAILURE_COUNT+1))
   fi
 
+  # shellcheck disable=SC2086
+  go test -v $TEST_LIST "${args[@]}" -labels="type=maintenance" -parallel-features=false 2>&1
+
   cd -
   if [ "${REPORT}" != "" ]; then
      "${THIS_DIR}/report.sh" "${LOG_FILE}" > "$REPORT"

test/run.sh

@@ -29,7 +29,7 @@ func TestMaintenance(t *testing.T) {
 	testRepo := "https://github.com/gitpod-io/empty"
 	testRepoName := "empty"
 
-	f := features.New("ws-manager").
+	f1 := features.New("maintenance").
 		WithLabel("component", "ws-manager").
 		WithLabel("type", "maintenance").
 		Assess("should display maintenance message", func(testCtx context.Context, t *testing.T, cfg *envconf.Config) context.Context {
@@ -97,14 +97,7 @@ func TestMaintenance(t *testing.T) {
 		}).
 		Feature()
 
-	testEnv.Test(t, f)
-}
-
-func TestMaintenanceUpdate(t *testing.T) {
-	testRepo := "https://github.com/gitpod-io/empty"
-	testRepoName := "empty"
-
-	f := features.New("ws-manager").
+	f2 := features.New("maintenance-configuration").
 		WithLabel("component", "ws-manager").
 		WithLabel("type", "maintenance").
 		Assess("should display a maintenance message when configured and not when disabled", func(testCtx context.Context, t *testing.T, cfg *envconf.Config) context.Context {
@@ -195,8 +188,9 @@ func TestMaintenanceUpdate(t *testing.T) {
 		}).
 		Feature()
 
-	testEnv.Test(t, f)
+	testEnv.Test(t, f1, f2)
 }
+
 func maintenanceConfigmap(untilTime *time.Time) (*corev1.ConfigMap, error) {
 	mcfg := config.MaintenanceConfig{}
 	if untilTime != nil {