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.

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

OCPBUGS-11932: Disable checks for Open vSwitch on NSX cluster #10737

Merged
merged 3 commits into from
Dec 1, 2023

Conversation

Vincent056
Copy link
Contributor

This PR makes open vSwitch rules only be checked with SDN and OVN network type

@github-actions
Copy link

Start a new ephemeral environment with changes proposed in this pull request:

Fedora Environment
Open in Gitpod

Oracle Linux 8 Environment
Open in Gitpod

@Mab879 Mab879 added this to the 0.1.69 milestone Jun 20, 2023
@Mab879 Mab879 added the OpenShift OpenShift product related. label Jun 20, 2023
@jhrozek
Copy link
Collaborator

jhrozek commented Jul 6, 2023

/test help

@openshift-ci
Copy link

openshift-ci bot commented Jul 6, 2023

@jhrozek: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

  • /test e2e-aws-ocp4-cis
  • /test e2e-aws-ocp4-cis-node
  • /test e2e-aws-ocp4-e8
  • /test e2e-aws-ocp4-high
  • /test e2e-aws-ocp4-high-node
  • /test e2e-aws-ocp4-moderate
  • /test e2e-aws-ocp4-moderate-node
  • /test e2e-aws-ocp4-pci-dss
  • /test e2e-aws-ocp4-pci-dss-node
  • /test e2e-aws-ocp4-stig
  • /test e2e-aws-ocp4-stig-node
  • /test e2e-aws-rhcos4-e8
  • /test e2e-aws-rhcos4-high
  • /test e2e-aws-rhcos4-moderate
  • /test e2e-aws-rhcos4-stig
  • /test images

Use /test all to run the following jobs that were automatically triggered:

  • pull-ci-ComplianceAsCode-content-master-images

In response to this:

/test help

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@jhrozek
Copy link
Collaborator

jhrozek commented Jul 6, 2023

/test e2e-aws-ocp4-cis
/test e2e-aws-ocp4-cis-node

@jhrozek
Copy link
Collaborator

jhrozek commented Jul 6, 2023

@Vincent056 there seems to be an issue and the tests are not passing:

    helpers.go:815: E2E-FAILURE: The expected result for the file_permissions_ovs_conf_db rule didn't match. Expected 'PASS', Got 'NOT-APPLICABLE'
    helpers.go:808: Result - Name: e2e-cis-node-master-file-permissions-ovs-conf-db-lock - Status: NOT-APPLICABLE - Severity: medium
    helpers.go:815: E2E-FAILURE: The expected result for the file_permissions_ovs_conf_db_lock rule didn't match. Expected 'PASS', Got 'NOT-APPLICABLE'
    helpers.go:808: Result - Name: e2e-cis-node-master-file-permissions-ovs-pid - Status: NOT-APPLICABLE - Severity: medium
    helpers.go:815: E2E-FAILURE: The expected result for the file_permissions_ovs_pid rule didn't match. Expected 'PASS', Got 'NOT-APPLICABLE'
    helpers.go:808: Result - Name: e2e-cis-node-master-file-permissions-ovs-sys-id-conf - Status: NOT-APPLICABLE - Severity: medium
    helpers.go:815: E2E-FAILURE: The expected result for the file_permissions_ovs_sys_id_conf rule didn't match. Expected 'PASS', Got 'NOT-APPLICABLE'
    helpers.go:808: Result - Name: e2e-cis-node-master-file-permissions-ovs-vswitchd-pid - Status: NOT-APPLICABLE - Severity: medium
    helpers.go:815: E2E-FAILURE: The expected result for the file_permissions_ovs_vswitchd_pid rule didn't match. Expected 'PASS', Got 'NOT-APPLICABLE'
    helpers.go:808: Result - Name: e2e-cis-node-master-file-permissions-ovsdb-server-pid - Status: NOT-APPLICABLE - Severity: medium
    helpers.go:815: E2E-FAILURE: The expected result for the file_permissions_ovsdb_server_pid rule didn't match. Expected 'PASS', Got 'NOT-APPLICABLE'
    helpers.go:808: Result - Name: e2e-cis-node-master-file-permissions-scheduler - Status: PASS - Severity: medium
    helpers.go:881: Rule file_permissions_scheduler matched expected result

@vojtapolasek vojtapolasek modified the milestones: 0.1.69, 0.1.70 Jul 18, 2023
@jan-cerny
Copy link
Collaborator

@Vincent056 What are your plans?
@yuumasato Do you want to take this one?

@Vincent056
Copy link
Contributor Author

file_permissions_ovs_vswitchd_pid

sorry for the delay, I will clean it up and update this PR

@Mab879 Mab879 modified the milestones: 0.1.70, 0.1.71 Oct 2, 2023
@jan-cerny
Copy link
Collaborator

I'm closing this PR because of no activity for more than 30 days. If you still plan to work on this, feel free to reopen it.

@jan-cerny jan-cerny closed this Oct 10, 2023
@mrobson
Copy link

mrobson commented Oct 27, 2023

/reopen

@rhmdnd rhmdnd reopened this Nov 16, 2023
@rhmdnd
Copy link
Collaborator

rhmdnd commented Nov 16, 2023

I'm taking a look at this tomorrow and reopening to get a fresh test run.

@rhmdnd
Copy link
Collaborator

rhmdnd commented Nov 17, 2023

Making the following changes should get tests in better shape:

diff --git a/applications/openshift/master/file_permissions_ovs_conf_db/tests/ocp4/e2e.yml b/applications/openshift/master/file_permissions_ovs_conf_db/tests/ocp4/e2e.yml
index b49fd368b9..8878bb5724 100644
--- a/applications/openshift/master/file_permissions_ovs_conf_db/tests/ocp4/e2e.yml
+++ b/applications/openshift/master/file_permissions_ovs_conf_db/tests/ocp4/e2e.yml
@@ -1,2 +1,2 @@
 ---
-default_result: PASS
+default_result: NOT-APPLICABLE
diff --git a/applications/openshift/master/file_permissions_ovs_conf_db_lock/tests/ocp4/e2e.yml b/applications/openshift/master/file_permissions_ovs_conf_db_lock/tests/ocp4/e2e.yml
index b49fd368b9..8878bb5724 100644
--- a/applications/openshift/master/file_permissions_ovs_conf_db_lock/tests/ocp4/e2e.yml
+++ b/applications/openshift/master/file_permissions_ovs_conf_db_lock/tests/ocp4/e2e.yml
@@ -1,2 +1,2 @@
 ---
-default_result: PASS
+default_result: NOT-APPLICABLE
diff --git a/applications/openshift/master/file_permissions_ovs_pid/tests/ocp4/e2e.yml b/applications/openshift/master/file_permissions_ovs_pid/tests/ocp4/e2e.yml
index b49fd368b9..8878bb5724 100644
--- a/applications/openshift/master/file_permissions_ovs_pid/tests/ocp4/e2e.yml
+++ b/applications/openshift/master/file_permissions_ovs_pid/tests/ocp4/e2e.yml
@@ -1,2 +1,2 @@
 ---
-default_result: PASS
+default_result: NOT-APPLICABLE
diff --git a/applications/openshift/master/file_permissions_ovs_sys_id_conf/tests/ocp4/e2e.yml b/applications/openshift/master/file_permissions_ovs_sys_id_conf/tests/ocp4/e2e.yml
index b49fd368b9..8878bb5724 100644
--- a/applications/openshift/master/file_permissions_ovs_sys_id_conf/tests/ocp4/e2e.yml
+++ b/applications/openshift/master/file_permissions_ovs_sys_id_conf/tests/ocp4/e2e.yml
@@ -1,2 +1,2 @@
 ---
-default_result: PASS
+default_result: NOT-APPLICABLE
diff --git a/applications/openshift/master/file_permissions_ovs_vswitchd_pid/tests/ocp4/e2e.yml b/applications/openshift/master/file_permissions_ovs_vswitchd_pid/tests/ocp4/e2e.yml
index b49fd368b9..8878bb5724 100644
--- a/applications/openshift/master/file_permissions_ovs_vswitchd_pid/tests/ocp4/e2e.yml
+++ b/applications/openshift/master/file_permissions_ovs_vswitchd_pid/tests/ocp4/e2e.yml
@@ -1,2 +1,2 @@
 ---
-default_result: PASS
+default_result: NOT-APPLICABLE
diff --git a/applications/openshift/master/file_permissions_ovsdb_server_pid/tests/ocp4/e2e.yml b/applications/openshift/master/file_permissions_ovsdb_server_pid/tests/ocp4/e2e.yml
index b49fd368b9..8878bb5724 100644
--- a/applications/openshift/master/file_permissions_ovsdb_server_pid/tests/ocp4/e2e.yml
+++ b/applications/openshift/master/file_permissions_ovsdb_server_pid/tests/ocp4/e2e.yml
@@ -1,2 +1,2 @@
 ---
-default_result: PASS
+default_result: NOT-APPLICABLE

@rhmdnd
Copy link
Collaborator

rhmdnd commented Nov 17, 2023

/test e2e-aws-ocp4-cis
/test e2e-aws-ocp4-cis-node

Vincent056 and others added 2 commits November 19, 2023 22:30
This PR make open vSwitch rules only be check with SDN and OVN network type
Default CI clusters don't have OVS configured, so we're excluding those
rules. This commit updates the expected e2e outcomes for those rules so
they're consistent with what the rule actually does.
@Vincent056
Copy link
Contributor Author

rebased the branch

@Vincent056
Copy link
Contributor Author

/test e2e-aws-ocp4-cis
/test e2e-aws-ocp4-cis-node

@rhmdnd
Copy link
Collaborator

rhmdnd commented Nov 20, 2023

The test failures are unrelated to this patch - ComplianceAsCode/compliance-operator#477

Working on a separate fix in the compliance operator to get things working again.

@rhmdnd
Copy link
Collaborator

rhmdnd commented Nov 21, 2023

/test e2e-aws-ocp4-cis
/test e2e-aws-ocp4-cis-node

@vojtapolasek vojtapolasek modified the milestones: 0.1.71, 0.1.72 Nov 28, 2023
@Vincent056
Copy link
Contributor Author

/test e2e-aws-ocp4-cis
/test e2e-aws-ocp4-cis-node

1 similar comment
@Vincent056
Copy link
Contributor Author

/test e2e-aws-ocp4-cis
/test e2e-aws-ocp4-cis-node

Default CI clusters don't have OVS configured, so we're excluding those
rules. This commit updates the expected e2e outcomes for those rules so
they're consistent with what the rule actually does.
@Vincent056
Copy link
Contributor Author

/test e2e-aws-ocp4-cis
/test e2e-aws-ocp4-cis-node

Copy link

codeclimate bot commented Dec 1, 2023

Code Climate has analyzed commit 570be68 and detected 0 issues on this pull request.

The test coverage on the diff in this pull request is 100.0% (50% is the threshold).

This pull request will bring the total coverage in the repository to 58.5%.

View more on Code Climate.

Copy link
Collaborator

@rhmdnd rhmdnd left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@rhmdnd rhmdnd merged commit ec1aac1 into ComplianceAsCode:master Dec 1, 2023
40 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
OpenShift OpenShift product related.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants