diff --git a/tests/cnf/ran/ztp/internal/helper/gitdetails.go b/tests/cnf/ran/gitopsztp/internal/helper/gitdetails.go similarity index 98% rename from tests/cnf/ran/ztp/internal/helper/gitdetails.go rename to tests/cnf/ran/gitopsztp/internal/helper/gitdetails.go index cfddaa224..51c22b928 100644 --- a/tests/cnf/ran/ztp/internal/helper/gitdetails.go +++ b/tests/cnf/ran/gitopsztp/internal/helper/gitdetails.go @@ -10,9 +10,9 @@ import ( "github.com/golang/glog" "github.com/openshift-kni/eco-goinfra/pkg/argocd" + "github.com/openshift-kni/eco-gotests/tests/cnf/ran/gitopsztp/internal/tsparams" . "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" "k8s.io/apimachinery/pkg/util/wait" ) diff --git a/tests/cnf/ran/ztp/internal/helper/helper.go b/tests/cnf/ran/gitopsztp/internal/helper/helper.go similarity index 97% rename from tests/cnf/ran/ztp/internal/helper/helper.go rename to tests/cnf/ran/gitopsztp/internal/helper/helper.go index cc9163954..7ebda627f 100644 --- a/tests/cnf/ran/ztp/internal/helper/helper.go +++ b/tests/cnf/ran/gitopsztp/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/gitopsztp/internal/tsparams" "k8s.io/apimachinery/pkg/util/wait" ) diff --git a/tests/cnf/ran/ztp/internal/helper/nodedelete.go b/tests/cnf/ran/gitopsztp/internal/helper/nodedelete.go similarity index 98% rename from tests/cnf/ran/ztp/internal/helper/nodedelete.go rename to tests/cnf/ran/gitopsztp/internal/helper/nodedelete.go index 68a4c7bcf..116e9dc32 100644 --- a/tests/cnf/ran/ztp/internal/helper/nodedelete.go +++ b/tests/cnf/ran/gitopsztp/internal/helper/nodedelete.go @@ -10,8 +10,8 @@ import ( "github.com/openshift-kni/eco-goinfra/pkg/bmh" "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/gitopsztp/internal/tsparams" . "github.com/openshift-kni/eco-gotests/tests/cnf/ran/internal/raninittools" - "github.com/openshift-kni/eco-gotests/tests/cnf/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/tests/cnf/ran/ztp/internal/helper/policiesapp.go b/tests/cnf/ran/gitopsztp/internal/helper/policiesapp.go similarity index 98% rename from tests/cnf/ran/ztp/internal/helper/policiesapp.go rename to tests/cnf/ran/gitopsztp/internal/helper/policiesapp.go index 08c107d07..54857c37e 100644 --- a/tests/cnf/ran/ztp/internal/helper/policiesapp.go +++ b/tests/cnf/ran/gitopsztp/internal/helper/policiesapp.go @@ -12,8 +12,8 @@ import ( "github.com/openshift-kni/eco-goinfra/pkg/ocm" "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/gitopsztp/internal/tsparams" "github.com/openshift-kni/eco-gotests/tests/cnf/ran/internal/ranhelper" - "github.com/openshift-kni/eco-gotests/tests/cnf/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/tests/cnf/ran/ztp/internal/tsparams/consts.go b/tests/cnf/ran/gitopsztp/internal/tsparams/consts.go similarity index 99% rename from tests/cnf/ran/ztp/internal/tsparams/consts.go rename to tests/cnf/ran/gitopsztp/internal/tsparams/consts.go index 96133e817..75f60d4f8 100644 --- a/tests/cnf/ran/ztp/internal/tsparams/consts.go +++ b/tests/cnf/ran/gitopsztp/internal/tsparams/consts.go @@ -8,7 +8,7 @@ import ( const ( // LabelSuite is the label for all the tests in this suite. - LabelSuite = "ran-ztp" + LabelSuite = "gitopsztp" // LabelArgoCdAcmCrsTestCases is the label for the ACM CRs test cases. LabelArgoCdAcmCrsTestCases = "ztp-argocd-acm-crs" // LabelArgoCdClustersAppTestCases is the label for the Argo CD clusters app test cases. diff --git a/tests/cnf/ran/ztp/internal/tsparams/ztpvars.go b/tests/cnf/ran/gitopsztp/internal/tsparams/ztpvars.go similarity index 100% rename from tests/cnf/ran/ztp/internal/tsparams/ztpvars.go rename to tests/cnf/ran/gitopsztp/internal/tsparams/ztpvars.go diff --git a/tests/cnf/ran/ztp/tests/ztp-argocd-acm-crs.go b/tests/cnf/ran/gitopsztp/tests/ztp-argocd-acm-crs.go similarity index 95% rename from tests/cnf/ran/ztp/tests/ztp-argocd-acm-crs.go rename to tests/cnf/ran/gitopsztp/tests/ztp-argocd-acm-crs.go index 845e741fb..debc27a15 100644 --- a/tests/cnf/ran/ztp/tests/ztp-argocd-acm-crs.go +++ b/tests/cnf/ran/gitopsztp/tests/ztp-argocd-acm-crs.go @@ -8,11 +8,11 @@ import ( . "github.com/onsi/gomega" "github.com/openshift-kni/eco-goinfra/pkg/deployment" "github.com/openshift-kni/eco-goinfra/pkg/reportxml" + "github.com/openshift-kni/eco-gotests/tests/cnf/ran/gitopsztp/internal/helper" + "github.com/openshift-kni/eco-gotests/tests/cnf/ran/gitopsztp/internal/tsparams" "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" policiesv1 "open-cluster-management.io/governance-policy-propagator/api/v1" ) diff --git a/tests/cnf/ran/ztp/tests/ztp-argocd-clusters-app.go b/tests/cnf/ran/gitopsztp/tests/ztp-argocd-clusters-app.go similarity index 95% rename from tests/cnf/ran/ztp/tests/ztp-argocd-clusters-app.go rename to tests/cnf/ran/gitopsztp/tests/ztp-argocd-clusters-app.go index fecc44f96..3299142f1 100644 --- a/tests/cnf/ran/ztp/tests/ztp-argocd-clusters-app.go +++ b/tests/cnf/ran/gitopsztp/tests/ztp-argocd-clusters-app.go @@ -8,10 +8,10 @@ import ( "github.com/openshift-kni/eco-goinfra/pkg/assisted" "github.com/openshift-kni/eco-goinfra/pkg/ocm" "github.com/openshift-kni/eco-goinfra/pkg/reportxml" + "github.com/openshift-kni/eco-gotests/tests/cnf/ran/gitopsztp/internal/helper" + "github.com/openshift-kni/eco-gotests/tests/cnf/ran/gitopsztp/internal/tsparams" "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" ) var _ = Describe("ZTP Argo CD Clusters Tests", Label(tsparams.LabelArgoCdClustersAppTestCases), func() { diff --git a/tests/cnf/ran/ztp/tests/ztp-argocd-hub-templating.go b/tests/cnf/ran/gitopsztp/tests/ztp-argocd-hub-templating.go similarity index 97% rename from tests/cnf/ran/ztp/tests/ztp-argocd-hub-templating.go rename to tests/cnf/ran/gitopsztp/tests/ztp-argocd-hub-templating.go index edc84f968..1b66d8525 100644 --- a/tests/cnf/ran/ztp/tests/ztp-argocd-hub-templating.go +++ b/tests/cnf/ran/gitopsztp/tests/ztp-argocd-hub-templating.go @@ -15,11 +15,11 @@ import ( "github.com/openshift-kni/eco-goinfra/pkg/reportxml" "github.com/openshift-kni/eco-goinfra/pkg/secret" "github.com/openshift-kni/eco-goinfra/pkg/sriov" + "github.com/openshift-kni/eco-gotests/tests/cnf/ran/gitopsztp/internal/helper" + "github.com/openshift-kni/eco-gotests/tests/cnf/ran/gitopsztp/internal/tsparams" "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" corev1 "k8s.io/api/core/v1" policiesv1 "open-cluster-management.io/governance-policy-propagator/api/v1" ) diff --git a/tests/cnf/ran/ztp/tests/ztp-argocd-node-delete.go b/tests/cnf/ran/gitopsztp/tests/ztp-argocd-node-delete.go similarity index 96% rename from tests/cnf/ran/ztp/tests/ztp-argocd-node-delete.go rename to tests/cnf/ran/gitopsztp/tests/ztp-argocd-node-delete.go index 0589d2d0e..7d9b7abc8 100644 --- a/tests/cnf/ran/ztp/tests/ztp-argocd-node-delete.go +++ b/tests/cnf/ran/gitopsztp/tests/ztp-argocd-node-delete.go @@ -8,10 +8,10 @@ import ( "github.com/openshift-kni/eco-goinfra/pkg/bmh" "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/gitopsztp/internal/helper" + "github.com/openshift-kni/eco-gotests/tests/cnf/ran/gitopsztp/internal/tsparams" "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" ) var _ = Describe("ZTP Argo CD Node Deletion Tests", Label(tsparams.LabelArgoCdNodeDeletionTestCases), func() { diff --git a/tests/cnf/ran/ztp/tests/ztp-argocd-policies-app.go b/tests/cnf/ran/gitopsztp/tests/ztp-argocd-policies-app.go similarity index 98% rename from tests/cnf/ran/ztp/tests/ztp-argocd-policies-app.go rename to tests/cnf/ran/gitopsztp/tests/ztp-argocd-policies-app.go index 208ec47d4..982bc060c 100644 --- a/tests/cnf/ran/ztp/tests/ztp-argocd-policies-app.go +++ b/tests/cnf/ran/gitopsztp/tests/ztp-argocd-policies-app.go @@ -12,12 +12,12 @@ import ( "github.com/openshift-kni/eco-goinfra/pkg/reportxml" "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/gitopsztp/internal/helper" + "github.com/openshift-kni/eco-gotests/tests/cnf/ran/gitopsztp/internal/tsparams" "github.com/openshift-kni/eco-gotests/tests/cnf/ran/internal/cluster" "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" 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 b/tests/cnf/ran/gitopsztp/tests/ztp-generator.go similarity index 98% rename from tests/cnf/ran/ztp/tests/ztp-generator.go rename to tests/cnf/ran/gitopsztp/tests/ztp-generator.go index aaef84bdd..10d98a186 100644 --- a/tests/cnf/ran/ztp/tests/ztp-generator.go +++ b/tests/cnf/ran/gitopsztp/tests/ztp-generator.go @@ -10,10 +10,10 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/openshift-kni/eco-goinfra/pkg/reportxml" + "github.com/openshift-kni/eco-gotests/tests/cnf/ran/gitopsztp/internal/tsparams" "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" "gopkg.in/yaml.v2" ) diff --git a/tests/cnf/ran/ztp/tests/ztp-machine-config.go b/tests/cnf/ran/gitopsztp/tests/ztp-machine-config.go similarity index 95% rename from tests/cnf/ran/ztp/tests/ztp-machine-config.go rename to tests/cnf/ran/gitopsztp/tests/ztp-machine-config.go index 9b3db6ef2..7a1e97626 100644 --- a/tests/cnf/ran/ztp/tests/ztp-machine-config.go +++ b/tests/cnf/ran/gitopsztp/tests/ztp-machine-config.go @@ -8,8 +8,8 @@ import ( . "github.com/onsi/gomega" "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/gitopsztp/internal/tsparams" . "github.com/openshift-kni/eco-gotests/tests/cnf/ran/internal/raninittools" - "github.com/openshift-kni/eco-gotests/tests/cnf/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 b/tests/cnf/ran/gitopsztp/tests/ztp-spoke-checker.go similarity index 97% rename from tests/cnf/ran/ztp/tests/ztp-spoke-checker.go rename to tests/cnf/ran/gitopsztp/tests/ztp-spoke-checker.go index 111ba8f96..a4fcdac68 100644 --- a/tests/cnf/ran/ztp/tests/ztp-spoke-checker.go +++ b/tests/cnf/ran/gitopsztp/tests/ztp-spoke-checker.go @@ -8,9 +8,9 @@ import ( . "github.com/onsi/gomega" "github.com/openshift-kni/eco-goinfra/pkg/pod" "github.com/openshift-kni/eco-goinfra/pkg/reportxml" + "github.com/openshift-kni/eco-gotests/tests/cnf/ran/gitopsztp/internal/tsparams" "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" ) var _ = Describe("ZTP Spoke Checker Tests", Label(tsparams.LabelSpokeCheckerTests), func() { diff --git a/tests/cnf/ran/ztp/ztp_suite_test.go b/tests/cnf/ran/gitopsztp/ztp_suite_test.go similarity index 91% rename from tests/cnf/ran/ztp/ztp_suite_test.go rename to tests/cnf/ran/gitopsztp/ztp_suite_test.go index d48655c80..a1e654297 100644 --- a/tests/cnf/ran/ztp/ztp_suite_test.go +++ b/tests/cnf/ran/gitopsztp/ztp_suite_test.go @@ -12,11 +12,11 @@ import ( "github.com/openshift-kni/eco-goinfra/pkg/clients" "github.com/openshift-kni/eco-goinfra/pkg/namespace" "github.com/openshift-kni/eco-goinfra/pkg/reportxml" + "github.com/openshift-kni/eco-gotests/tests/cnf/ran/gitopsztp/internal/helper" + "github.com/openshift-kni/eco-gotests/tests/cnf/ran/gitopsztp/internal/tsparams" + _ "github.com/openshift-kni/eco-gotests/tests/cnf/ran/gitopsztp/tests" "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/internal/reporter" )