Skip to content

Commit

Permalink
Merge branch 'main' into port_claim_data_structs_and_handlers
Browse files Browse the repository at this point in the history
  • Loading branch information
jmontesi committed Nov 10, 2023
2 parents e98122f + 4429fa1 commit a97a3c4
Show file tree
Hide file tree
Showing 30 changed files with 857 additions and 70 deletions.
2 changes: 1 addition & 1 deletion .github/actions/setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ runs:
- name: Set up Go 1.21
uses: actions/setup-go@v4
with:
go-version: 1.21.3
go-version: 1.21.4

- name: Disable default go problem matcher
run: echo "::remove-matcher owner=go::"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
- name: Set up Go 1.21
uses: actions/setup-go@v4
with:
go-version: 1.21.3
go-version: 1.21.4

- name: Install ginkgo
run: make install-tools
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/merge.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: Set up Go 1.21
uses: actions/setup-go@v4
with:
go-version: 1.21.3
go-version: 1.21.4

- name: Check out code into the Go module directory
uses: actions/checkout@v4
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/pre-main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
- name: Set up Go 1.21
uses: actions/setup-go@v4
with:
go-version: 1.21.3
go-version: 1.21.4

- name: Disable default go problem matcher
run: echo "::remove-matcher owner=go::"
Expand Down Expand Up @@ -113,7 +113,7 @@ jobs:
- name: Set up Go 1.21
uses: actions/setup-go@v4
with:
go-version: 1.21.3
go-version: 1.21.4

- name: Disable default go problem matcher
run: echo "::remove-matcher owner=go::"
Expand Down Expand Up @@ -179,7 +179,7 @@ jobs:
- name: Set up Go 1.21
uses: actions/setup-go@v4
with:
go-version: 1.21.3
go-version: 1.21.4

- name: Disable default go problem matcher
run: echo "::remove-matcher owner=go::"
Expand Down Expand Up @@ -334,7 +334,7 @@ jobs:
- name: Set up Go 1.21
uses: actions/setup-go@v4
with:
go-version: 1.21.3
go-version: 1.21.4



Expand Down Expand Up @@ -386,12 +386,12 @@ jobs:
run: TNF_LOG_LEVEL=${TNF_SMOKE_TESTS_LOG_LEVEL} ./run-tnf-container.sh ${{ env.TESTING_CMD_PARAMS }}

- name: 'Test: Run Smoke Tests in a TNF container'
run: TNF_LOG_LEVEL=${TNF_SMOKE_TESTS_LOG_LEVEL} TNF_ENABLE_DATA_COLLECTION=true ./run-tnf-container.sh ${{ env.TESTING_CMD_PARAMS }} -l "${SMOKE_TESTS_GINKGO_LABELS_FILTER}"
run: TNF_LOG_LEVEL=${TNF_SMOKE_TESTS_LOG_LEVEL} TNF_ENABLE_DATA_COLLECTION=false ./run-tnf-container.sh ${{ env.TESTING_CMD_PARAMS }} -l "${SMOKE_TESTS_GINKGO_LABELS_FILTER}"

- name: Run sanity check on collector
uses: ./collector/.github/actions/run-sanity-check
with:
working_directory: collector
# - name: Run sanity check on collector
# uses: ./collector/.github/actions/run-sanity-check
# with:
# working_directory: collector

- name: Upload container test results as an artifact
uses: actions/upload-artifact@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/preflight.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- name: Set up Go 1.21
uses: actions/setup-go@v4
with:
go-version: 1.21.3
go-version: 1.21.4

- name: Disable default go problem matcher
run: echo "::remove-matcher owner=go::"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/qe-hosted.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
- name: Set up Go 1.21
uses: actions/setup-go@v4
with:
go-version: 1.21.3
go-version: 1.21.4

- name: Disable default go problem matcher
run: echo "::remove-matcher owner=go::"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: QE OCP Intrusive Testing
name: QE OCP 4.13 Intrusive Testing

on:
# pull_request:
Expand All @@ -11,7 +11,7 @@ env:
QE_REPO: test-network-function/cnfcert-tests-verification

jobs:
qe-ocp-intrusive-testing:
qe-ocp-413-intrusive-testing:
runs-on: qe-ocp
strategy:
fail-fast: false
Expand All @@ -25,6 +25,8 @@ jobs:
TEST_TNF_IMAGE_NAME: quay.io/testnetworkfunction/cnf-certification-test
TEST_TNF_IMAGE_TAG: localtest
DOCKER_CONFIG_DIR: '/home/labuser/.docker'
TNF_CONFIG_DIR: '/home/labuser/tnf_config'
TNF_REPORT_DIR: '/home/labuser/tnf_report'

steps:
- name: Check out code
Expand Down Expand Up @@ -74,5 +76,5 @@ jobs:
GITHUB_REPO: https://github.com/test-network-function/cnf-certification-test
run: |
curl -X POST --data "{
\"text\": \"🚨⚠️ Failed to run intrusive OCP QE tests from commit \<$GITHUB_REPO/commit/$COMMIT_SHA|$COMMIT_SHA\>, job ID \<$GITHUB_REPO/actions/runs/$JOB_RUN_ID/attempts/$JOB_RUN_ATTEMPT|$JOB_RUN_ID\> \"
\"text\": \"🚨⚠️ Failed to run intrusive OCP 4.13 QE tests from commit \<$GITHUB_REPO/commit/$COMMIT_SHA|$COMMIT_SHA\>, job ID \<$GITHUB_REPO/actions/runs/$JOB_RUN_ID/attempts/$JOB_RUN_ATTEMPT|$JOB_RUN_ID\> \"
}" -H 'Content-type: application/json; charset=UTF-8' ${{ secrets.QE_NIGHTLY_WEBHOOK }}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: QE OCP Testing
name: QE OCP 4.13 Testing

on:
# pull_request:
Expand All @@ -11,7 +11,7 @@ env:
QE_REPO: test-network-function/cnfcert-tests-verification

jobs:
qe-ocp-testing:
qe-ocp-413-testing:
runs-on: qe-ocp
strategy:
fail-fast: false
Expand All @@ -24,6 +24,8 @@ jobs:
TEST_TNF_IMAGE_NAME: quay.io/testnetworkfunction/cnf-certification-test
TEST_TNF_IMAGE_TAG: localtest
DOCKER_CONFIG_DIR: '/home/labuser/.docker'
TNF_CONFIG_DIR: '/home/labuser/tnf_config'
TNF_REPORT_DIR: '/home/labuser/tnf_report'

steps:
- name: Check out code
Expand Down Expand Up @@ -73,5 +75,5 @@ jobs:
GITHUB_REPO: https://github.com/test-network-function/cnf-certification-test
run: |
curl -X POST --data "{
\"text\": \"🚨⚠️ Failed to run non-intrusive OCP QE tests from commit \<$GITHUB_REPO/commit/$COMMIT_SHA|$COMMIT_SHA\>, job ID \<$GITHUB_REPO/actions/runs/$JOB_RUN_ID/attempts/$JOB_RUN_ATTEMPT|$JOB_RUN_ID\> \"
\"text\": \"🚨⚠️ Failed to run non-intrusive OCP 4.13 QE tests from commit \<$GITHUB_REPO/commit/$COMMIT_SHA|$COMMIT_SHA\>, job ID \<$GITHUB_REPO/actions/runs/$JOB_RUN_ID/attempts/$JOB_RUN_ATTEMPT|$JOB_RUN_ID\> \"
}" -H 'Content-type: application/json; charset=UTF-8' ${{ secrets.QE_NIGHTLY_WEBHOOK }}
80 changes: 80 additions & 0 deletions .github/workflows/qe-ocp-414-intrusive.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
name: QE OCP 4.14 Intrusive Testing

on:
# pull_request:
# branches: [ main ]
workflow_dispatch:
# Schedule a daily cron at midnight UTC
schedule:
- cron: '0 0 * * *'
env:
QE_REPO: test-network-function/cnfcert-tests-verification

jobs:
qe-ocp-414-intrusive-testing:
runs-on: qe-ocp-414
strategy:
fail-fast: false
matrix:
# Add more suites if more intrusive tests are added to the QE repo
suite: [lifecycle]
env:
SHELL: /bin/bash
KUBECONFIG: '/home/labuser2/.kube/config'
PFLT_DOCKERCONFIG: '/home/labuser2/.docker/config'
TEST_TNF_IMAGE_NAME: quay.io/testnetworkfunction/cnf-certification-test
TEST_TNF_IMAGE_TAG: localtest
DOCKER_CONFIG_DIR: '/home/labuser2/.docker'
TNF_CONFIG_DIR: '/home/labuser2/tnf_config'
TNF_REPORT_DIR: '/home/labuser2/tnf_report'

steps:
- name: Check out code
uses: actions/checkout@v4
with:
ref: ${{ github.sha }}

- name: Run initial setup
uses: ./.github/actions/setup

- name: Preemptively prune docker resources
run: docker system prune -f --volumes

- name: Build the test image
run: make build-image-local # quay.io/testnetworkfunction/cnf-certification-test:localtest

- name: Show pods
run: oc get pods -A

- name: Clone the QE repository
uses: actions/checkout@v4
with:
repository: ${{ env.QE_REPO }}
path: cnfcert-tests-verification

- name: Preemptively potential QE namespaces
run: ./scripts/delete-namespaces.sh
working-directory: cnfcert-tests-verification

- name: Preemptively delete report and config folders
shell: bash
run: |
sudo rm -rf /tmp/tnf_config/
sudo rm -rf /tmp/tnf_report/
# Setup is complete. Time to run the QE tests.
- name: Run the tests
run: FEATURES=${{matrix.suite}} TNF_REPO_PATH=${GITHUB_WORKSPACE} TNF_IMAGE=${{env.TEST_TNF_IMAGE_NAME}} TNF_IMAGE_TAG=${{env.TEST_TNF_IMAGE_TAG}} DISABLE_INTRUSIVE_TESTS=false ENABLE_PARALLEL=false ENABLE_FLAKY_RETRY=true make test-features
working-directory: cnfcert-tests-verification

- name: (if on main and upstream) Send chat msg to dev team if failed to run QE tests
if: ${{ failure() && github.ref == 'refs/heads/main' && github.repository_owner == 'test-network-function' }}
env:
COMMIT_SHA: ${{ github.sha }}
JOB_RUN_ID: ${{ github.run_id }}
JOB_RUN_ATTEMPT: ${{ github.run_attempt }}
GITHUB_REPO: https://github.com/test-network-function/cnf-certification-test
run: |
curl -X POST --data "{
\"text\": \"🚨⚠️ Failed to run intrusive OCP 4.14 QE tests from commit \<$GITHUB_REPO/commit/$COMMIT_SHA|$COMMIT_SHA\>, job ID \<$GITHUB_REPO/actions/runs/$JOB_RUN_ID/attempts/$JOB_RUN_ATTEMPT|$JOB_RUN_ID\> \"
}" -H 'Content-type: application/json; charset=UTF-8' ${{ secrets.QE_NIGHTLY_WEBHOOK }}
79 changes: 79 additions & 0 deletions .github/workflows/qe-ocp-414.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
name: QE OCP 4.14 Testing

on:
# pull_request:
# branches: [ main ]
workflow_dispatch:
# Schedule a daily cron at midnight UTC
schedule:
- cron: '0 0 * * *'
env:
QE_REPO: test-network-function/cnfcert-tests-verification

jobs:
qe-ocp-414-testing:
runs-on: qe-ocp-414
strategy:
fail-fast: false
matrix:
suite: [accesscontrol, affiliatedcertification, manageability, networking, lifecycle, performance, platformalteration, observability, operator]
env:
SHELL: /bin/bash
KUBECONFIG: '/home/labuser2/.kube/config'
PFLT_DOCKERCONFIG: '/home/labuser2/.docker/config'
TEST_TNF_IMAGE_NAME: quay.io/testnetworkfunction/cnf-certification-test
TEST_TNF_IMAGE_TAG: localtest
DOCKER_CONFIG_DIR: '/home/labuser2/.docker'
TNF_CONFIG_DIR: '/home/labuser2/tnf_config'
TNF_REPORT_DIR: '/home/labuser2/tnf_report'

steps:
- name: Check out code
uses: actions/checkout@v4
with:
ref: ${{ github.sha }}

- name: Run initial setup
uses: ./.github/actions/setup

- name: Preemptively prune docker resources
run: docker system prune -f --volumes

- name: Build the test image
run: make build-image-local # quay.io/testnetworkfunction/cnf-certification-test:localtest

- name: Show pods
run: oc get pods -A

- name: Clone the QE repository
uses: actions/checkout@v4
with:
repository: ${{ env.QE_REPO }}
path: cnfcert-tests-verification

- name: Preemptively potential QE namespaces
run: ./scripts/delete-namespaces.sh
working-directory: cnfcert-tests-verification

- name: Preemptively delete report and config folders
shell: bash
run: |
sudo rm -rf /tmp/tnf_config/
sudo rm -rf /tmp/tnf_report/
# Setup is complete. Time to run the QE tests.
- name: Run the tests
run: FEATURES=${{matrix.suite}} TNF_REPO_PATH=${GITHUB_WORKSPACE} TNF_IMAGE=${{env.TEST_TNF_IMAGE_NAME}} TNF_IMAGE_TAG=${{env.TEST_TNF_IMAGE_TAG}} DISABLE_INTRUSIVE_TESTS=true ENABLE_PARALLEL=true ENABLE_FLAKY_RETRY=true make test-features
working-directory: cnfcert-tests-verification

- name: (if on main and upstream) Send chat msg to dev team if failed to run QE tests
if: ${{ failure() && github.ref == 'refs/heads/main' && github.repository_owner == 'test-network-function' }}
env:
COMMIT_SHA: ${{ github.sha }}
JOB_RUN_ID: ${{ github.run_id }}
JOB_RUN_ATTEMPT: ${{ github.run_attempt }}
GITHUB_REPO: https://github.com/test-network-function/cnf-certification-test
run: |
curl -X POST --data "{
\"text\": \"🚨⚠️ Failed to run non-intrusive OCP 4.14 QE tests from commit \<$GITHUB_REPO/commit/$COMMIT_SHA|$COMMIT_SHA\>, job ID \<$GITHUB_REPO/actions/runs/$JOB_RUN_ID/attempts/$JOB_RUN_ATTEMPT|$JOB_RUN_ID\> \"
}" -H 'Content-type: application/json; charset=UTF-8' ${{ secrets.QE_NIGHTLY_WEBHOOK }}
2 changes: 1 addition & 1 deletion .github/workflows/update-rhcos-mapping.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- name: Set up Go 1.21
uses: actions/setup-go@v4
with:
go-version: 1.21.3
go-version: 1.21.4

# This prevents any failures due to the updated rhcos_versions_map file from
# making it into the PR phase.
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ RUN \
# Install Go binary and set the PATH
ENV \
GO_DL_URL=https://golang.org/dl \
GO_BIN_TAR=go1.21.3.linux-amd64.tar.gz \
GO_BIN_TAR=go1.21.4.linux-amd64.tar.gz \
GOPATH=/root/go
ENV GO_BIN_URL_x86_64=${GO_DL_URL}/${GO_BIN_TAR}
RUN \
Expand Down
11 changes: 5 additions & 6 deletions cnf-certification-test/performance/suite.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ package performance

import (
"fmt"
"slices"
"strconv"
"strings"

Expand Down Expand Up @@ -325,13 +326,11 @@ func filterProbeProcesses(allProcesses []*crclient.Process, cut *provider.Contai
}
// remove all exec probes and their children from the process list
for _, p := range allProcesses {
for _, parentProbePid := range execProbeProcesses {
if p.Pid == parentProbePid || p.PPid == parentProbePid {
// skip exec probe processes (child or parent)
continue
}
notExecProbeProcesses = append(notExecProbeProcesses, p)
if slices.Contains(execProbeProcesses, p.Pid) || slices.Contains(execProbeProcesses, p.PPid) {
// this process is part of an exec probe (child or parent), continue
continue
}
notExecProbeProcesses = append(notExecProbeProcesses, p)
}
return notExecProbeProcesses, compliantObjects
}
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,7 @@
4.12.40 / 412.86.202310170023-0
4.12.41 / 412.86.202310210217-0
4.12.42 / 412.86.202310302215-0
4.12.43 / 412.86.202311051457-0
4.12.5 / 412.86.202302170236-0
4.12.6 / 412.86.202302282003-0
4.12.7 / 412.86.202303011010-0
Expand Down
Loading

0 comments on commit a97a3c4

Please sign in to comment.