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

Add operator version #1707

Closed
wants to merge 4 commits into from
Closed

Add operator version #1707

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
112052a
Add operator version dummy
rdavid Dec 6, 2023
78c96bf
Bump actions/setup-go from 4 to 5 (#1700)
dependabot[bot] Dec 6, 2023
2a445a1
Update RHCOS to OCP version map (#1705)
github-actions[bot] Dec 8, 2023
19791b4
Add operators versions
rdavid Dec 10, 2023
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 .github/workflows/codeql-analysis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
uses: actions/checkout@v4

- name: Set up Go 1.21
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version: 1.21.5

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/merge.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
steps:

- name: Set up Go 1.21
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version: 1.21.5

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/pre-main.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:

steps:
- name: Set up Go 1.21
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version: 1.21.5

Expand Down Expand Up @@ -111,7 +111,7 @@ jobs:

steps:
- name: Set up Go 1.21
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version: 1.21.5

Expand Down Expand Up @@ -177,7 +177,7 @@ jobs:
echo '{ "auths": {} }' >> ${PFLT_DOCKERCONFIG}

- name: Set up Go 1.21
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version: 1.21.5

Expand Down Expand Up @@ -332,7 +332,7 @@ jobs:

# needed by depends-on-action
- name: Set up Go 1.21
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version: 1.21.5

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/preflight.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- uses: actions/checkout@v4

- name: Set up Go 1.21
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version: 1.21.5

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-rhcos-mapping.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
run: make update-rhcos-versions

- name: Set up Go 1.21
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version: 1.21.5

Expand Down
12 changes: 11 additions & 1 deletion cmd/tnf/claim/show/csv/csv.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ func buildCSV(claimScheme *claim.Schema, cnfType string, catalogMap map[string]c
// add header if flag is present (defaults to no header)
if addHeaderFlag {
resultsCSVRecords = append(resultsCSVRecords, []string{
"CNFName", "testID", "Suite",
"CNFName", "OperatorVersion", "testID", "Suite",
"Description", "State",
"StartTime", "EndTime",
"FailureReason", "Output",
Expand All @@ -152,12 +152,22 @@ func buildCSV(claimScheme *claim.Schema, cnfType string, catalogMap map[string]c
})
}

opVers := ""
for i, op := range claimScheme.Claim.Configurations.TestOperators {
if i == 0 {
opVers = op.Version
} else {
opVers = opVers + ", " + op.Version
}
}

for testID := range claimScheme.Claim.Results {
// initialize record
record := []string{}
// creates and appends new CSV record
record = append(record,
CNFNameFlag,
opVers,
testID,
claimScheme.Claim.Results[testID].TestID.Suite,
claimScheme.Claim.Results[testID].CatalogInfo.Description,
Expand Down
7 changes: 7 additions & 0 deletions cmd/tnf/pkg/claim/claim.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,16 @@
CsiDriver interface{} `json:"csiDriver"`
}

type TestOperator struct {
Name string `json:"name"`

Check failure on line 67 in cmd/tnf/pkg/claim/claim.go

View workflow job for this annotation

GitHub Actions / Run Linters and Vet 

File is not `gofmt`-ed with `-s` (gofmt)
Namespace string `json:"namespace"`
Version string `json:"version"`
}

type Configurations struct {
Config interface{} `json:"Config"`
AbnormalEvents []interface{} `json:"AbnormalEvents"`
TestOperators []TestOperator `json:"testOperators"`
}

type Schema struct {
Expand Down
3 changes: 3 additions & 0 deletions cnf-certification-test/platform/operatingsystem/files/rhcos_version_map
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@
4.11.52 / 411.86.202310140407-0
4.11.53 / 411.86.202310261237-0
4.11.54 / 411.86.202311221858-0
4.11.55 / 411.86.202311302109-0
4.11.6 / 411.86.202209211811-0
4.11.7 / 411.86.202209211811-0
4.11.8 / 411.86.202210032349-0
Expand Down Expand Up @@ -227,6 +228,7 @@
4.13.23 / 413.92.202311151359-0
4.13.24 / 413.92.202311212041-0
4.13.25 / 413.92.202311281619-0
4.13.26 / 413.92.202312042340-0
4.13.3 / 413.92.202306070210-0
4.13.4 / 413.92.202306141213-0
4.13.5 / 413.92.202307140015-0
Expand All @@ -253,6 +255,7 @@
4.14.3 / 414.92.202311150705-0
4.14.4 / 414.92.202311222314-0
4.14.5 / 414.92.202311281318-0
4.14.6 / 414.92.202312011602-0
4.4.0 / 44.81.202004260825-0
4.4.0-rc.0 / 44.81.202003110830-0
4.4.0-rc.1 / 44.81.202003130330-0
Expand Down
Loading