Skip to content

Commit

Permalink
Merge pull request #362 from redhatci/tnf_v5.1.3
Browse files Browse the repository at this point in the history
Increase CNF certsuite to use v5.1.3
  • Loading branch information
ramperher authored Jun 28, 2024
2 parents 30e0213 + 87340e9 commit e75c565
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion roles/cnf_cert/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ tnf\_stage | "tests"
tnf\_check\_commit\_sha | false | Flag that allows to check if the tnf image used is based on the same commit SHA than the repository cloned in this role.
test\_network\_function\_repo | https://github.com/test-network-function/cnf-certification-test | Repository to download the tnf code.
test\_network\_function\_src\_dir | undefined | If testing a cnf-certification-test PR, this variable will be injected from test-runner scripts (used in dci-pipeline and dci-openshift-agent projects) to refer to the file path where the code from the PR is placed in the jumphost, so that it can be used in cnf_cert role to build a new tnf container image based on that code
test\_network\_function\_version | v5.1.2 | CNF Cert Suite version downloaded. DCI App Agent supports from v4.4.0 till the latest stable version. HEAD version (in the main branch) can be also used, but it is not guaranteed a complete compatibility with the latest unstable changes.
test\_network\_function\_version | v5.1.3 | CNF Cert Suite version downloaded. DCI App Agent supports from v4.4.0 till the latest stable version. HEAD version (in the main branch) can be also used, but it is not guaranteed a complete compatibility with the latest unstable changes.
test\_network\_function\_project\_name | cnf-certification-test | Directory name to look at on the tnf repo.
tnf\_labels | `"all"` | List of [test suites](https://test-network-function.github.io/cnf-certification-test/test-spec/#available-test-specs) that are executed/skipped using labels. In particular, `tnf_labels` content must follow [these guidelines](https://onsi.github.io/ginkgo/#spec-labels), then dci-openshift-app-agent uses this string to run the tnf container with `-l` argument. Note that, when using labels, apart from using the tnf suite names as labels, you can also use, among others, `common` label to refer to non-Telco tnf suites, `telco` label to include Telco-related tests, `extended` to other Verizon-related tests, `faredge` to Far-Edge tests, and `preflight` to run preflight on tnf. With `all`, you will execute all suites. See the [cnf-certification-test README](https://test-network-function.github.io/cnf-certification-test/test-container/#run-the-tests) for more information, and also, check [CATALOG.md](https://github.com/test-network-function/cnf-certification-test/blob/main/CATALOG.md) to see the list of test suites available with the label that corresponds to each of them.
tnf\_config | tnf_config:<br>&nbsp;&nbsp; - namespace: "{{ dci_openshift_app_ns }}"<br>&nbsp;&nbsp; targetpodlabels: []<br>&nbsp;&nbsp; targetoperatorlabels: []<br>&nbsp;&nbsp; target_crds: []<br> &nbsp;&nbsp; exclude_connectivity_regexp: ""<br> | A complex variable to define the configuration to be applied in CNF Cert Suite.<ul> <li> namespace: Target namespace. </li> <li>targetpodlabels: List of autodiscovery labels to be considered by the CNF Cert Suite for pod testing.</li> <li>targetoperatorlabels: List of auto-discovery labels to be considered by the CNF Cert Suite for operator testing.</li> <li>target_crds: List of CRDs under test in the targeted namespace.</li> <li>exclude_connectivity_regexp: A regexp to exclude containers from the connectivity test (optional).</li> </ul> See [this](../../samples/tnf_test_example) for more details about an example defining this variable.<br> * Testing multiple resources on different namespaces is supported.
Expand Down
4 changes: 2 additions & 2 deletions roles/cnf_cert/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
tnf_stage: "tests"
tnf_check_commit_sha: false
test_network_function_repo: "https://github.com/test-network-function/cnf-certification-test"
test_network_function_version: v5.1.2
test_network_function_version: v5.1.3
test_network_function_project_name: cnf-certification-test
tnf_labels: "all"
# By default, tnf_config takes the dci_openshift_app_ns namespace as it is already created by dci-openshift-app-agent,
Expand All @@ -24,7 +24,7 @@ tnf_image_suffix: "{{ lookup('community.general.random_string', length=16, speci
# Provide feedback for each tnf test launched. Just copy this template in your pipeline file and fill the value for the
# tests you want to provide feedback. You don't need to include the tests that you don't want to provide feedback.
# To insert line breaks, use \\n (you need to escape it). Same for quotes and so on.
# List of tests updated until tnf v5.1.2
# List of tests updated until tnf v5.1.3
tnf_feedback:
access-control-bpf-capability-check: ""
access-control-cluster-role-bindings: ""
Expand Down
4 changes: 2 additions & 2 deletions roles/cnf_cert/tasks/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@
vars:
tnf_partner_repo: "{{ (dci_local_registry | length) | ternary(dci_local_registry, 'quay.io') }}/testnetworkfunction"
support_image: "debug-partner:{{ support_image_version }}"
certsuite_binary: "{{ (test_network_function_version == 'HEAD') | ternary('./certsuite', './cnf-certification-test/certsuite') }}"
container_file_path: "{{ (test_network_function_version == 'HEAD') | ternary('/usr/certsuite', '/usr/tnf') }}"
certsuite_binary: "{{ (test_network_function_version is version('v5.1.3', '>=') or test_network_function_version == 'HEAD') | ternary('./certsuite', './cnf-certification-test/certsuite') }}"
container_file_path: "{{ (test_network_function_version is version('v5.1.3', '>=') or test_network_function_version == 'HEAD') | ternary('/usr/certsuite', '/usr/tnf') }}"
container_command: |
{{ certsuite_binary }} run \
{% if tnf_labels | length > 0 %}
Expand Down

0 comments on commit e75c565

Please sign in to comment.