Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update claim package, renamed #899

Merged
merged 2 commits into from
Sep 4, 2024
Merged

Update claim package, renamed #899

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be974d2
Update claim package, renamed
bnshr Aug 30, 2024
f41a8d8
Change the namespace fromc cert-suite to certsuite
bnshr Sep 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ require (
github.com/openshift/client-go v0.0.0-20240528061634-b054aa794d87
github.com/operator-framework/api v0.27.0
github.com/operator-framework/operator-lifecycle-manager v0.22.0
github.com/redhat-best-practices-for-k8s/certsuite-claim v1.0.46
github.com/redhat-best-practices-for-k8s/certsuite-claim v1.0.47
github.com/redhat-best-practices-for-k8s/oct v0.0.20
github.com/sirupsen/logrus v1.9.3
github.com/stretchr/testify v1.9.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,8 +277,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
github.com/redhat-best-practices-for-k8s/certsuite-claim v1.0.46 h1:FIMxVB4qGIDIuvQ/oKgbMZoKqC2j6H9vorSGjcL441c=
github.com/redhat-best-practices-for-k8s/certsuite-claim v1.0.46/go.mod h1:zl22noTFxcP05POwr1aMNa13j4M1Fitq8TsxLrw/mJE=
github.com/redhat-best-practices-for-k8s/certsuite-claim v1.0.47 h1:xAOVi+7YXBJNBsZeezAWWCHx84IU6AWIw53BT9tATas=
github.com/redhat-best-practices-for-k8s/certsuite-claim v1.0.47/go.mod h1:zl22noTFxcP05POwr1aMNa13j4M1Fitq8TsxLrw/mJE=
github.com/redhat-best-practices-for-k8s/oct v0.0.20 h1:u2HhR6ilkHYVf1TaHaFstMz5AxnalmhvQ5gcKwO6058=
github.com/redhat-best-practices-for-k8s/oct v0.0.20/go.mod h1:BMcFp+p6SMrtjmkrl+eedhlaHZp1O7ZGuvs2TWhNrJI=
github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
Expand Down
2 changes: 1 addition & 1 deletion scripts/delete-namespaces.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ if ! command -v oc &>/dev/null; then
exit 0
fi

NAMESPACE_STRINGS_TO_GREP=(accesscontrol ac-test ac-rq-test my-ns affiliated lifecycle-tests manageability networking net-tests observability operator-ns performance platform-alteration cnf-suite)
NAMESPACE_STRINGS_TO_GREP=(accesscontrol ac-test ac-rq-test my-ns affiliated lifecycle-tests manageability networking net-tests observability operator-ns performance platform-alteration cnfsuite)
bnshr marked this conversation as resolved.
Show resolved Hide resolved

for NS in "${NAMESPACE_STRINGS_TO_GREP[@]}"; do
for NAMESPACE in $(oc get namespaces | grep "$NS" | awk '{print $1}'); do
Expand Down
4 changes: 2 additions & 2 deletions tests/globalhelper/helper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ func ValidateIfReportsAreValid(tcName string, tcExpectedStatus string, reportDir
return nil
}

// DefineCertsuiteConfig creates tnf_config.yml file under certsuite config directory.
// DefineCertsuiteConfig creates certsuite_config.yml file under certsuite config directory.
func DefineCertsuiteConfig(namespaces []string, targetPodLabels []string, targetOperatorLabels []string,
certifiedContainerInfo []string, crdFilters []string, configDir string) error {
certsuiteConfigFilePath := path.Join(configDir, globalparameters.DefaultCertsuiteConfigFileName)
Expand Down Expand Up @@ -151,7 +151,7 @@ func AppendContainersToDeployment(deployment *appsv1.Deployment, containersNum i

func defineCertifiedContainersInfo(config *globalparameters.CertsuiteConfig, certifiedContainerInfo []string) error {
if len(certifiedContainerInfo) < 1 {
// do not add certifiedcontainerinfo to tnf_config at all in this case
// do not add certifiedcontainerinfo to certsuite_config at all in this case
return nil
}

Expand Down
2 changes: 1 addition & 1 deletion tests/globalhelper/runhelper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ func launchTestsViaImage(testCaseName string, tcNameForReport string, reportDir
"run",
"--kubeconfig", "/usr/certsuite/kubeconfig/config",
"--preflight-dockerconfig", "/usr/certsuite/dockerconfig/config",
"--config-file", "/usr/certsuite/config/tnf_config.yml",
"--config-file", "/usr/certsuite/config/certsuite_config.yml",
"--output-dir", "/usr/certsuite/results",
"--omit-artifacts-zip-file", "true",
"--enable-data-collection", "true",
Expand Down
2 changes: 1 addition & 1 deletion tests/globalparameters/globalparameters.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ type (

var (
DefaultClaimFileName = "claim.json"
DefaultCertsuiteConfigFileName = "tnf_config.yml"
DefaultCertsuiteConfigFileName = "certsuite_config.yml"
DefaultJunitReportName = "cnf-certification-tests_junit.xml"
PartnerNamespaceEnvVarName = "CERTSUITE_PARTNER_NAMESPACE"
TestCasePassed = "passed"
Expand Down
Loading
Loading