rm unnecessary tags and add tags flag to checkphase

edgelesssys · Dec 4, 2024 · c71f727 · c71f727
1 parent b038c0c
commit c71f727
Show file tree

Hide file tree

Showing 15 changed files with 11 additions and 19 deletions.
diff --git a/cli/cmd/recover.go b/cli/cmd/recover.go
@@ -1,8 +1,6 @@
 // Copyright 2024 Edgeless Systems GmbH
 // SPDX-License-Identifier: AGPL-3.0-only
 
-//go:build contrast_unstable_api
-
 package cmd
 
 import (

diff --git a/cli/cmd/set.go b/cli/cmd/set.go
@@ -1,8 +1,6 @@
 // Copyright 2024 Edgeless Systems GmbH
 // SPDX-License-Identifier: AGPL-3.0-only
 
-//go:build contrast_unstable_api
-
 package cmd
 
 import (

diff --git a/cli/cmd/verify.go b/cli/cmd/verify.go
@@ -1,8 +1,6 @@
 // Copyright 2024 Edgeless Systems GmbH
 // SPDX-License-Identifier: AGPL-3.0-only
 
-//go:build contrast_unstable_api
-
 package cmd
 
 import (

diff --git a/cli/main.go b/cli/main.go
@@ -1,8 +1,6 @@
 // Copyright 2024 Edgeless Systems GmbH
 // SPDX-License-Identifier: AGPL-3.0-only
 
-//go:build contrast_unstable_api
-
 package main
 
 import (

diff --git a/e2e/aks-runtime/aks_runtime_test.go b/e2e/aks-runtime/aks_runtime_test.go
@@ -1,7 +1,7 @@
 // Copyright 2024 Edgeless Systems GmbH
 // SPDX-License-Identifier: AGPL-3.0-only
 
-//go:build e2e && contrast_unstable_api
+//go:build e2e
 
 package aksruntime
 

diff --git a/e2e/genpolicy/genpolicy_test.go b/e2e/genpolicy/genpolicy_test.go
@@ -1,7 +1,7 @@
 // Copyright 2024 Edgeless Systems GmbH
 // SPDX-License-Identifier: AGPL-3.0-only
 
-//go:build e2e && contrast_unstable_api
+//go:build e2e
 
 package genpolicy
 

diff --git a/e2e/getdents/getdents_test.go b/e2e/getdents/getdents_test.go
@@ -1,7 +1,7 @@
 // Copyright 2024 Edgeless Systems GmbH
 // SPDX-License-Identifier: AGPL-3.0-only
 
-//go:build e2e && contrast_unstable_api
+//go:build e2e
 
 package getdents
 

diff --git a/e2e/internal/contrasttest/contrasttest.go b/e2e/internal/contrasttest/contrasttest.go
@@ -1,7 +1,7 @@
 // Copyright 2024 Edgeless Systems GmbH
 // SPDX-License-Identifier: AGPL-3.0-only
 
-//go:build e2e && contrast_unstable_api
+//go:build e2e
 
 package contrasttest
 

diff --git a/e2e/openssl/openssl_test.go b/e2e/openssl/openssl_test.go
@@ -1,7 +1,7 @@
 // Copyright 2024 Edgeless Systems GmbH
 // SPDX-License-Identifier: AGPL-3.0-only
 
-//go:build e2e && contrast_unstable_api
+//go:build e2e
 
 package openssl
 

diff --git a/e2e/policy/policy_test.go b/e2e/policy/policy_test.go
@@ -1,7 +1,7 @@
 // Copyright 2024 Edgeless Systems GmbH
 // SPDX-License-Identifier: AGPL-3.0-only
 
-//go:build e2e && contrast_unstable_api
+//go:build e2e
 
 package policy
 

diff --git a/e2e/regression/regression_test.go b/e2e/regression/regression_test.go
@@ -1,7 +1,7 @@
 // Copyright 2024 Edgeless Systems GmbH
 // SPDX-License-Identifier: AGPL-3.0-only
 
-//go:build e2e && contrast_unstable_api
+//go:build e2e
 
 package regression
 

diff --git a/e2e/servicemesh/servicemesh_test.go b/e2e/servicemesh/servicemesh_test.go
@@ -1,7 +1,7 @@
 // Copyright 2024 Edgeless Systems GmbH
 // SPDX-License-Identifier: AGPL-3.0-only
 
-//go:build e2e && contrast_unstable_api
+//go:build e2e
 
 package servicemesh
 

diff --git a/e2e/volumestatefulset/volumestatefulset_test.go b/e2e/volumestatefulset/volumestatefulset_test.go
@@ -1,7 +1,7 @@
 // Copyright 2024 Edgeless Systems GmbH
 // SPDX-License-Identifier: AGPL-3.0-only
 
-//go:build e2e && contrast_unstable_api
+//go:build e2e
 
 package volumestatefulset
 

diff --git a/e2e/workloadsecret/workloadsecret_test.go b/e2e/workloadsecret/workloadsecret_test.go
@@ -1,7 +1,7 @@
 // Copyright 2024 Edgeless Systems GmbH
 // SPDX-License-Identifier: AGPL-3.0-only
 
-//go:build e2e && contrast_unstable_api
+//go:build e2e
 
 package workloadsecret
 

diff --git a/packages/by-name/contrast/package.nix b/packages/by-name/contrast/package.nix
@@ -212,7 +212,7 @@ buildGoModule rec {
 
   checkPhase = ''
     runHook preCheck
-    go test -race ./...
+    go test -tags=contrast_unstable_api -race ./...
     runHook postCheck
   '';