Skip to content

Commit a2e881a

Browse files
authored
1 parent 6829889 commit a2e881a

File tree

11 files changed

+21
-23
lines changed

11 files changed

+21
-23
lines changed

.github/workflows/pre-main.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ jobs:
300300
with:
301301
token: ${{ secrets.GITHUB_TOKEN }}
302302

303-
- name: Build the `cnf-certification-test` image
303+
- name: Build the `certsuite` image
304304
uses: nick-fields/retry@7152eba30c6575329ac0576536151aca5a72780e # v3.0.0
305305
with:
306306
timeout_minutes: 90

.github/workflows/qe-hosted.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ permissions:
1414
env:
1515
QE_REPO: redhat-best-practices-for-k8s/certsuite-qe
1616
CERTSUITE_IMAGE_NAME: quay.io/redhat-best-practices-for-k8s/certsuite
17-
CERTSUITE_IMAGE_NAME_LEGACY: quay.io/redhat-best-practices-for-k8s/redhat-best-practices-for-k8s-certsuite
1817
TEST_CERTSUITE_IMAGE_TAG: localtest
1918
CERTSUITE_CONFIG_DIR: '/tmp/certsuite_config'
2019
CERTSUITE_REPORT_DIR: '/tmp/certsuite_report'
@@ -65,7 +64,6 @@ jobs:
6564
file: ./Dockerfile
6665
tags: |
6766
${{ env.CERTSUITE_IMAGE_NAME }}:${{ env.TEST_CERTSUITE_IMAGE_TAG }}
68-
${{ env.CERTSUITE_IMAGE_NAME_LEGACY }}:${{ env.TEST_CERTSUITE_IMAGE_TAG }}
6967
outputs: type=docker,dest=/tmp/testimage.tar
7068

7169
- name: Store image as artifact

.gitignore

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
bin/
22
catalog.json
33
claim.json
4-
cnf-certification-test/certsuite.log
4+
certsuite/certsuite.log
55
.idea
66
vendor
77
*.test
88
redhat-best-practices-for-k8s_junit.xml
99
cover.out
1010
cover.out.tmp
11-
cnf-certification-test/cnf-certification-tests_junit.xml
12-
cnf-certification-tests_junit.xml
13-
cnftests-junit.xml
11+
certsuite/certsuite-tests_junit.xml
12+
certsuite_junit.xml
13+
certsuitetests-junit.xml
1414
setup_junit.xml
1515
validation_junit.xml
1616
.vscode
1717
jsontest-cli
1818
test-out.json
19-
cnf-certification-test/results.html
19+
certsuite/results.html
2020
redhat-best-practices-for-k8s
21-
cnf-certification-test/claimjson.js
21+
certsuite/claimjson.js
2222

2323
temp/
2424
/certsuite

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ GO_PACKAGES=$(shell go list ./... | grep -v vendor)
2020
REGISTRY_LOCAL?=localhost
2121
REGISTRY?=quay.io
2222
CERTSUITE_IMAGE_NAME?=redhat-best-practices-for-k8s/certsuite
23-
CERTSUITE_IMAGE_NAME_LEGACY?=testnetworkfunction/cnf-certification-test
23+
CERTSUITE_IMAGE_NAME_LEGACY?=testnetworkfunction/certsuite
2424
IMAGE_TAG?=localtest
2525
.PHONY: all clean test build
2626
.PHONY: \
@@ -69,9 +69,9 @@ build-darwin-arm64: results-html
6969

7070
# Cleans up auto-generated and report files
7171
clean:
72-
go clean && rm -f all-releases.txt cover.out claim.json cnf-certification-test/claim.json \
73-
cnf-certification-test/claimjson.js cnf-certification-test/cnf-certification-tests_junit.xml \
74-
cnf-certification-test/results.html jsontest-cli latest-release-tag.txt \
72+
go clean && rm -f all-releases.txt cover.out claim.json certsuite/claim.json \
73+
certsuite/claimjson.js certsuite/certsuites_junit.xml \
74+
certsuite/results.html jsontest-cli latest-release-tag.txt \
7575
release-tag.txt test-out.json certsuite
7676

7777
# Runs configured linters

cmd/certsuite/claim/compare/testdata/claim_access_control.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8373,7 +8373,7 @@
83738373
"duration": 249071,
83748374
"endTime": "2023-09-04 09:19:06.658058151 -0500 CDT m=+36.192982330",
83758375
"failureLineContent": "\t\tginkgo.Skip(\"No role contains rules that apply to at least one CRD under test\")",
8376-
"failureLocation": "/home/greyerof/github/certsuite/cnf-certification-test/accesscontrol/suite.go:933",
8376+
"failureLocation": "/home/greyerof/github/certsuite/certsuite/accesscontrol/suite.go:933",
83778377
"skipReason": "No role contains rules that apply to at least one CRD under test",
83788378
"startTime": "2023-09-04 09:19:06.657809085 -0500 CDT m=+36.192733259",
83798379
"state": "skipped",
@@ -8589,7 +8589,7 @@
85898589
"duration": 300309189,
85908590
"endTime": "2023-09-04 09:18:50.964966148 -0500 CDT m=+20.499890322",
85918591
"failureLineContent": "\t\t\tginkgo.Fail(\"Pod has been found with default service account name.\")",
8592-
"failureLocation": "/home/greyerof/github/certsuite/cnf-certification-test/accesscontrol/suite.go:612",
8592+
"failureLocation": "/home/greyerof/github/certsuite/certsuite/accesscontrol/suite.go:612",
85938593
"skipReason": "Pod has been found with default service account name.",
85948594
"startTime": "2023-09-04 09:18:50.664656954 -0500 CDT m=+20.199581133",
85958595
"state": "failed",

docs/assets/images/demo-certsuite.svg

Lines changed: 1 addition & 1 deletion
Loading

docs/configuration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ To enable this, set:
110110
--create-xml-junit-file true
111111
```
112112

113-
This will create a file named `cnf-certification-test/cnf-certification-tests_junit.xml`.
113+
This will create a file named `certsuite/certsuite-tests_junit.xml`.
114114

115115
#### Enable running container against OpenShift Local
116116

docs/test-output.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ go run cmd/tools/cmd/main.go claim-add --claimfile=claim.json
3131

3232
```json
3333
"results": {
34-
"cnf-certification-tests_junit": {
34+
"certsuite-tests_junit": {
3535
"testsuite": {
3636
"-errors": "0",
3737
"-failures": "2",
@@ -61,7 +61,7 @@ The "20230620-110654" sample prefix means "June-20th 2023, 11:06:54"
6161
This is the content of the tar.gz file:
6262

6363
* claim.json
64-
* cnf-certification-tests_junit.xml (Only if enabled via flag)
64+
* certsuite-tests_junit.xml (Only if enabled via flag)
6565
* claimjson.js
6666
* classification.js
6767
* results.html

docs/test-spec-implementation.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ This section explains the implementation of some test cases so that users can ha
55

66
## [lifecycle-deployment-scaling](https://github.com/redhat-best-practices-for-k8s/certsuite/blob/main/CATALOG.md#lifecycle-deployment-scaling) and [lifecycle-statefulset-scaling](https://github.com/redhat-best-practices-for-k8s/certsuite/blob/main/CATALOG.md#lifecycle-statefulset-scaling)
77

8-
For each discovered deployment in the [target namespaces](https://github.com/redhat-best-practices-for-k8s/certsuite/blob/main/cnf-certification-test/certsuite_config.yml#L1), the test case will try to modify its replica count to check whether pod's can be correctly removed and re-deployed in the cluster.
8+
For each discovered deployment in the [target namespaces](https://github.com/redhat-best-practices-for-k8s/certsuite/blob/main/config/certsuite_config.yml#L1), the test case will try to modify its replica count to check whether pod's can be correctly removed and re-deployed in the cluster.
99

1010
<!-- markdownlint-disable MD033 -->
1111
<img src="../assets/images/tests-flow-charts/lifecycle-deployment-scaling.png"></img>
@@ -19,7 +19,7 @@ As depicted in the image, the way to modify the number of replicas varies depend
1919

2020
## [lifecycle-crd-scaling](https://github.com/redhat-best-practices-for-k8s/certsuite/blob/main/CATALOG.md#lifecycle-crd-scaling)
2121

22-
During the program's startup, an autodiscovery phase is performed where all the CRDs and their existing CRs in the [target namespaces](https://github.com/redhat-best-practices-for-k8s/certsuite/blob/main/cnf-certification-test/certsuite_config.yml#L1) are stored to be tested later. Only CRs whose CRD's suffix matches at least one of the [targetCrdFilters](https://github.com/redhat-best-practices-for-k8s/certsuite/blob/d2b718753f438ec8f33ed8bca5ac60ecf71ef599/cnf-certification-test/certsuite_config.yml#L8) and has an [scale subresource](https://kubernetes.io/docs/tasks/extend-kubernetes/custom-resources/custom-resource-definitions/#scale-subresource) will be selected as test targets.
22+
During the program's startup, an autodiscovery phase is performed where all the CRDs and their existing CRs in the [target namespaces](https://github.com/redhat-best-practices-for-k8s/certsuite/blob/main/config/certsuite_config.yml#L1) are stored to be tested later. Only CRs whose CRD's suffix matches at least one of the [targetCrdFilters](https://github.com/redhat-best-practices-for-k8s/certsuite/blob/main/config/certsuite_config.yml#L9) and has an [scale subresource](https://kubernetes.io/docs/tasks/extend-kubernetes/custom-resources/custom-resource-definitions/#scale-subresource) will be selected as test targets.
2323

2424
For every CR under test, a similar approach to the scaling of deployments and statefulsets is done.
2525

pkg/certsuite/certsuite.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ func LoadChecksDB(labelsExpr string) {
5050
}
5151

5252
const (
53-
junitXMLOutputFileName = "cnf-certification-tests_junit.xml"
53+
junitXMLOutputFileName = "certsuite-tests_junit.xml"
5454
claimFileName = "claim.json"
5555
collectorAppURL = "http://claims-collector.cnf-certifications.sysdeseng.com"
5656
timeoutDefaultvalue = 24 * time.Hour

0 commit comments

Comments
 (0)