diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index e9d70f999..f69e274c0 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -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 diff --git a/.github/workflows/merge.yaml b/.github/workflows/merge.yaml index a8793a6df..df63ea946 100644 --- a/.github/workflows/merge.yaml +++ b/.github/workflows/merge.yaml @@ -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 diff --git a/.github/workflows/pre-main.yaml b/.github/workflows/pre-main.yaml index 32b499400..97e2a2600 100644 --- a/.github/workflows/pre-main.yaml +++ b/.github/workflows/pre-main.yaml @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/.github/workflows/preflight.yml b/.github/workflows/preflight.yml index 0d8a68b79..c07d54671 100644 --- a/.github/workflows/preflight.yml +++ b/.github/workflows/preflight.yml @@ -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 diff --git a/.github/workflows/update-rhcos-mapping.yml b/.github/workflows/update-rhcos-mapping.yml index 48c6aa6b9..d8676ce88 100644 --- a/.github/workflows/update-rhcos-mapping.yml +++ b/.github/workflows/update-rhcos-mapping.yml @@ -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 diff --git a/cmd/tnf/claim/show/csv/csv.go b/cmd/tnf/claim/show/csv/csv.go index 5dac6fd50..7128b350d 100644 --- a/cmd/tnf/claim/show/csv/csv.go +++ b/cmd/tnf/claim/show/csv/csv.go @@ -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", @@ -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, diff --git a/cmd/tnf/pkg/claim/claim.go b/cmd/tnf/pkg/claim/claim.go index e8654ef20..e8f3a9a19 100644 --- a/cmd/tnf/pkg/claim/claim.go +++ b/cmd/tnf/pkg/claim/claim.go @@ -63,9 +63,16 @@ type Nodes struct { CsiDriver interface{} `json:"csiDriver"` } +type TestOperator struct { + Name string `json:"name"` + 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 { diff --git a/cnf-certification-test/platform/operatingsystem/files/rhcos_version_map b/cnf-certification-test/platform/operatingsystem/files/rhcos_version_map index a57e76577..ae626e99c 100644 --- a/cnf-certification-test/platform/operatingsystem/files/rhcos_version_map +++ b/cnf-certification-test/platform/operatingsystem/files/rhcos_version_map @@ -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 @@ -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 @@ -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