Skip to content

DAOS-18702 build: Use leap 15.6 for build (2.6 backport) (#17738)#17809

Merged
phender merged 4 commits intorelease/2.6from
grom72/DAOS-18702-2.6
Apr 7, 2026
Merged

DAOS-18702 build: Use leap 15.6 for build (2.6 backport) (#17738)#17809
phender merged 4 commits intorelease/2.6from
grom72/DAOS-18702-2.6

Conversation

@grom72
Copy link
Copy Markdown
Contributor

@grom72 grom72 commented Mar 27, 2026

DAOS-18702 build: Use leap 15.6 for build backport to 2.6 (#17738)

Requires:

The solution requires the lua-lmod version > 8.7.34 available in a repository with the higher priority than OS default one like in example below:

[opensuse-network-cluster-proxy-artifactory]
name=opensuse-$releasever-net-clu-proxy-artifactory
...
priority=1

Steps for the author:

  • Commit message follows the guidelines.
  • Appropriate Features or Test-tag pragmas were used.
  • Appropriate Functional Test Stages were run.
  • At least two positive code reviews including at least one code owner from each category referenced in the PR.
  • Testing is complete. If necessary, forced-landing label added and a reason added in a comment.

After all prior steps are complete:

  • Gatekeeper requested (daos-gatekeeper added as a reviewer).

@grom72 grom72 requested a review from a team as a code owner March 27, 2026 10:16
@grom72 grom72 marked this pull request as draft March 27, 2026 10:16
@github-actions
Copy link
Copy Markdown

github-actions bot commented Mar 27, 2026

Ticket title is 'Upgrade CI environment to use leap 15.6 for build stage.'
Status is 'Awaiting backport'
Job should run at elevated priority (1)
https://daosio.atlassian.net/browse/DAOS-18702

@grom72 grom72 changed the title Grom72/daos 18702 2.6 DAOS-18702 build: Use leap 15.6 for build backport (#17738) Mar 27, 2026
@github-actions github-actions bot added the priority Ticket has high priority (automatically managed) label Mar 27, 2026
@daosbuild3
Copy link
Copy Markdown
Collaborator

@daosbuild3
Copy link
Copy Markdown
Collaborator

@daosbuild3
Copy link
Copy Markdown
Collaborator

@daosbuild3
Copy link
Copy Markdown
Collaborator

@daosbuild3
Copy link
Copy Markdown
Collaborator

@daosbuild3
Copy link
Copy Markdown
Collaborator

@daosbuild3
Copy link
Copy Markdown
Collaborator

Test stage Test RPMs on EL 8.6 completed with status FAILURE. https://jenkins-3.daos.hpc.amslabs.hpecorp.net/job/daos-stack/job/daos/job/PR-17809/2/display/redirect

@daosbuild3
Copy link
Copy Markdown
Collaborator

Test stage Functional on EL 8.8 completed with status FAILURE. https://jenkins-3.daos.hpc.amslabs.hpecorp.net/job/daos-stack/job/daos/job/PR-17809/2/display/redirect

1 similar comment
@daosbuild3
Copy link
Copy Markdown
Collaborator

Test stage Functional on EL 8.8 completed with status FAILURE. https://jenkins-3.daos.hpc.amslabs.hpecorp.net/job/daos-stack/job/daos/job/PR-17809/2/display/redirect

@daosbuild3
Copy link
Copy Markdown
Collaborator

@daosbuild3
Copy link
Copy Markdown
Collaborator

@daosbuild3
Copy link
Copy Markdown
Collaborator

@daosbuild3
Copy link
Copy Markdown
Collaborator

@grom72 grom72 changed the title DAOS-18702 build: Use leap 15.6 for build backport (#17738) DAOS-18702 build: Use leap 15.6 for build (2.6 backport) (#17738) Apr 1, 2026
@daosbuild3
Copy link
Copy Markdown
Collaborator

@daosbuild3
Copy link
Copy Markdown
Collaborator

@daosbuild3
Copy link
Copy Markdown
Collaborator

@daosbuild3
Copy link
Copy Markdown
Collaborator

@daosbuild3
Copy link
Copy Markdown
Collaborator

@daosbuild3
Copy link
Copy Markdown
Collaborator

@daosbuild3
Copy link
Copy Markdown
Collaborator

@grom72 grom72 force-pushed the grom72/DAOS-18702-2.6 branch from 3cf71ec to 1a22729 Compare April 7, 2026 07:05
@daosbuild3
Copy link
Copy Markdown
Collaborator

@daosbuild3
Copy link
Copy Markdown
Collaborator

@daosbuild3
Copy link
Copy Markdown
Collaborator

@daosbuild3
Copy link
Copy Markdown
Collaborator

@daosbuild3
Copy link
Copy Markdown
Collaborator

@daosbuild3
Copy link
Copy Markdown
Collaborator

@daosbuild3
Copy link
Copy Markdown
Collaborator

@daosbuild3
Copy link
Copy Markdown
Collaborator

@grom72 grom72 force-pushed the grom72/DAOS-18702-2.6 branch from f3dc7f1 to 22ff86b Compare April 7, 2026 13:50
grom72 added 3 commits April 7, 2026 16:11
Signed-off-by: Tomasz Gromadzki <tomasz.gromadzki@hpe.com>
Upgrade Leap build environment for to use OS version 15.6

Signed-off-by: Tomasz Gromadzki <tomasz.gromadzki@hpe.com>
lua-lmod available in the Leap 15.6 release packages does not work as
expected.
We need to use the newer one for RPM's build environment.

Signed-off-by: Tomasz Gromadzki <tomasz.gromadzki@hpe.com>

Cancel-prev-build: false

Priority: 2

Skip-unit-tests:true
Skip-unit-test: true
Skip-NLT: true
Skip-unit-test-memcheck: true

Skip-func-test-el8: true
Skip-func-test-el9: true
Skip-func-test-leap15: false
Skip-fault-injection-test: true
Skip-test-el-9.6-rpms: true
Skip-test-leap-15-rpms: false

Skip-func-hw-test: true
@grom72 grom72 force-pushed the grom72/DAOS-18702-2.6 branch from 22ff86b to 49c1f2c Compare April 7, 2026 14:30
@grom72 grom72 marked this pull request as ready for review April 7, 2026 14:44
@grom72 grom72 requested review from JohnMalmberg and phender April 7, 2026 14:53
Copy link
Copy Markdown
Contributor

@phender phender left a comment

Choose a reason for hiding this comment

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

Everything else looks good.

JohnMalmberg
JohnMalmberg previously approved these changes Apr 7, 2026
This reverts commit eeba06d.

Doc-only: true

Signed-off-by: Tomasz Gromadzki <tomasz.gromadzki@hpe.com>
@grom72
Copy link
Copy Markdown
Contributor Author

grom72 commented Apr 7, 2026

The final validation results are here:
https://jenkins-3.daos.hpc.amslabs.hpecorp.net/job/daos-stack/job/daos/job/PR-17809/23/pipeline-overview
The last PR (82609cc) is about removing custom pipeline-lib references which already landed on pipeline-lib/master - no need of one more tests turn.

@grom72 grom72 requested a review from phender April 7, 2026 19:22
@grom72 grom72 requested a review from a team April 7, 2026 19:34
@grom72 grom72 added approved-to-merge PR has received release branch merge approval partial cherry pick release-2.6.5 labels Apr 7, 2026
@phender phender merged commit d8893a4 into release/2.6 Apr 7, 2026
47 of 49 checks passed
@phender phender deleted the grom72/DAOS-18702-2.6 branch April 7, 2026 19:40
}
}
stage('Build on Leap 15.5') {
stage('Build on Leap 15.6') {
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Shouldn't this be Leap 15 to be inline with EL 9 and with what master has?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

The stage name adjustments in master where initially made in 92503f0. The Leap 15.6 build changes occurred after that commit. In my opinion the Build on Leap 15 satge name is more closely tied to commit 92503f0.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I disagree. The name simplification was not because we updated to use EL9 but because we changed the stage names at all. Build on Leap 15.6 was never a stage on master. Master went from Leap 15.5 -> Leap 15 and now in 2.6 we went from Leap 15.5 -> Leap 15.6, which is an unnecessary divergence

Copy link
Copy Markdown
Contributor

@phender phender Apr 7, 2026

Choose a reason for hiding this comment

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

The 92503f0 commit simplified 13 build and test stage names - including Build on Leap 15.5 -> Build on Leap 15.

Since 4643b39 came after (what primarily this PR is based upon) it already had the Build on Leap 15 stage name.

The release/2.6 version of the Jenkinsfile still has many of these stage names with the specific distro major.minor version included, so just updating the Leap 15.6 build stage names would be odd.

I'm not opposed to updating the stage names in the release/2.6 Jenkinsfile, but I think its out of scope for this specific PR and more closely tied to commit 92503f0 - which is where its merge approval should be based.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

It's not about which PR came first. It's just simply that if we are updating the stage name then let's simplify it so we don't have to keep changing the merge requirements each time. All 2.6 PRs with this commit will now require force landing until the merge requirements are updated. But if we update the merge requirements then all 2.6 PRs without this commit will require force landing. That is the entire motivation for simplifying the names when we have to change them for any reason.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Done in #17942

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved-to-merge PR has received release branch merge approval partial cherry pick priority Ticket has high priority (automatically managed) release-2.6.5

Development

Successfully merging this pull request may close these issues.

5 participants