cnf ran: rename ztp directory to ran-ztp

Since the ztp directory is already used by assisted, using it in RAN CI requires using labels but this creates a lot of noise as it still runs tests and just skips the ones not selected by the label. By giving RAN ZTP tests the ran-ztp directory name they can still be run using ECO_TEST_FEATURES.
openshift-kni · Aug 6, 2024 · f335182 · f335182
1 parent 45422bd
commit f335182
Show file tree

Hide file tree

Showing 15 changed files with 20 additions and 20 deletions.
diff --git a/...cnf/ran/ztp/internal/helper/gitdetails.go → ...ran/ran-ztp/internal/helper/gitdetails.go b/...cnf/ran/ztp/internal/helper/gitdetails.go → ...ran/ran-ztp/internal/helper/gitdetails.go
@@ -12,7 +12,7 @@ import (
 	"github.com/openshift-kni/eco-goinfra/pkg/argocd"
 	. "github.com/openshift-kni/eco-gotests/tests/cnf/ran/internal/raninittools"
 	"github.com/openshift-kni/eco-gotests/tests/cnf/ran/internal/ranparam"
-	"github.com/openshift-kni/eco-gotests/tests/cnf/ran/ztp/internal/tsparams"
+	"github.com/openshift-kni/eco-gotests/tests/cnf/ran/ran-ztp/internal/tsparams"
 	"k8s.io/apimachinery/pkg/util/wait"
 )
 

diff --git a/tests/cnf/ran/ztp/internal/helper/helper.go → ...cnf/ran/ran-ztp/internal/helper/helper.go b/tests/cnf/ran/ztp/internal/helper/helper.go → ...cnf/ran/ran-ztp/internal/helper/helper.go
@@ -10,7 +10,7 @@ import (
 	"github.com/openshift-kni/eco-goinfra/pkg/argocd"
 	"github.com/openshift-kni/eco-goinfra/pkg/clients"
 	"github.com/openshift-kni/eco-goinfra/pkg/ocm"
-	"github.com/openshift-kni/eco-gotests/tests/cnf/ran/ztp/internal/tsparams"
+	"github.com/openshift-kni/eco-gotests/tests/cnf/ran/ran-ztp/internal/tsparams"
 	"k8s.io/apimachinery/pkg/util/wait"
 )
 

diff --git a/...cnf/ran/ztp/internal/helper/nodedelete.go → ...ran/ran-ztp/internal/helper/nodedelete.go b/...cnf/ran/ztp/internal/helper/nodedelete.go → ...ran/ran-ztp/internal/helper/nodedelete.go
@@ -11,7 +11,7 @@ import (
 	"github.com/openshift-kni/eco-goinfra/pkg/clients"
 	"github.com/openshift-kni/eco-goinfra/pkg/nodes"
 	. "github.com/openshift-kni/eco-gotests/tests/cnf/ran/internal/raninittools"
-	"github.com/openshift-kni/eco-gotests/tests/cnf/ran/ztp/internal/tsparams"
+	"github.com/openshift-kni/eco-gotests/tests/cnf/ran/ran-ztp/internal/tsparams"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/util/wait"

diff --git a/...nf/ran/ztp/internal/helper/policiesapp.go → ...an/ran-ztp/internal/helper/policiesapp.go b/...nf/ran/ztp/internal/helper/policiesapp.go → ...an/ran-ztp/internal/helper/policiesapp.go
@@ -13,7 +13,7 @@ import (
 	"github.com/openshift-kni/eco-goinfra/pkg/serviceaccount"
 	"github.com/openshift-kni/eco-goinfra/pkg/storage"
 	"github.com/openshift-kni/eco-gotests/tests/cnf/ran/internal/ranhelper"
-	"github.com/openshift-kni/eco-gotests/tests/cnf/ran/ztp/internal/tsparams"
+	"github.com/openshift-kni/eco-gotests/tests/cnf/ran/ran-ztp/internal/tsparams"
 	operatorv1 "github.com/openshift/api/operator/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/wait"

diff --git a/...s/cnf/ran/ztp/internal/tsparams/consts.go → ...f/ran/ran-ztp/internal/tsparams/consts.go b/...s/cnf/ran/ztp/internal/tsparams/consts.go → ...f/ran/ran-ztp/internal/tsparams/consts.go
diff --git a/.../cnf/ran/ztp/internal/tsparams/ztpvars.go → .../ran/ran-ztp/internal/tsparams/ztpvars.go b/.../cnf/ran/ztp/internal/tsparams/ztpvars.go → .../ran/ran-ztp/internal/tsparams/ztpvars.go
diff --git a/...s/cnf/ran/ztp/tests/ztp-argocd-acm-crs.go → ...f/ran/ran-ztp/tests/ztp-argocd-acm-crs.go b/...s/cnf/ran/ztp/tests/ztp-argocd-acm-crs.go → ...f/ran/ran-ztp/tests/ztp-argocd-acm-crs.go
@@ -11,8 +11,8 @@ import (
 	"github.com/openshift-kni/eco-gotests/tests/cnf/ran/internal/ranhelper"
 	. "github.com/openshift-kni/eco-gotests/tests/cnf/ran/internal/raninittools"
 	"github.com/openshift-kni/eco-gotests/tests/cnf/ran/internal/ranparam"
-	"github.com/openshift-kni/eco-gotests/tests/cnf/ran/ztp/internal/helper"
-	"github.com/openshift-kni/eco-gotests/tests/cnf/ran/ztp/internal/tsparams"
+	"github.com/openshift-kni/eco-gotests/tests/cnf/ran/ran-ztp/internal/helper"
+	"github.com/openshift-kni/eco-gotests/tests/cnf/ran/ran-ztp/internal/tsparams"
 	policiesv1 "open-cluster-management.io/governance-policy-propagator/api/v1"
 )
 

diff --git a/.../ran/ztp/tests/ztp-argocd-clusters-app.go → .../ran-ztp/tests/ztp-argocd-clusters-app.go b/.../ran/ztp/tests/ztp-argocd-clusters-app.go → .../ran-ztp/tests/ztp-argocd-clusters-app.go
@@ -10,8 +10,8 @@ import (
 	"github.com/openshift-kni/eco-goinfra/pkg/reportxml"
 	"github.com/openshift-kni/eco-gotests/tests/cnf/ran/internal/ranhelper"
 	. "github.com/openshift-kni/eco-gotests/tests/cnf/ran/internal/raninittools"
-	"github.com/openshift-kni/eco-gotests/tests/cnf/ran/ztp/internal/helper"
-	"github.com/openshift-kni/eco-gotests/tests/cnf/ran/ztp/internal/tsparams"
+	"github.com/openshift-kni/eco-gotests/tests/cnf/ran/ran-ztp/internal/helper"
+	"github.com/openshift-kni/eco-gotests/tests/cnf/ran/ran-ztp/internal/tsparams"
 )
 
 var _ = Describe("ZTP Argo CD Clusters Tests", Label(tsparams.LabelArgoCdClustersAppTestCases), func() {

diff --git a/...an/ztp/tests/ztp-argocd-hub-templating.go → ...an-ztp/tests/ztp-argocd-hub-templating.go b/...an/ztp/tests/ztp-argocd-hub-templating.go → ...an-ztp/tests/ztp-argocd-hub-templating.go
@@ -18,8 +18,8 @@ import (
 	"github.com/openshift-kni/eco-gotests/tests/cnf/ran/internal/ranhelper"
 	. "github.com/openshift-kni/eco-gotests/tests/cnf/ran/internal/raninittools"
 	"github.com/openshift-kni/eco-gotests/tests/cnf/ran/internal/ranparam"
-	"github.com/openshift-kni/eco-gotests/tests/cnf/ran/ztp/internal/helper"
-	"github.com/openshift-kni/eco-gotests/tests/cnf/ran/ztp/internal/tsparams"
+	"github.com/openshift-kni/eco-gotests/tests/cnf/ran/ran-ztp/internal/helper"
+	"github.com/openshift-kni/eco-gotests/tests/cnf/ran/ran-ztp/internal/tsparams"
 	corev1 "k8s.io/api/core/v1"
 	policiesv1 "open-cluster-management.io/governance-policy-propagator/api/v1"
 )

diff --git a/...f/ran/ztp/tests/ztp-argocd-node-delete.go → ...n/ran-ztp/tests/ztp-argocd-node-delete.go b/...f/ran/ztp/tests/ztp-argocd-node-delete.go → ...n/ran-ztp/tests/ztp-argocd-node-delete.go
@@ -10,8 +10,8 @@ import (
 	"github.com/openshift-kni/eco-goinfra/pkg/reportxml"
 	"github.com/openshift-kni/eco-gotests/tests/cnf/ran/internal/ranhelper"
 	. "github.com/openshift-kni/eco-gotests/tests/cnf/ran/internal/raninittools"
-	"github.com/openshift-kni/eco-gotests/tests/cnf/ran/ztp/internal/helper"
-	"github.com/openshift-kni/eco-gotests/tests/cnf/ran/ztp/internal/tsparams"
+	"github.com/openshift-kni/eco-gotests/tests/cnf/ran/ran-ztp/internal/helper"
+	"github.com/openshift-kni/eco-gotests/tests/cnf/ran/ran-ztp/internal/tsparams"
 )
 
 var _ = Describe("ZTP Argo CD Node Deletion Tests", Label(tsparams.LabelArgoCdNodeDeletionTestCases), func() {

diff --git a/.../ran/ztp/tests/ztp-argocd-policies-app.go → .../ran-ztp/tests/ztp-argocd-policies-app.go b/.../ran/ztp/tests/ztp-argocd-policies-app.go → .../ran-ztp/tests/ztp-argocd-policies-app.go
@@ -16,8 +16,8 @@ import (
 	"github.com/openshift-kni/eco-gotests/tests/cnf/ran/internal/ranhelper"
 	. "github.com/openshift-kni/eco-gotests/tests/cnf/ran/internal/raninittools"
 	"github.com/openshift-kni/eco-gotests/tests/cnf/ran/internal/ranparam"
-	"github.com/openshift-kni/eco-gotests/tests/cnf/ran/ztp/internal/helper"
-	"github.com/openshift-kni/eco-gotests/tests/cnf/ran/ztp/internal/tsparams"
+	"github.com/openshift-kni/eco-gotests/tests/cnf/ran/ran-ztp/internal/helper"
+	"github.com/openshift-kni/eco-gotests/tests/cnf/ran/ran-ztp/internal/tsparams"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	policiesv1 "open-cluster-management.io/governance-policy-propagator/api/v1"
 )

diff --git a/tests/cnf/ran/ztp/tests/ztp-generator.go → tests/cnf/ran/ran-ztp/tests/ztp-generator.go b/tests/cnf/ran/ztp/tests/ztp-generator.go → tests/cnf/ran/ran-ztp/tests/ztp-generator.go
@@ -13,7 +13,7 @@ import (
 	"github.com/openshift-kni/eco-gotests/tests/cnf/ran/internal/cluster"
 	. "github.com/openshift-kni/eco-gotests/tests/cnf/ran/internal/raninittools"
 	"github.com/openshift-kni/eco-gotests/tests/cnf/ran/internal/ranparam"
-	"github.com/openshift-kni/eco-gotests/tests/cnf/ran/ztp/internal/tsparams"
+	"github.com/openshift-kni/eco-gotests/tests/cnf/ran/ran-ztp/internal/tsparams"
 	"gopkg.in/yaml.v2"
 )
 

diff --git a/...s/cnf/ran/ztp/tests/ztp-machine-config.go → ...f/ran/ran-ztp/tests/ztp-machine-config.go b/...s/cnf/ran/ztp/tests/ztp-machine-config.go → ...f/ran/ran-ztp/tests/ztp-machine-config.go
@@ -9,7 +9,7 @@ import (
 	"github.com/openshift-kni/eco-goinfra/pkg/mco"
 	"github.com/openshift-kni/eco-goinfra/pkg/reportxml"
 	. "github.com/openshift-kni/eco-gotests/tests/cnf/ran/internal/raninittools"
-	"github.com/openshift-kni/eco-gotests/tests/cnf/ran/ztp/internal/tsparams"
+	"github.com/openshift-kni/eco-gotests/tests/cnf/ran/ran-ztp/internal/tsparams"
 )
 
 var _ = Describe("ZTP Machine Config Tests", Label(tsparams.LabelMachineConfigTestCases), func() {

diff --git a/tests/cnf/ran/ztp/tests/ztp-spoke-checker.go → ...nf/ran/ran-ztp/tests/ztp-spoke-checker.go b/tests/cnf/ran/ztp/tests/ztp-spoke-checker.go → ...nf/ran/ran-ztp/tests/ztp-spoke-checker.go
@@ -10,7 +10,7 @@ import (
 	"github.com/openshift-kni/eco-goinfra/pkg/reportxml"
 	"github.com/openshift-kni/eco-gotests/tests/cnf/ran/internal/cluster"
 	. "github.com/openshift-kni/eco-gotests/tests/cnf/ran/internal/raninittools"
-	"github.com/openshift-kni/eco-gotests/tests/cnf/ran/ztp/internal/tsparams"
+	"github.com/openshift-kni/eco-gotests/tests/cnf/ran/ran-ztp/internal/tsparams"
 )
 
 var _ = Describe("ZTP Spoke Checker Tests", Label(tsparams.LabelSpokeCheckerTests), func() {

diff --git a/tests/cnf/ran/ztp/ztp_suite_test.go → tests/cnf/ran/ran-ztp/ztp_suite_test.go b/tests/cnf/ran/ztp/ztp_suite_test.go → tests/cnf/ran/ran-ztp/ztp_suite_test.go
@@ -14,9 +14,9 @@ import (
 	"github.com/openshift-kni/eco-goinfra/pkg/reportxml"
 	"github.com/openshift-kni/eco-gotests/tests/cnf/ran/internal/ranhelper"
 	. "github.com/openshift-kni/eco-gotests/tests/cnf/ran/internal/raninittools"
-	"github.com/openshift-kni/eco-gotests/tests/cnf/ran/ztp/internal/helper"
-	"github.com/openshift-kni/eco-gotests/tests/cnf/ran/ztp/internal/tsparams"
-	_ "github.com/openshift-kni/eco-gotests/tests/cnf/ran/ztp/tests"
+	"github.com/openshift-kni/eco-gotests/tests/cnf/ran/ran-ztp/internal/helper"
+	"github.com/openshift-kni/eco-gotests/tests/cnf/ran/ran-ztp/internal/tsparams"
+	_ "github.com/openshift-kni/eco-gotests/tests/cnf/ran/ran-ztp/tests"
 	"github.com/openshift-kni/eco-gotests/tests/internal/reporter"
 )