Skip to content

DAOS-18767 build: Prevent config file overwrite#17964

Merged
phender merged 14 commits intomasterfrom
hendersp/DAOS-18767
Apr 16, 2026
Merged

DAOS-18767 build: Prevent config file overwrite#17964
phender merged 14 commits intomasterfrom
hendersp/DAOS-18767

Conversation

@phender
Copy link
Copy Markdown
Contributor

@phender phender commented Apr 9, 2026

Keep modfified config files installed by the DAOS RPMs when uninstalling or updating the RPMs.

Skip-unit-tests: true
Skip-fault-injection-test: true
Skip-func-hw-test: true
Skip-func-test-el8: false
Skip-func-test-leap15: false
Skip-test-leap-15-rpms: false

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).

@phender
DAOS-18767 build: Prevent config file overwrite
597b6ce 
Keep modfified config files installed by the DAOS RPMs when uninstalling
or updating the RPMs.

Skip-unit-tests: true
Skip-fault-injection-test: true
Skip-func-hw-test: true
Skip-func-test-el8: false
Skip-func-test-leap15: false
Skip-test-leap-15-rpms: false

Signed-off-by: Phil Henderson <phillip.henderson@hpe.com>
@github-actions
Copy link
Copy Markdown

github-actions bot commented Apr 9, 2026 •
edited
Loading

Ticket title is 'DAOS rpm config files are overwritten'
Status is 'In Progress'
Labels: 'scrubbed_2.8'
https://daosio.atlassian.net/browse/DAOS-18767

@phender
Updates.
316259c 
Skip-unit-tests: true
Skip-fault-injection-test: true
Skip-func-hw-test: true
Skip-func-test-el8: false
Skip-func-test-leap15: false
Skip-test-leap-15-rpms: false

Signed-off-by: Phil Henderson <phillip.henderson@hpe.com>
@daosbuild3
Copy link
Copy Markdown
Collaborator

daosbuild3 commented Apr 9, 2026

Test stage Test RPMs on EL 9.6 completed with status FAILURE. https://jenkins-3.daos.hpc.amslabs.hpecorp.net//job/daos-stack/job/daos/view/change-requests/job/PR-17964/2/execution/node/552/log

@daosbuild3
Copy link
Copy Markdown
Collaborator

daosbuild3 commented Apr 9, 2026

Test stage Test RPMs on Leap 15.5 completed with status FAILURE. https://jenkins-3.daos.hpc.amslabs.hpecorp.net//job/daos-stack/job/daos/view/change-requests/job/PR-17964/2/execution/node/603/log

phender added 3 commits April 14, 2026 10:35
@phender
Merge branch 'master' into hendersp/DAOS-18767
ebe0090
@phender
Update.
2a749d3 
Skip-unit-tests: true
Skip-fault-injection-test: true
Skip-func-hw-test: true
Skip-func-test-el8: false
Skip-func-test-leap15: false
Skip-test-leap-15-rpms: false

Signed-off-by: Phil Henderson <phillip.henderson@hpe.com>
@phender
Fix new test error messages.
2f337c9 
Skip-unit-tests: true
Skip-fault-injection-test: true
Skip-func-hw-test: true
Skip-func-test-el8: false
Skip-func-test-leap15: false
Skip-test-leap-15-rpms: false

Signed-off-by: Phil Henderson <phillip.henderson@hpe.com>
@daosbuild3
Copy link
Copy Markdown
Collaborator

daosbuild3 commented Apr 14, 2026

Test stage Test RPMs on EL 9.6 completed with status FAILURE. https://jenkins-3.daos.hpc.amslabs.hpecorp.net//job/daos-stack/job/daos/view/change-requests/job/PR-17964/4/execution/node/603/log

@daosbuild3
Copy link
Copy Markdown
Collaborator

daosbuild3 commented Apr 14, 2026

Test stage Test RPMs on Leap 15.5 completed with status FAILURE. https://jenkins-3.daos.hpc.amslabs.hpecorp.net//job/daos-stack/job/daos/view/change-requests/job/PR-17964/4/execution/node/654/log

@phender
Debug
5d0b2c1 
Skip-unit-tests: true
Skip-fault-injection-test: true
Skip-func-hw-test: true
Skip-func-test-el8: true
Skip-func-test-el9: true
Skip-func-test-leap15: true
Skip-test-leap-15-rpms: false

Signed-off-by: Phil Henderson <phillip.henderson@hpe.com>
@daosbuild3
Copy link
Copy Markdown
Collaborator

daosbuild3 commented Apr 14, 2026

Test stage Functional on EL 8 completed with status FAILURE. https://jenkins-3.daos.hpc.amslabs.hpecorp.net//job/daos-stack/job/daos/view/change-requests/job/PR-17964/4/execution/node/727/log

@daosbuild3
Copy link
Copy Markdown
Collaborator

daosbuild3 commented Apr 14, 2026

Test stage Functional on Leap 15 completed with status FAILURE. https://jenkins-3.daos.hpc.amslabs.hpecorp.net//job/daos-stack/job/daos/view/change-requests/job/PR-17964/4/execution/node/574/log

@daosbuild3
Copy link
Copy Markdown
Collaborator

daosbuild3 commented Apr 14, 2026

Test stage Functional on EL 9 completed with status FAILURE. https://jenkins-3.daos.hpc.amslabs.hpecorp.net//job/daos-stack/job/daos/view/change-requests/job/PR-17964/4/execution/node/707/log

@daosbuild3
Copy link
Copy Markdown
Collaborator

daosbuild3 commented Apr 14, 2026

Test stage Test RPMs on Leap 15.5 completed with status FAILURE. https://jenkins-3.daos.hpc.amslabs.hpecorp.net//job/daos-stack/job/daos/view/change-requests/job/PR-17964/5/execution/node/558/log

@daosbuild3
Copy link
Copy Markdown
Collaborator

daosbuild3 commented Apr 14, 2026

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

@daosbuild3
Copy link
Copy Markdown
Collaborator

daosbuild3 commented Apr 14, 2026

Test stage Test RPMs on Leap 15.5 completed with status FAILURE. https://jenkins-3.daos.hpc.amslabs.hpecorp.net//job/daos-stack/job/daos/view/change-requests/job/PR-17964/6/execution/node/582/log

@daosbuild3
Copy link
Copy Markdown
Collaborator

daosbuild3 commented Apr 14, 2026

Test stage Test RPMs on EL 9.6 completed with status FAILURE. https://jenkins-3.daos.hpc.amslabs.hpecorp.net//job/daos-stack/job/daos/view/change-requests/job/PR-17964/6/execution/node/591/log

@daosbuild3
Copy link
Copy Markdown
Collaborator

daosbuild3 commented Apr 15, 2026

Test stage Test RPMs on Leap 15.5 completed with status FAILURE. https://jenkins-3.daos.hpc.amslabs.hpecorp.net//job/daos-stack/job/daos/view/change-requests/job/PR-17964/7/execution/node/581/log

@daosbuild3
Copy link
Copy Markdown
Collaborator

daosbuild3 commented Apr 15, 2026

Test stage Test RPMs on EL 9.6 completed with status FAILURE. https://jenkins-3.daos.hpc.amslabs.hpecorp.net//job/daos-stack/job/daos/view/change-requests/job/PR-17964/7/execution/node/590/log

phender added 2 commits April 15, 2026 10:44
@phender
Merge branch 'master' into hendersp/DAOS-18767
e83fcca
@phender
FIx config file paths
0592f14 
Skip-unit-tests: true
Skip-fault-injection-test: true
Skip-func-hw-test: true
Skip-func-test-el8: false
Skip-func-test-leap15: false
Skip-test-leap-15-rpms: false
Test-tag: test_setup_vm

Signed-off-by: Phil Henderson <phillip.henderson@hpe.com>
@daosbuild3
Copy link
Copy Markdown
Collaborator

daosbuild3 commented Apr 15, 2026

Test stage Test RPMs on Leap 15.5 completed with status FAILURE. https://jenkins-3.daos.hpc.amslabs.hpecorp.net//job/daos-stack/job/daos/view/change-requests/job/PR-17964/8/execution/node/619/log

@daosbuild3
Copy link
Copy Markdown
Collaborator

daosbuild3 commented Apr 15, 2026

Test stage Test RPMs on EL 9.6 completed with status FAILURE. https://jenkins-3.daos.hpc.amslabs.hpecorp.net//job/daos-stack/job/daos/view/change-requests/job/PR-17964/8/execution/node/628/log

phender added 2 commits April 15, 2026 11:55
@phender
Undo last change.
8654c44 
Signed-off-by: Phil Henderson <phillip.henderson@hpe.com>
@phender
Update RPM test
cd308e2 
Skip-unit-tests: true
Skip-fault-injection-test: true
Skip-func-hw-test: true
Skip-func-test-el8: false
Skip-func-test-leap15: false
Skip-test-leap-15-rpms: false
Test-tag: test_setup_vm

Signed-off-by: Phil Henderson <phillip.henderson@hpe.com>
@daosbuild3
Copy link
Copy Markdown
Collaborator

daosbuild3 commented Apr 15, 2026

Test stage Test RPMs on EL 9.6 completed with status FAILURE. https://jenkins-3.daos.hpc.amslabs.hpecorp.net//job/daos-stack/job/daos/view/change-requests/job/PR-17964/9/execution/node/619/log

@daosbuild3
Copy link
Copy Markdown
Collaborator

daosbuild3 commented Apr 15, 2026

Test stage Test RPMs on Leap 15.5 completed with status FAILURE. https://jenkins-3.daos.hpc.amslabs.hpecorp.net//job/daos-stack/job/daos/view/change-requests/job/PR-17964/9/execution/node/628/log

@phender
Update RPM test
4cdf794 
Skip-unit-tests: true
Skip-fault-injection-test: true
Skip-func-hw-test: true
Skip-func-test-el8: false
Skip-func-test-leap15: false
Skip-test-leap-15-rpms: false
Test-tag: test_setup_vm

Signed-off-by: Phil Henderson <phillip.henderson@hpe.com>
@daosbuild3
Copy link
Copy Markdown
Collaborator

daosbuild3 commented Apr 15, 2026

Test stage Test RPMs on EL 9.6 completed with status FAILURE. https://jenkins-3.daos.hpc.amslabs.hpecorp.net//job/daos-stack/job/daos/view/change-requests/job/PR-17964/10/execution/node/619/log

@daosbuild3
Copy link
Copy Markdown
Collaborator

daosbuild3 commented Apr 15, 2026

Test stage Test RPMs on Leap 15.5 completed with status FAILURE. https://jenkins-3.daos.hpc.amslabs.hpecorp.net//job/daos-stack/job/daos/view/change-requests/job/PR-17964/10/execution/node/628/log

@phender
Update RPM test
7faaa2e 
Skip-unit-tests: true
Skip-fault-injection-test: true
Skip-func-hw-test: true
Skip-func-test-el8: false
Skip-func-test-leap15: false
Skip-test-leap-15-rpms: false
Test-tag: test_setup_vm

Signed-off-by: Phil Henderson <phillip.henderson@hpe.com>
@daosbuild3
Copy link
Copy Markdown
Collaborator

daosbuild3 commented Apr 15, 2026

Test stage Functional on Leap 15 completed with status FAILURE. https://jenkins-3.daos.hpc.amslabs.hpecorp.net/job/daos-stack/job/daos/job/PR-17964/10/display/redirect

@daosbuild3
Copy link
Copy Markdown
Collaborator

daosbuild3 commented Apr 15, 2026

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

phender added 2 commits April 15, 2026 16:51
@phender
Merge branch 'master' into hendersp/DAOS-18767
ec39e20
@phender
Update RPM test
7f26813 
Skip-unit-tests: true
Skip-fault-injection-test: true
Skip-func-hw-test: true
Skip-func-test-el8: false
Skip-func-test-leap15: false
Skip-test-leap-15-rpms: false
Test-tag: test_setup_vm

Signed-off-by: Phil Henderson <phillip.henderson@hpe.com>
@phender phender marked this pull request as ready for review April 15, 2026 21:21
@phender phender requested a review from a team as a code owner April 15, 2026 21:21
@phender
Copy link
Copy Markdown
Contributor Author

phender commented Apr 16, 2026 •
edited
Loading

The ci/rpm/test_daos_node.sh updates have been verified to fail without the utils/rpms/daos.sh changes in #18026 w/ https://jenkins-3.daos.hpc.amslabs.hpecorp.net/job/daos-stack/job/daos/job/PR-18026/1/pipeline-overview/log?nodeId=590 failing here:

[2026-04-16T13:18:07.322Z] A /etc/daos/daos_server.yml.rpmnew file should exist after the daos-server install
[2026-04-16T13:18:07.322Z] + '[' '!' -f /etc/daos/daos_server.yml.rpmnew ']'
[2026-04-16T13:18:07.322Z] + echo 'A /etc/daos/daos_server.yml.rpmnew file should exist after the daos-server install'
[2026-04-16T13:18:07.323Z] + ls -al /etc/daos/daos_agent.yml /etc/daos/daos_server.yml
[2026-04-16T13:18:07.323Z] -rw-r--r-- 1 root root     0 Apr 16 13:18 /etc/daos/daos_agent.yml
[2026-04-16T13:18:07.323Z] -rw-r--r-- 1 root root 25754 Apr 16 13:04 /etc/daos/daos_server.yml
[2026-04-16T13:18:07.323Z] + exit 1

In this PR the new test case pass in https://jenkins-3.daos.hpc.amslabs.hpecorp.net/job/daos-stack/job/daos/job/PR-17964/12/pipeline-overview/log?nodeId=628:

[2026-04-15T21:19:25.413Z] + '[' '!' -f /etc/daos/daos_server.yml.rpmnew ']'
[2026-04-15T21:19:25.413Z] + sudo dnf -y install --exclude ompi daos-client-tests-openmpi

[2026-04-15T21:19:34.849Z] + '[' '!' -f /etc/daos/daos_agent.yml.rpmnew ']'
[2026-04-15T21:19:34.849Z] ++ whoami

@phender phender added the forced-landing The PR has known failures or has intentionally reduced testing, but should still be landed. label Apr 16, 2026
daltonbohning
daltonbohning approved these changes Apr 16, 2026
View reviewed changes
Comment thread ci/rpm/test_daos_node.sh
Comment on lines +110 to +114
if [ ! -f "${SERVER_CONFIG}.rpmnew" ]; then
echo "A ${SERVER_CONFIG}.rpmnew file should exist after the daos-server install"
ls -al /etc/daos/daos*
exit 1
fi
Copy link
Copy Markdown
Contributor

@daltonbohning daltonbohning Apr 16, 2026

Choose a reason for hiding this comment

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

I know I've seen these rpmnew files before but on my local system with latest master RPMs I do not. So I'm guessing this gets handled but the --config-files option?

Copy link
Copy Markdown
Contributor Author

@phender phender Apr 16, 2026

Choose a reason for hiding this comment

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

Yes, when files marked as config files already exist the RPM installs a .rpmnew version of the config file instead of overwriting the file.

The Test RPM script now touches two of the config files before installing the RPMS to test this behavior:

[2026-04-15T19:04:12.871Z] + ls -al /etc/daos/daos_agent.yml /etc/daos/daos_server.yml
[2026-04-15T19:04:12.871Z] -rw-r--r-- 1 root root 0 Apr 15 19:04 /etc/daos/daos_agent.yml
[2026-04-15T19:04:12.871Z] -rw-r--r-- 1 root root 0 Apr 15 19:04 /etc/daos/daos_server.yml
[2026-04-15T19:04:12.871Z] + sudo dnf -y install daos-server

After the install of daos-server and daos-admin with /etc/daos/daos_server.yml and /etc/daos/daos_agent.yml marked as a config file:

[2026-04-15T19:04:26.967Z] + ls -al /etc/daos/daos_agent.yml /etc/daos/daos_agent.yml.rpmnew /etc/daos/daos_control.yml /etc/daos/daos_server.yml /etc/daos/daos_server.yml.rpmnew
[2026-04-15T19:04:26.967Z] -rw-r--r-- 1 root root     0 Apr 15 19:04 /etc/daos/daos_agent.yml
[2026-04-15T19:04:26.967Z] -rw-r--r-- 1 root root  6386 Apr 15 18:48 /etc/daos/daos_agent.yml.rpmnew
[2026-04-15T19:04:26.967Z] -rw-r--r-- 1 root root  1402 Apr 15 18:48 /etc/daos/daos_control.yml
[2026-04-15T19:04:26.967Z] -rw-r--r-- 1 root root     0 Apr 15 19:04 /etc/daos/daos_server.yml
[2026-04-15T19:04:26.967Z] -rw-r--r-- 1 root root 25754 Apr 15 18:47 /etc/daos/daos_server.yml.rpmnew

Copy link
Copy Markdown
Contributor

@daltonbohning daltonbohning Apr 16, 2026

Choose a reason for hiding this comment

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

Thanks. That makes sense

@phender phender requested a review from a team April 16, 2026 14:40
@phender phender merged commit a6ccd38 into master Apr 16, 2026
53 of 54 checks passed
@phender phender deleted the hendersp/DAOS-18767 branch April 16, 2026 14:42
phender added a commit that referenced this pull request Apr 16, 2026
@phender
DAOS-18767 build: Prevent config file overwrite (#17964)
95f4050 
Keep modified config files installed by the DAOS RPMs when uninstalling
or updating the RPMs.

Skip-unit-tests: true
Skip-fault-injection-test: true
Skip-func-hw-test: true
Skip-func-test-el8: false
Skip-func-test-leap15: false
Skip-test-leap-15-rpms: false
Test-tag: test_setup_vm

Signed-off-by: Phil Henderson <phillip.henderson@hpe.com>
phender added a commit that referenced this pull request Apr 17, 2026
@phender
DAOS-18767 build: Prevent config file overwrite (#17964) (#18028)
eb8d6f6 
Keep modified config files installed by the DAOS RPMs when uninstalling
or updating the RPMs.

Signed-off-by: Phil Henderson <phillip.henderson@hpe.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@daltonbohning daltonbohning daltonbohning approved these changes

@soumagne soumagne soumagne approved these changes

Assignees

No one assigned

Labels

forced-landing The PR has known failures or has intentionally reduced testing, but should still be landed.

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@phender @daosbuild3 @soumagne @daltonbohning