Skip to content

Commit

Permalink
cnf ran: rename ztp directory to gitopsztp
Browse files Browse the repository at this point in the history 
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 gitopsztp directory name they can still be run using ECO_TEST_FEATURES. Additionally, the test label is also changed to gitopsztp.
  • Loading branch information
@klaskosk
klaskosk committed Aug 6, 2024
1 parent 45422bd commit 29f3a4d
Show file tree
Hide file tree
Showing 15 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion ...cnf/ran/ztp/internal/helper/gitdetails.go → ...n/gitopsztp/internal/helper/gitdetails.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion tests/cnf/ran/ztp/internal/helper/helper.go → ...f/ran/gitopsztp/internal/helper/helper.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion ...cnf/ran/ztp/internal/helper/nodedelete.go → ...n/gitopsztp/internal/helper/nodedelete.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ...nf/ran/ztp/internal/helper/policiesapp.go → .../gitopsztp/internal/helper/policiesapp.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ...s/cnf/ran/ztp/internal/tsparams/consts.go → ...ran/gitopsztp/internal/tsparams/consts.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
0 .../cnf/ran/ztp/internal/tsparams/ztpvars.go → ...an/gitopsztp/internal/tsparams/ztpvars.go
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions ...s/cnf/ran/ztp/tests/ztp-argocd-acm-crs.go → ...ran/gitopsztp/tests/ztp-argocd-acm-crs.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
4 changes: 2 additions & 2 deletions .../ran/ztp/tests/ztp-argocd-clusters-app.go → ...itopsztp/tests/ztp-argocd-clusters-app.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
4 changes: 2 additions & 2 deletions ...an/ztp/tests/ztp-argocd-hub-templating.go → ...opsztp/tests/ztp-argocd-hub-templating.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
4 changes: 2 additions & 2 deletions ...f/ran/ztp/tests/ztp-argocd-node-delete.go → ...gitopsztp/tests/ztp-argocd-node-delete.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
4 changes: 2 additions & 2 deletions .../ran/ztp/tests/ztp-argocd-policies-app.go → ...itopsztp/tests/ztp-argocd-policies-app.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion tests/cnf/ran/ztp/tests/ztp-generator.go → .../cnf/ran/gitopsztp/tests/ztp-generator.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion ...s/cnf/ran/ztp/tests/ztp-machine-config.go → ...ran/gitopsztp/tests/ztp-machine-config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion tests/cnf/ran/ztp/tests/ztp-spoke-checker.go → .../ran/gitopsztp/tests/ztp-spoke-checker.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
6 changes: 3 additions & 3 deletions tests/cnf/ran/ztp/ztp_suite_test.go → tests/cnf/ran/gitopsztp/ztp_suite_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down

0 comments on commit 29f3a4d

Please sign in to comment.