CNF-15235: cnf-tests: move to rhel 9 #2139

Tal-or · 2024-12-30T17:23:07Z

move all builder to rhel9
move cnf-tests image to rhel9
replace libhugetlbfs ,which is not present in rhel9, with a local tool for allocating hugepages (more details in the commits)

Signed-off-by: Talor Itzhak [email protected]

openshift-ci · 2024-12-30T17:23:18Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: Tal-or
Once this PR has been reviewed and has the lgtm label, please assign yuvalk for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

openshift-ci-robot · 2024-12-30T17:26:33Z

@Tal-or: This pull request references CNF-15235 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.19.0" version, but no target version was set.

In response to this:

move all builder to rhel9

move cnf-tests image to rhel9

replace libhugetlbfs ,which is not present in rhel9, with a local tool for allocating hugepages (more details in the commits)

Signed-off-by: Talor Itzhak [email protected]

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 openshift-eng/jira-lifecycle-plugin repository.

Tal-or · 2024-12-30T17:26:41Z

/cc @SchSeba @yanirq

Tal-or · 2024-12-30T17:28:10Z

More work is needed in https://github.com/openshift/release/blob/master/ci-operator/config/openshift-kni/cnf-features-deploy/openshift-kni-cnf-features-deploy-master.yaml
and on d/s side

yanirq · 2024-12-30T18:25:53Z

cnf-tests/Dockerfile

+WORKDIR $TOOL_PATH
+
+RUN go build -mod=vendor -o /hugepages-allocator
+
 # build latency-test's runner binaries
 FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.22-openshift-4.18 AS builder-latency-test-runners


are we keeping this as rhel8 ?

Nope. my bad

Actually yes, this is the standard Dockerfile not the Dockerfile.openshift I wasn't sure whether we want to change images here as well, because the cnf-tests image is centos7 based

I must say I am not sure who use this file but if you can please update everything to rhel 9 base.

I don't think this dockerfile really work as we build stuff on rhel 8 and 9 but put everything inside a centos7 image...

SchSeba

nice work!!!

I left a few comments :)

SchSeba · 2024-12-31T09:47:39Z

cnf-tests/Dockerfile

+WORKDIR $TOOL_PATH
+
+RUN go build -mod=vendor -o /hugepages-allocator
+
 # build latency-test's runner binaries
 FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.22-openshift-4.18 AS builder-latency-test-runners


I must say I am not sure who use this file but if you can please update everything to rhel 9 base.

I don't think this dockerfile really work as we build stuff on rhel 8 and 9 but put everything inside a centos7 image...

cnf-tests/Dockerfile.openshift

cnf-tests/pod-utils/hugepages-allocator/main.go

Signed-off-by: Talor Itzhak <[email protected]>

Align oc binary and pull it from ocp 4.19 Signed-off-by: Talor Itzhak <[email protected]>

Signed-off-by: Talor Itzhak <[email protected]>

The `libhugetlbfs` is not available on rhel-9 Signed-off-by: Talor Itzhak <[email protected]>

Some of the tests running under cnf-tests are using the `libhugetlbfs` for allocating hugepages. `libhugetlbfs` has been removed from rhel9, so instead we introduce a small program named hugepages-allocator that will be used by the tests for hugepages allocations. The program built like any other tool we already have in cnf-tests and the binary delivered as part of the final image. Signed-off-by: Talor Itzhak <[email protected]>

Same tests are runnning for both images so we should have the tool in both images to be able to run the same tests. Signed-off-by: Talor Itzhak <[email protected]>

Align `Dockerfile` with `Dockerfile.openshift` and use the same builder images based on rhel9 Signed-off-by: Talor Itzhak <[email protected]>

Change the test to use the tool instead of libhugetlbfs library Signed-off-by: Talor Itzhak <[email protected]>

Tal-or · 2025-01-01T12:55:42Z

related to #openshift/release#60244

SchSeba

lgtm just a small change in the regular dockerfile :)

SchSeba · 2025-01-01T14:23:29Z

cnf-tests/Dockerfile

@@ -59,7 +73,7 @@ RUN yum install -y numactl-devel make gcc && \
    cp hwlatdetect /hwlatdetect && \
    cp cyclictest /cyclictest

-FROM quay.io/openshift/origin-oc-rpms:4.16 AS oc
+FROM quay.io/openshift/origin-oc-rpms:4.19 AS oc

 # Final image
 FROM centos:7


I think you need to update this one also

It was on purpose actually, if we're changing to rhel9 then both Dockerfile and Dockerfile.openshift are identical. So one can be deleted

Tal-or · 2025-01-01T15:04:00Z

/retest

Tal-or · 2025-01-01T22:11:50Z

/retest

zeeke · 2025-01-02T09:52:38Z

Can you please update also:

cnf-features-deploy/cnf-tests/mirror/images.json

Line 4 in 089d5f9

"image": "cnf-tests:4.16"
cnf-features-deploy/cnf-tests/testsuites/pkg/images/images.go

Line 32 in 089d5f9

cnfTestsImage = "cnf-tests:4.16"

These defaults are needed to use this PR's changes during tests.

Also, it should fix the test:

CNF Features e2e integration tests: [It] [tuningcni] tuningcni over macvlan should be able to create pod with sysctls over macvlan

as if flakes because of the cnf-tests image size. See

cnf-tests: Reduce size of cnf-tests image #2114

Signed-off-by: Talor Itzhak <[email protected]>

zeeke · 2025-01-02T17:44:03Z

/retest

SchSeba · 2025-01-05T08:43:40Z

/retest

Tal-or · 2025-01-05T12:45:34Z

  > Enter [It] should be able to create pod with bond interface over macvlan interfaces - /go/src/github.com/openshift-kni/cnf-features-deploy/cnf-tests/testsuites/e2esuite/bond/bond.go:36 @ 01/05/25 10:58:16.77
  [FAILED] Unexpected error:
      <wait.errInterrupted>: 
      timed out waiting for the condition
      {
          cause: <*errors.errorString | 0xc000110730>{
              s: "timed out waiting for the condition",
          },
      }
  occurred

Tal-or · 2025-01-05T16:49:37Z

/retest

openshift-ci · 2025-01-05T20:27:50Z

@Tal-or: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
ci/prow/e2e-aws-ci-tests	`3303b48`	link	true	`/test e2e-aws-ci-tests`

Full PR test history. Your PR dashboard.

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-sigs/prow repository. I understand the commands that are listed here.

Tal-or · 2025-01-06T10:13:58Z

depends on: openshift/release#60333

openshift-ci bot requested review from bartwensley and ffromani December 30, 2024 17:23

Tal-or changed the title ~~cnf-tests: move to rhel 9~~ CNF-15235: cnf-tests: move to rhel 9 Dec 30, 2024

openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Dec 30, 2024

openshift-ci bot requested review from SchSeba and yanirq December 30, 2024 17:26

yanirq reviewed Dec 30, 2024

View reviewed changes

SchSeba reviewed Dec 31, 2024

View reviewed changes

Tal-or added 8 commits January 1, 2025 10:43

cnf-tests:ocp:dockerfile: use rhel-9-golang builders

61ff80f

Signed-off-by: Talor Itzhak <[email protected]>

cnf-tests:ocp:dockerfile: use oc-rpms from 4.19

b08ae08

Align oc binary and pull it from ocp 4.19 Signed-off-by: Talor Itzhak <[email protected]>

cnf-tests:ocp:dockerfile: use rhel-9 as cnf-tests base image

0165d5e

Signed-off-by: Talor Itzhak <[email protected]>

cnf-tests:ocp:dockerfile: remove libhugetlbfs package

963727b

The `libhugetlbfs` is not available on rhel-9 Signed-off-by: Talor Itzhak <[email protected]>

cnf-tests:dockerfile: add hugepages-allocator to Dockerfile as well

f497b24

Same tests are runnning for both images so we should have the tool in both images to be able to run the same tests. Signed-off-by: Talor Itzhak <[email protected]>

cnf-tests:dockerfile: use rhel9 builders

8215d2d

Align `Dockerfile` with `Dockerfile.openshift` and use the same builder images based on rhel9 Signed-off-by: Talor Itzhak <[email protected]>

cnf-tests: change test to use hugepages-allocator

b8df9f2

Change the test to use the tool instead of libhugetlbfs library Signed-off-by: Talor Itzhak <[email protected]>

Tal-or force-pushed the hpallocator branch from 5618cda to b8df9f2 Compare January 1, 2025 12:54

SchSeba reviewed Jan 1, 2025

View reviewed changes

Tal-or mentioned this pull request Jan 1, 2025

cnf-features-deploy: set master to 4.19 openshift/release#60244

Open

cnf-tests: bump cnf-tests images -> 4.19

3303b48

Signed-off-by: Talor Itzhak <[email protected]>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

CNF-15235: cnf-tests: move to rhel 9 #2139

CNF-15235: cnf-tests: move to rhel 9 #2139

Tal-or commented Dec 30, 2024 •

edited

Loading

openshift-ci bot commented Dec 30, 2024

openshift-ci-robot commented Dec 30, 2024

Tal-or commented Dec 30, 2024

Tal-or commented Dec 30, 2024

yanirq Dec 30, 2024

Tal-or Dec 30, 2024

Tal-or Dec 31, 2024

SchSeba Dec 31, 2024

Tal-or Jan 1, 2025

SchSeba left a comment

SchSeba Dec 31, 2024

Tal-or commented Jan 1, 2025

SchSeba left a comment

SchSeba Jan 1, 2025

Tal-or Jan 1, 2025

Tal-or commented Jan 1, 2025

Tal-or commented Jan 1, 2025

zeeke commented Jan 2, 2025

zeeke commented Jan 2, 2025

SchSeba commented Jan 5, 2025

Tal-or commented Jan 5, 2025

Tal-or commented Jan 5, 2025

openshift-ci bot commented Jan 5, 2025

Tal-or commented Jan 6, 2025

CNF-15235: cnf-tests: move to rhel 9 #2139

Are you sure you want to change the base?

CNF-15235: cnf-tests: move to rhel 9 #2139

Conversation

Tal-or commented Dec 30, 2024 • edited Loading

openshift-ci bot commented Dec 30, 2024

openshift-ci-robot commented Dec 30, 2024

Tal-or commented Dec 30, 2024

Tal-or commented Dec 30, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

SchSeba left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Tal-or commented Jan 1, 2025

SchSeba left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Tal-or commented Jan 1, 2025

Tal-or commented Jan 1, 2025

zeeke commented Jan 2, 2025

zeeke commented Jan 2, 2025

SchSeba commented Jan 5, 2025

Tal-or commented Jan 5, 2025

Tal-or commented Jan 5, 2025

openshift-ci bot commented Jan 5, 2025

Tal-or commented Jan 6, 2025

Tal-or commented Dec 30, 2024 •

edited

Loading